PSARC 2008/309 expunge synonyms.h

6700179 expunge synonyms.h

--HG--
rename : usr/src/cmd/sgs/libelf/common/syn.h => deleted_files/usr/src/cmd/sgs/libelf/common/syn.h
rename : usr/src/cmd/sgs/librtld/common/lintsup.c => deleted_files/usr/src/cmd/sgs/librtld/common/lintsup.c
rename : usr/src/cmd/sgs/rtld/common/_synonyms.h => deleted_files/usr/src/cmd/sgs/rtld/common/_synonyms.h
rename : usr/src/common/atomic/atomic_asm_weak.h => deleted_files/usr/src/common/atomic/atomic_asm_weak.h
rename : usr/src/lib/common/inc/c_synonyms.h => deleted_files/usr/src/lib/common/inc/c_synonyms.h
rename : usr/src/lib/libc/amd64/gen/lexp10.c => deleted_files/usr/src/lib/libc/amd64/gen/lexp10.c
rename : usr/src/lib/libc/amd64/gen/llog10.c => deleted_files/usr/src/lib/libc/amd64/gen/llog10.c
rename : usr/src/lib/libc/amd64/gen/ltostr.c => deleted_files/usr/src/lib/libc/amd64/gen/ltostr.c
rename : usr/src/lib/libc/i386/gen/lexp10.c => deleted_files/usr/src/lib/libc/i386/gen/lexp10.c
rename : usr/src/lib/libc/i386/gen/llog10.c => deleted_files/usr/src/lib/libc/i386/gen/llog10.c
rename : usr/src/lib/libc/i386/gen/ltostr.c => deleted_files/usr/src/lib/libc/i386/gen/ltostr.c
rename : usr/src/lib/libc/inc/synonyms.h => deleted_files/usr/src/lib/libc/inc/synonyms.h
rename : usr/src/lib/libc/sparcv9/gen/lexp10.c => deleted_files/usr/src/lib/libc/sparcv9/gen/lexp10.c
rename : usr/src/lib/libc/sparcv9/gen/llog10.c => deleted_files/usr/src/lib/libc/sparcv9/gen/llog10.c
rename : usr/src/lib/libc_psr/inc.flg => deleted_files/usr/src/lib/libc_psr/inc.flg
rename : usr/src/lib/libcrypt/inc/des_synonyms.h => deleted_files/usr/src/lib/libcrypt/inc/des_synonyms.h
rename : usr/src/lib/libgen/inc/gen_synonyms.h => deleted_files/usr/src/lib/libgen/inc/gen_synonyms.h
rename : usr/src/lib/libtsnet/common/synonyms.h => deleted_files/usr/src/lib/libtsnet/common/synonyms.h
rename : usr/src/tools/scripts/check_fnames.sh => deleted_files/usr/src/tools/scripts/check_fnames.sh
rename : usr/src/lib/libc/sparc/gen/lexp10.c => usr/src/lib/libc/port/gen/lexp10.c
rename : usr/src/lib/libc/sparc/gen/llog10.c => usr/src/lib/libc/port/gen/llog10.c

24 files changed, 110 insertions, 248 deletions

diff --git a/usr/src/lib/libc/sparcv9/gen/_xregs_clrptr.c b/usr/src/lib/libc/sparcv9/gen/_xregs_clrptr.c
index b6c09be578..1873ed6c18 100644
--- a/usr/src/lib/libc/sparcv9/gen/_xregs_clrptr.c
+++ b/usr/src/lib/libc/sparcv9/gen/_xregs_clrptr.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,14 +18,15 @@
  *
  * 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"
 
-#include "synonyms.h"
+#include "lint.h"
 #include <sys/types.h>
 #include <ucontext.h>
 #include "libc.h"
