summaryrefslogtreecommitdiff
path: root/usr/src/lib/libc/i386/gen
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/lib/libc/i386/gen')
-rw-r--r--usr/src/lib/libc/i386/gen/ecvt.c23
-rw-r--r--usr/src/lib/libc/i386/gen/ladd.s14
-rw-r--r--usr/src/lib/libc/i386/gen/ldivide.s14
-rw-r--r--usr/src/lib/libc/i386/gen/lexp10.c53
-rw-r--r--usr/src/lib/libc/i386/gen/llog10.c54
-rw-r--r--usr/src/lib/libc/i386/gen/lmul.s14
-rw-r--r--usr/src/lib/libc/i386/gen/lshiftl.s14
-rw-r--r--usr/src/lib/libc/i386/gen/lsign.s14
-rw-r--r--usr/src/lib/libc/i386/gen/lsub.s14
-rw-r--r--usr/src/lib/libc/i386/gen/ltostr.c61
-rw-r--r--usr/src/lib/libc/i386/gen/makectxt.c15
-rw-r--r--usr/src/lib/libc/i386/gen/siglongjmp.c12
-rw-r--r--usr/src/lib/libc/i386/gen/wschr.s26
-rw-r--r--usr/src/lib/libc/i386/gen/wslen.s26
-rw-r--r--usr/src/lib/libc/i386/gen/wsncmp.s26
15 files changed, 86 insertions, 294 deletions
diff --git a/usr/src/lib/libc/i386/gen/ecvt.c b/usr/src/lib/libc/i386/gen/ecvt.c
index 4ad7319792..b791e513cf 100644
--- a/usr/src/lib/libc/i386/gen/ecvt.c
+++ b/usr/src/lib/libc/i386/gen/ecvt.c
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -19,15 +18,15 @@
*
* CDDL HEADER END
*/
-/* Copyright (c) 1988 AT&T */
-/* All Rights Reserved */
-
/*
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
+/* Copyright (c) 1988 AT&T */
+/* All Rights Reserved */
+
#pragma ident "%Z%%M% %I% %E% SMI"
/*
@@ -37,13 +36,11 @@
* sign is set to 0 for positive, 1 for negative
*
*/
-#pragma weak ecvt = _ecvt
-#pragma weak fcvt = _fcvt
-#pragma weak qecvt = _qecvt
-#pragma weak qfcvt = _qfcvt
-#pragma weak qgcvt = _qgcvt
-#include "synonyms.h"
+#pragma weak _ecvt = ecvt
+#pragma weak _fcvt = fcvt
+
+#include "lint.h"
#include <sys/types.h>
#include <stdlib.h>
#include <floatingpoint.h>
diff --git a/usr/src/lib/libc/i386/gen/ladd.s b/usr/src/lib/libc/i386/gen/ladd.s
index d20596666d..6b3b7ffde1 100644
--- a/usr/src/lib/libc/i386/gen/ladd.s
+++ b/usr/src/lib/libc/i386/gen/ladd.s
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -19,21 +18,18 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
- .ident "%Z%%M% %I% %E% SMI"
+#pragma ident "%Z%%M% %I% %E% SMI"
.file "%M%"
/ Double long add routine.
-#include <sys/asm_linkage.h>
-
- ANSI_PRAGMA_WEAK(ladd,function)
-
#include "SYS.h"
.set lop,4
diff --git a/usr/src/lib/libc/i386/gen/ldivide.s b/usr/src/lib/libc/i386/gen/ldivide.s
index a75b5e3f52..3df4afcb36 100644
--- a/usr/src/lib/libc/i386/gen/ldivide.s
+++ b/usr/src/lib/libc/i386/gen/ldivide.s
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -19,21 +18,18 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
- .ident "%Z%%M% %I% %E% SMI"
+#pragma ident "%Z%%M% %I% %E% SMI"
.file "%M%"
/ Double long divide routine.
-#include <sys/asm_linkage.h>
-
- ANSI_PRAGMA_WEAK(ldivide,function)
-
#include "SYS.h"
.set lop,16
diff --git a/usr/src/lib/libc/i386/gen/lexp10.c b/usr/src/lib/libc/i386/gen/lexp10.c
deleted file mode 100644
index b02a328acc..0000000000
--- a/usr/src/lib/libc/i386/gen/lexp10.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/* Copyright (c) 1988 AT&T */
-/* All Rights Reserved */
-
-
-/*
- * Copyright 1992-2003 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
- */
-
-#pragma ident "%Z%%M% %I% %E% SMI"
-
-#pragma weak lexp10 = _lexp10
-
-#include "synonyms.h"
-#include <sys/types.h>
-#include <sys/dl.h>
-
-dl_t
-lexp10(exp)
-dl_t exp;
-{
- dl_t result;
-
- result = lone;
-
- while(exp.dl_hop != 0 || exp.dl_lop != 0){
- result = lmul(result, lten);
- exp = lsub(exp, lone);
- }
-
- return(result);
-}
diff --git a/usr/src/lib/libc/i386/gen/llog10.c b/usr/src/lib/libc/i386/gen/llog10.c
deleted file mode 100644
index e4a6f8ac20..0000000000
--- a/usr/src/lib/libc/i386/gen/llog10.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/* Copyright (c) 1988 AT&T */
-/* All Rights Reserved */
-
-
-/*
- * Copyright 1992-2003 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
- */
-
-#pragma ident "%Z%%M% %I% %E% SMI"
-
-#pragma weak llog10 = _llog10
-
-#include "synonyms.h"
-#include <sys/types.h>
-#include <sys/dl.h>
-
-dl_t
-llog10(val)
-dl_t val;
-{
- dl_t result;
-
- result = lzero;
- val = ldivide(val, lten);
-
- while(val.dl_hop != 0 || val.dl_lop != 0){
- val = ldivide(val, lten);
- result = ladd(result, lone);
- }
-
- return(result);
-}
diff --git a/usr/src/lib/libc/i386/gen/lmul.s b/usr/src/lib/libc/i386/gen/lmul.s
index 2007f34682..c25ca556f7 100644
--- a/usr/src/lib/libc/i386/gen/lmul.s
+++ b/usr/src/lib/libc/i386/gen/lmul.s
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -19,21 +18,18 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
- .ident "%Z%%M% %I% %E% SMI"
+#pragma ident "%Z%%M% %I% %E% SMI"
.file "%M%"
/ Double long multiply routine.
-#include <sys/asm_linkage.h>
-
- ANSI_PRAGMA_WEAK(lmul,function)
-
#include "SYS.h"
.set lop,8
diff --git a/usr/src/lib/libc/i386/gen/lshiftl.s b/usr/src/lib/libc/i386/gen/lshiftl.s
index 29dbe1e5ba..1d684ccc1e 100644
--- a/usr/src/lib/libc/i386/gen/lshiftl.s
+++ b/usr/src/lib/libc/i386/gen/lshiftl.s
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -19,21 +18,18 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
- .ident "%Z%%M% %I% %E% SMI"
+#pragma ident "%Z%%M% %I% %E% SMI"
.file "%M%"
/ Shift a double long value.
-#include <sys/asm_linkage.h>
-
- ANSI_PRAGMA_WEAK(lshiftl,function)
-
#include "SYS.h"
.set arg,8
diff --git a/usr/src/lib/libc/i386/gen/lsign.s b/usr/src/lib/libc/i386/gen/lsign.s
index 5bfc198a31..2854113a28 100644
--- a/usr/src/lib/libc/i386/gen/lsign.s
+++ b/usr/src/lib/libc/i386/gen/lsign.s
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -19,21 +18,18 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
- .ident "%Z%%M% %I% %E% SMI"
+#pragma ident "%Z%%M% %I% %E% SMI"
.file "%M%"
/ Determine the sign of a double-long number.
-#include <sys/asm_linkage.h>
-
- ANSI_PRAGMA_WEAK(lsign,function)
-
#include "SYS.h"
ENTRY(lsign)
diff --git a/usr/src/lib/libc/i386/gen/lsub.s b/usr/src/lib/libc/i386/gen/lsub.s
index 92e744ed1a..db39d376a1 100644
--- a/usr/src/lib/libc/i386/gen/lsub.s
+++ b/usr/src/lib/libc/i386/gen/lsub.s
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -19,21 +18,18 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
- .ident "%Z%%M% %I% %E% SMI"
+#pragma ident "%Z%%M% %I% %E% SMI"
.file "%M%"
/ Double long subtraction routine.
-#include <sys/asm_linkage.h>
-
- ANSI_PRAGMA_WEAK(lsub,function)
-
#include "SYS.h"
.set lop,4
diff --git a/usr/src/lib/libc/i386/gen/ltostr.c b/usr/src/lib/libc/i386/gen/ltostr.c
deleted file mode 100644
index 04129a34ad..0000000000
--- a/usr/src/lib/libc/i386/gen/ltostr.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/* Copyright (c) 1988 AT&T */
-/* All Rights Reserved */
-
-
-#ident "%W% %E% SMI" /* SVr4.0 1.4 */
-/*
- * ltostr -- convert long to decimal string
- *
- *
- * char *
- * ltostr(value, ptr)
- * long value;
- * char *ptr;
- *
- * Ptr is assumed to point to the byte following a storage area
- * into which the decimal representation of "value" is to be
- * placed as a string. Ltostr converts "value" to decimal and
- * produces the string, and returns a pointer to the beginning
- * of the string. No leading zeroes are produced, and no
- * terminating null is produced. The low-order digit of the
- * result always occupies memory position ptr-1.
- * Ltostr's behavior is undefined if "value" is negative. A single
- * zero digit is produced if "value" is zero.
- *
- */
-#include "synonyms.h"
-
-char *
-_ltostr(value, ptr)
-register long value;
-register char *ptr;
-{
- register long t;
-
- do {
- *--ptr = '0' + value - 10 * (t = value / 10);
- } while ((value = t) != 0);
-
- return(ptr);
-}
diff --git a/usr/src/lib/libc/i386/gen/makectxt.c b/usr/src/lib/libc/i386/gen/makectxt.c
index 6432bbf1d0..d72a67a481 100644
--- a/usr/src/lib/libc/i386/gen/makectxt.c
+++ b/usr/src/lib/libc/i386/gen/makectxt.c
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -19,20 +18,20 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/* Copyright (c) 1988 AT&T */
/* All Rights Reserved */
+#pragma ident "%Z%%M% %I% %E% SMI"
-#pragma weak makecontext = _makecontext
+#pragma weak _makecontext = makecontext
-#include "synonyms.h"
+#include "lint.h"
#include <stdarg.h>
#include <ucontext.h>
#include <sys/stack.h>
diff --git a/usr/src/lib/libc/i386/gen/siglongjmp.c b/usr/src/lib/libc/i386/gen/siglongjmp.c
index 1b3296d93d..ea23fcf749 100644
--- a/usr/src/lib/libc/i386/gen/siglongjmp.c
+++ b/usr/src/lib/libc/i386/gen/siglongjmp.c
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -30,18 +30,16 @@
#pragma ident "%Z%%M% %I% %E% SMI"
-#pragma weak siglongjmp = _siglongjmp
+#pragma weak _siglongjmp = siglongjmp
-#include "synonyms.h"
+#include "lint.h"
#include <sys/types.h>
#include <sys/ucontext.h>
#include <setjmp.h>
#include <ucontext.h>
-extern int _setcontext(const ucontext_t *);
-
void
-_siglongjmp(sigjmp_buf env, int val)
+siglongjmp(sigjmp_buf env, int val)
{
ucontext_t *ucp = (ucontext_t *)env;
@@ -50,5 +48,5 @@ _siglongjmp(sigjmp_buf env, int val)
else
ucp->uc_mcontext.gregs[EAX] = 1;
- (void) _setcontext(ucp);
+ (void) setcontext(ucp);
}
diff --git a/usr/src/lib/libc/i386/gen/wschr.s b/usr/src/lib/libc/i386/gen/wschr.s
index bf0a217b9d..2cf1809cf2 100644
--- a/usr/src/lib/libc/i386/gen/wschr.s
+++ b/usr/src/lib/libc/i386/gen/wschr.s
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -19,12 +18,13 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
- .ident "%Z%%M% %I% %E% SMI"
+#pragma ident "%Z%%M% %I% %E% SMI"
.file "%M%"
@@ -33,19 +33,15 @@
/
/ Algorithm based on Solaris 2.6 gen/strchr.s implementation
/
-/ .ident "@(#)strchr.s 1.1 92/04/17 SMI"
-/
-#include <sys/asm_linkage.h>
+#include "SYS.h"
ANSI_PRAGMA_WEAK(wcschr,function)
ANSI_PRAGMA_WEAK(wschr,function)
-#include "SYS.h"
-
.align 8 / accounts for .loop alignment and prolog
- ENTRY(_wcschr)
+ ENTRY(wcschr)
movl 4(%esp),%eax / %eax = string address
movl 8(%esp),%ecx / %ecx = wchar sought
.loop:
@@ -88,16 +84,16 @@
addl $4,%eax
.found:
ret
- SET_SIZE(_wcschr)
+ SET_SIZE(wcschr)
- ENTRY(_wschr)
+ ENTRY(wschr)
_prologue_
movl _esp_(8),%eax
movl _esp_(4),%edx
pushl %eax
pushl %edx
- call _fref_(_wcschr)
+ call _fref_(wcschr)
addl $8,%esp
_epilogue_
ret
- SET_SIZE(_wschr)
+ SET_SIZE(wschr)
diff --git a/usr/src/lib/libc/i386/gen/wslen.s b/usr/src/lib/libc/i386/gen/wslen.s
index 5d428e84cc..3431210229 100644
--- a/usr/src/lib/libc/i386/gen/wslen.s
+++ b/usr/src/lib/libc/i386/gen/wslen.s
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -19,12 +18,13 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
- .ident "%Z%%M% %I% %E% SMI"
+#pragma ident "%Z%%M% %I% %E% SMI"
.file "%M%"
@@ -32,7 +32,7 @@
* Wide character wcslen() implementation
*
* size_t
- * _wcslen(const wchar_t *s)
+ * wcslen(const wchar_t *s)
*{
* const wchar_t *s0 = s + 1;
* while (*s++)
@@ -41,14 +41,12 @@
*}
*/
-#include <sys/asm_linkage.h>
+#include "SYS.h"
ANSI_PRAGMA_WEAK(wcslen,function)
ANSI_PRAGMA_WEAK(wslen,function)
-#include "SYS.h"
-
- ENTRY(_wcslen)
+ ENTRY(wcslen)
movl 4(%esp),%edx
xorl %eax,%eax
@@ -81,16 +79,16 @@
.out3:
add $3, %eax
ret
- SET_SIZE(_wcslen)
+ SET_SIZE(wcslen)
- ENTRY(_wslen)
+ ENTRY(wslen)
_prologue_
movl _esp_(8),%eax
movl _esp_(4),%edx
pushl %eax
pushl %edx
- call _fref_(_wcslen)
+ call _fref_(wcslen)
addl $8,%esp
_epilogue_
ret
- SET_SIZE(_wslen)
+ SET_SIZE(wslen)
diff --git a/usr/src/lib/libc/i386/gen/wsncmp.s b/usr/src/lib/libc/i386/gen/wsncmp.s
index 54b05f8342..995187a827 100644
--- a/usr/src/lib/libc/i386/gen/wsncmp.s
+++ b/usr/src/lib/libc/i386/gen/wsncmp.s
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -19,12 +18,13 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
- .ident "%Z%%M% %I% %E% SMI"
+#pragma ident "%Z%%M% %I% %E% SMI"
.file "%M%"
@@ -33,17 +33,13 @@
/
/ Algorithm based on Solaris 2.6 gen/strncpy.s implementation
/
-/ .ident "@(#)strncpy.s 1.1 92/04/17 SMI"
-/
-#include <sys/asm_linkage.h>
+#include "SYS.h"
ANSI_PRAGMA_WEAK(wcsncmp,function)
ANSI_PRAGMA_WEAK(wsncmp,function)
-#include "SYS.h"
-
- ENTRY(_wcsncmp)
+ ENTRY(wcsncmp)
pushl %esi / save register variables
movl 8(%esp),%esi / %esi = first string
movl %edi,%edx
@@ -105,9 +101,9 @@
subl (%edi),%eax / return value is (*s1 - *--s2)
movl %edx,%edi
ret
- SET_SIZE(_wcsncmp)
+ SET_SIZE(wcsncmp)
- ENTRY(_wsncmp)
+ ENTRY(wsncmp)
_prologue_
movl _esp_(12),%ecx
movl _esp_(8),%eax
@@ -115,8 +111,8 @@
pushl %ecx
pushl %eax
pushl %edx
- call _fref_(_wcsncmp)
+ call _fref_(wcsncmp)
addl $12,%esp
_epilogue_
ret
- SET_SIZE(_wsncmp)
+ SET_SIZE(wsncmp)