diff --git a/usr/src/lib/libc/sparcv9/gen/abs.s b/usr/src/lib/libc/sparcv9/gen/abs.s
index 9e483e2ca2..4d39a59436 100644
--- a/usr/src/lib/libc/sparcv9/gen/abs.s
+++ b/usr/src/lib/libc/sparcv9/gen/abs.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.
@@ -21,19 +20,15 @@
  */
 
 /*
- * Copyright 2006 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%"
 
-#include <sys/asm_linkage.h>
-
-	ANSI_PRAGMA_WEAK(llabs,function)
-
-#include "synonyms.h"
+#include "SYS.h"
 
 /*
  * int abs(int arg);
diff --git a/usr/src/lib/libc/sparcv9/gen/ecvt.c b/usr/src/lib/libc/sparcv9/gen/ecvt.c
index 1e7e9e6111..422e980fb9 100644
--- a/usr/src/lib/libc/sparcv9/gen/ecvt.c
+++ b/usr/src/lib/libc/sparcv9/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,16 +18,16 @@
  *
  * 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"
 
 /*
  *	ecvt converts to decimal
@@ -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/sparcv9/gen/getctxt.c b/usr/src/lib/libc/sparcv9/gen/getctxt.c
index b119860217..3213955108 100644
--- a/usr/src/lib/libc/sparcv9/gen/getctxt.c
+++ b/usr/src/lib/libc/sparcv9/gen/getctxt.c
@@ -29,9 +29,9 @@
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#pragma weak getcontext = _getcontext
+#pragma weak _getcontext = getcontext
 
-#include "synonyms.h"
+#include "lint.h"
 #include "thr_uberdata.h"
 #include <ucontext.h>
 #include <sys/types.h>
diff --git a/usr/src/lib/libc/sparcv9/gen/lexp10.c b/usr/src/lib/libc/sparcv9/gen/lexp10.c
deleted file mode 100644
index 28152a5b8f..0000000000
--- a/usr/src/lib/libc/sparcv9/gen/lexp10.c
+++ /dev/null
@@ -1,52 +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 2004 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 weak lexp10 = _lexp10
-
-#include	"synonyms.h"
-#include	<sys/types.h>
-#include	<sys/dl.h>
-
-dl_t
-lexp10(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/sparcv9/gen/llog10.c b/usr/src/lib/libc/sparcv9/gen/llog10.c
deleted file mode 100644
index 14f690c61b..0000000000
--- a/usr/src/lib/libc/sparcv9/gen/llog10.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 2004 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 weak llog10 = _llog10
-
-#include	"synonyms.h"
-#include	<sys/types.h>
-#include	<sys/dl.h>
-
-dl_t
-llog10(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/sparcv9/gen/makectxt.c b/usr/src/lib/libc/sparcv9/gen/makectxt.c
index 9dc4c64697..7519bdabcb 100644
--- a/usr/src/lib/libc/sparcv9/gen/makectxt.c
+++ b/usr/src/lib/libc/sparcv9/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,21 +18,21 @@
  *
  * 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_v2 = ___makecontext_v2
+#pragma weak _makecontext = makecontext
+#pragma weak ___makecontext_v2 = __makecontext_v2
 
-#include "synonyms.h"
+#include "lint.h"
 #include <stdarg.h>
 #include <strings.h>
 #include <sys/ucontext.h>
@@ -53,7 +52,7 @@
 static void resumecontext(void);
 
 void
-_makecontext(ucontext_t *ucp, void (*func)(), int argc, ...)
+makecontext(ucontext_t *ucp, void (*func)(), int argc, ...)
 {
 	greg_t *reg;
 	long *tsp;
diff --git a/usr/src/lib/libc/sparcv9/gen/memchr.s b/usr/src/lib/libc/sparcv9/gen/memchr.s
index d0f4a6c905..d04b7b6526 100644
--- a/usr/src/lib/libc/sparcv9/gen/memchr.s
+++ b/usr/src/lib/libc/sparcv9/gen/memchr.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,14 +18,16 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2003 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%"
 
-	.file "%M%"
 /*
  * Return the ptr in sptr at which the character c1 appears;
  * or NULL if not found in n chars; don't stop at \0.
@@ -47,7 +48,6 @@
  */
 
 #include <sys/asm_linkage.h>
-#include "synonyms.h"
 
 	! The first part of this algorithm focuses on determining
 	! whether or not the desired character is in the first few bytes
diff --git a/usr/src/lib/libc/sparcv9/gen/memcmp.s b/usr/src/lib/libc/sparcv9/gen/memcmp.s
index bc1846b180..d551a68b6d 100644
--- a/usr/src/lib/libc/sparcv9/gen/memcmp.s
+++ b/usr/src/lib/libc/sparcv9/gen/memcmp.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 (c) 1997-1998 by 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%"
 
@@ -55,8 +55,6 @@
 
 	ANSI_PRAGMA_WEAK(memcmp,function)
 
-#include "synonyms.h"
-
 	ENTRY(memcmp)
 	cmp	%o0, %o1		! s1 == s2?
 	be,pn	%xcc, .cmpeq
diff --git a/usr/src/lib/libc/sparcv9/gen/memcpy.s b/usr/src/lib/libc/sparcv9/gen/memcpy.s
index 46e22d08b2..4bea160cee 100644
--- a/usr/src/lib/libc/sparcv9/gen/memcpy.s
+++ b/usr/src/lib/libc/sparcv9/gen/memcpy.s
@@ -24,7 +24,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 	.file	"%M%"
 
@@ -58,8 +58,6 @@
 
 	ANSI_PRAGMA_WEAK(memcpy,function)
 
-#include "synonyms.h"
-
 	ENTRY(memcpy)
 	ENTRY(__align_cpy_1)
 	mov	%o0, %g5		! save des address for return val
diff --git a/usr/src/lib/libc/sparcv9/gen/memmove.s b/usr/src/lib/libc/sparcv9/gen/memmove.s
index 05348f1997..5b85b05c20 100644
--- a/usr/src/lib/libc/sparcv9/gen/memmove.s
+++ b/usr/src/lib/libc/sparcv9/gen/memmove.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 (c) 1997, by 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,8 +32,6 @@
 
 	ANSI_PRAGMA_WEAK(memmove,function)
 
-#include "synonyms.h"
-
 /*
  * memmove(s1, s2, len)
  * Copy s2 to s1, always copy n bytes.
diff --git a/usr/src/lib/libc/sparcv9/gen/memset.s b/usr/src/lib/libc/sparcv9/gen/memset.s
index 72fe265317..92110f5e6a 100644
--- a/usr/src/lib/libc/sparcv9/gen/memset.s
+++ b/usr/src/lib/libc/sparcv9/gen/memset.s
@@ -24,7 +24,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 	.file	"%M%"
 
@@ -76,8 +76,6 @@
 
 	ANSI_PRAGMA_WEAK(memset,function)
 
-#include "synonyms.h"
-
 	ENTRY(memset)
 	mov	%o0, %o5		! need to return this value
 	cmp	%o2, 7			
diff --git a/usr/src/lib/libc/sparcv9/gen/setjmp.s b/usr/src/lib/libc/sparcv9/gen/setjmp.s
index 35f977ea05..0d381be0c8 100644
--- a/usr/src/lib/libc/sparcv9/gen/setjmp.s
+++ b/usr/src/lib/libc/sparcv9/gen/setjmp.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,26 +18,24 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1988 AT&T	*/
-/*	  All Rights Reserved	*/
-
 
 /*
- * Copyright 1987-2003 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"	/* SVr4.0 1.4	*/
+/*	Copyright (c) 1988 AT&T	*/
+/*	  All Rights Reserved	*/
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-	.file	"setjmp.s"
+	.file	"%M%"
 
 #include <sys/asm_linkage.h>
 
 	ANSI_PRAGMA_WEAK(setjmp,function)
 	ANSI_PRAGMA_WEAK(longjmp,function)
 
-#include "synonyms.h"
-
 #include <sys/trap.h>
 
 JB_FLAGS	= (0*8)	! offsets in jmpbuf (see siglongjmp.c)
diff --git a/usr/src/lib/libc/sparcv9/gen/siginfolst.c b/usr/src/lib/libc/sparcv9/gen/siginfolst.c
index 8939850c60..712e70c582 100644
--- a/usr/src/lib/libc/sparcv9/gen/siginfolst.c
+++ b/usr/src/lib/libc/sparcv9/gen/siginfolst.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,18 +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.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#include "synonyms.h"
+#include "lint.h"
 #include <signal.h>
 #include <siginfo.h>
 
diff --git a/usr/src/lib/libc/sparcv9/gen/siglongjmp.c b/usr/src/lib/libc/sparcv9/gen/siglongjmp.c
index 5efc2e28a2..83a640397d 100644
--- a/usr/src/lib/libc/sparcv9/gen/siglongjmp.c
+++ b/usr/src/lib/libc/sparcv9/gen/siglongjmp.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.
@@ -21,19 +20,18 @@
  */
 
 /*
- * Copyright 2006 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 siglongjmp = _siglongjmp
+#pragma weak _siglongjmp = siglongjmp
 
-#include "synonyms.h"
+#include "lint.h"
 #include <sys/types.h>
 #include <sys/stack.h>
 #include <sys/frame.h>
diff --git a/usr/src/lib/libc/sparcv9/gen/strcasecmp.s b/usr/src/lib/libc/sparcv9/gen/strcasecmp.s
index a9423ea749..32ac6bf3e1 100644
--- a/usr/src/lib/libc/sparcv9/gen/strcasecmp.s
+++ b/usr/src/lib/libc/sparcv9/gen/strcasecmp.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,14 +18,16 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2003 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%"
+
 /*
  * The strcasecmp() function is a case insensitive versions of strcmp().
  * It assumes the ASCII character set and ignores differences in case
@@ -116,9 +117,7 @@
  * Both algorithms have been tested exhaustively for all possible 2^32 inputs.
  */
 
-
 #include <sys/asm_linkage.h>
-#include "synonyms.h"
 
 	! The first part of this algorithm walks through the beginning of
 	! both strings a byte at a time until the source ptr is  aligned to 
diff --git a/usr/src/lib/libc/sparcv9/gen/strchr.s b/usr/src/lib/libc/sparcv9/gen/strchr.s
index afc1fff4db..910399e822 100644
--- a/usr/src/lib/libc/sparcv9/gen/strchr.s
+++ b/usr/src/lib/libc/sparcv9/gen/strchr.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 2003 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%"
 
@@ -35,7 +35,6 @@
  */
 
 #include <sys/asm_linkage.h>
-#include "synonyms.h"
 
 	! Here, we start by checking to see if we're searching the dest
 	! string for a null byte.  We have fast code for this, so it's
diff --git a/usr/src/lib/libc/sparcv9/gen/strcmp.s b/usr/src/lib/libc/sparcv9/gen/strcmp.s
index 57525d2347..34c9d46d18 100644
--- a/usr/src/lib/libc/sparcv9/gen/strcmp.s
+++ b/usr/src/lib/libc/sparcv9/gen/strcmp.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,13 +18,13 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2003 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%"
 
@@ -52,7 +51,6 @@
  */
 
 #include <sys/asm_linkage.h>
-#include "synonyms.h"
 
 	! This strcmp implementation first determines whether s1 is aligned.
 	! If it is not, it attempts to align it and then checks the
diff --git a/usr/src/lib/libc/sparcv9/gen/strcpy.s b/usr/src/lib/libc/sparcv9/gen/strcpy.s
index 77d98e1856..ac97dd6566 100644
--- a/usr/src/lib/libc/sparcv9/gen/strcpy.s
+++ b/usr/src/lib/libc/sparcv9/gen/strcpy.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 2003 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%"
 
@@ -51,7 +51,6 @@
  */
 
 #include <sys/asm_linkage.h>
-#include "synonyms.h"
 
 	! This implementation of strcpy works by first checking the
 	! source alignment and copying byte, half byte, or word
diff --git a/usr/src/lib/libc/sparcv9/gen/strlcpy.s b/usr/src/lib/libc/sparcv9/gen/strlcpy.s
index 24e5b558b7..810b331921 100644
--- a/usr/src/lib/libc/sparcv9/gen/strlcpy.s
+++ b/usr/src/lib/libc/sparcv9/gen/strlcpy.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 2003 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%"
 
@@ -40,7 +40,6 @@
  */
 
 #include <sys/asm_linkage.h>
-#include "synonyms.h"
 
 	! strlcpy implementation is similar to that of strcpy, except
 	! in this case, the maximum size of the detination must be
diff --git a/usr/src/lib/libc/sparcv9/gen/strlen.s b/usr/src/lib/libc/sparcv9/gen/strlen.s
index 09da4ed196..e709690f79 100644
--- a/usr/src/lib/libc/sparcv9/gen/strlen.s
+++ b/usr/src/lib/libc/sparcv9/gen/strlen.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,13 +18,13 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2003 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%"
 
@@ -50,7 +49,6 @@
  */
 
 #include <sys/asm_linkage.h>
-#include "synonyms.h"
 
 	! The object of strlen is to, as quickly as possible, find the
 	! null byte.  To this end, we attempt to get our string aligned
diff --git a/usr/src/lib/libc/sparcv9/gen/strncmp.s b/usr/src/lib/libc/sparcv9/gen/strncmp.s
index 56460a213a..519669005c 100644
--- a/usr/src/lib/libc/sparcv9/gen/strncmp.s
+++ b/usr/src/lib/libc/sparcv9/gen/strncmp.s
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -50,7 +50,6 @@
  */
 
 #include <sys/asm_linkage.h>
-#include "synonyms.h"
 
 	ENTRY(strncmp)
 	save	%sp, -SA(WINDOWSIZE), %sp
diff --git a/usr/src/lib/libc/sparcv9/gen/strncpy.s b/usr/src/lib/libc/sparcv9/gen/strncpy.s
index 03f04c999c..fe73b67bf6 100644
--- a/usr/src/lib/libc/sparcv9/gen/strncpy.s
+++ b/usr/src/lib/libc/sparcv9/gen/strncpy.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 2003 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%"
 
@@ -53,7 +53,6 @@
  */
 
 #include <sys/asm_linkage.h>
-#include "synonyms.h"
 
 	! strncpy works similarly to strcpy, except that n bytes of s2
 	! are copied to s1. If a null character is reached in s2 yet more
diff --git a/usr/src/lib/libc/sparcv9/gen/swapctxt.c b/usr/src/lib/libc/sparcv9/gen/swapctxt.c
index 8c052ca843..c2b527e868 100644
--- a/usr/src/lib/libc/sparcv9/gen/swapctxt.c
+++ b/usr/src/lib/libc/sparcv9/gen/swapctxt.c
@@ -29,9 +29,9 @@
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#pragma weak swapcontext = _swapcontext
+#pragma weak _swapcontext = swapcontext
 
-#include "synonyms.h"
+#include "lint.h"
 #include "thr_uberdata.h"
 #include <ucontext.h>
 #include <sys/types.h>