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

40 files changed, 250 insertions, 484 deletions

diff --git a/usr/src/lib/libc/amd64/Makefile b/usr/src/lib/libc/amd64/Makefile
index 3762e097e0..d2db427b4f 100644
--- a/usr/src/lib/libc/amd64/Makefile
+++ b/usr/src/lib/libc/amd64/Makefile
@@ -109,10 +109,7 @@ GENOBJS=			\
 	errlst.o		\
 	amd64_data.o		\
 	ldivide.o		\
-	lexp10.o		\
-	llog10.o		\
 	lock.o			\
-	ltostr.o		\
 	makectxt.o		\
 	memccpy.o		\
 	memchr.o		\
@@ -452,10 +449,12 @@ PORTGEN=			\
 	l64a.o			\
 	lckpwdf.o		\
 	lconstants.o		\
+	lexp10.o		\
 	lfind.o			\
 	lfmt.o			\
 	lfmt_log.o		\
 	lldiv.o			\
+	llog10.o		\
 	lltostr.o		\
 	lmath.o			\
 	localtime.o		\
@@ -988,9 +987,6 @@ SRCS=							\
 	$(FPOBJS:%.o=fp/%.c)				\
 	$(I386FPOBJS:%.o=../i386/fp/%.c)		\
 	$(LIBCBASE)/gen/ecvt.c				\
-	$(LIBCBASE)/gen/lexp10.c			\
-	$(LIBCBASE)/gen/llog10.c			\
-	$(LIBCBASE)/gen/ltostr.c			\
 	$(LIBCBASE)/gen/makectxt.c			\
 	$(LIBCBASE)/gen/siginfolst.c			\
 	$(LIBCBASE)/gen/siglongjmp.c			\
diff --git a/usr/src/lib/libc/amd64/fp/_base_il.c b/usr/src/lib/libc/amd64/fp/_base_il.c
index 5ced00d6cf..da4e3ea506 100644
--- a/usr/src/lib/libc/amd64/fp/_base_il.c
+++ b/usr/src/lib/libc/amd64/fp/_base_il.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,15 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2005 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"
 
-/*LINTLIBRARY*/
-
-#include "synonyms.h"
+#include "lint.h"
 #include "base_conversion.h"
 #include <sys/isa_defs.h>
 
diff --git a/usr/src/lib/libc/amd64/fp/fpgetmask.c b/usr/src/lib/libc/amd64/fp/fpgetmask.c
index c0ac38ffb6..169d911a40 100644
--- a/usr/src/lib/libc/amd64/fp/fpgetmask.c
+++ b/usr/src/lib/libc/amd64/fp/fpgetmask.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,21 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1990, 1991 UNIX System Laboratories, Inc.	*/
-/*	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) 1990, 1991 UNIX System Laboratories, Inc.	*/
+/*	Copyright (c) 1988 AT&T	*/
+/*	  All Rights Reserved	*/
+
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#pragma weak fpgetmask = _fpgetmask
+#pragma weak _fpgetmask = fpgetmask
 
-#include "synonyms.h"
+#include "lint.h"
 #include <ieeefp.h>
 #include "fp.h"
 
diff --git a/usr/src/lib/libc/amd64/fp/fpgetround.c b/usr/src/lib/libc/amd64/fp/fpgetround.c
index 4966c4fb0b..19a437f04d 100644
--- a/usr/src/lib/libc/amd64/fp/fpgetround.c
+++ b/usr/src/lib/libc/amd64/fp/fpgetround.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,21 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1990, 1991 UNIX System Laboratories, Inc.	*/
-/*	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) 1990, 1991 UNIX System Laboratories, Inc.	*/
+/*	Copyright (c) 1988 AT&T	*/
+/*	  All Rights Reserved	*/
+
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#pragma weak fpgetround = _fpgetround
+#pragma weak _fpgetround = fpgetround
 
-#include "synonyms.h"
+#include "lint.h"
 #include <ieeefp.h>
 #include "fp.h"
 
diff --git a/usr/src/lib/libc/amd64/fp/fpgetsticky.c b/usr/src/lib/libc/amd64/fp/fpgetsticky.c
index c0eb41d6a3..651922b0cc 100644
--- a/usr/src/lib/libc/amd64/fp/fpgetsticky.c
+++ b/usr/src/lib/libc/amd64/fp/fpgetsticky.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,22 +18,23 @@
  *
  * 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 <ieeefp.h>
-#include "synonyms.h"
+#pragma weak _fpgetsticky = fpgetsticky
 
-#pragma weak fpgetsticky = _fpgetsticky
+#include "lint.h"
+#include <ieeefp.h>
 
 extern void _getsw(int *), _getmxcsr(int *);
 
 fp_except
-_fpgetsticky(void) {
+fpgetsticky(void) {
 	int sw, mxcsr;
 
 	_getsw(&sw);
diff --git a/usr/src/lib/libc/amd64/fp/fpsetmask.c b/usr/src/lib/libc/amd64/fp/fpsetmask.c
index 36354eb342..b6b7230ae8 100644
--- a/usr/src/lib/libc/amd64/fp/fpsetmask.c
+++ b/usr/src/lib/libc/amd64/fp/fpsetmask.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,22 +18,23 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1990, 1991 UNIX System Laboratories, Inc.	*/
-/*	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) 1990, 1991 UNIX System Laboratories, Inc.	*/
+/*	Copyright (c) 1988 AT&T	*/
+/*	  All Rights Reserved	*/
+
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#pragma weak fpsetmask = _fpsetmask
+#pragma weak _fpsetmask = fpsetmask
 
 extern void	_getmxcsr(int *), _putmxcsr(int);
 
-#include "synonyms.h"
+#include "lint.h"
 #include <ieeefp.h>
 #include "fp.h"
 
diff --git a/usr/src/lib/libc/amd64/fp/fpsetround.c b/usr/src/lib/libc/amd64/fp/fpsetround.c
index df1d14408c..3312c2d5d8 100644
--- a/usr/src/lib/libc/amd64/fp/fpsetround.c
+++ b/usr/src/lib/libc/amd64/fp/fpsetround.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,21 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1990, 1991 UNIX System Laboratories, Inc.	*/
-/*	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) 1990, 1991 UNIX System Laboratories, Inc.	*/
+/*	Copyright (c) 1988 AT&T	*/
+/*	  All Rights Reserved	*/
+
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#pragma weak fpsetround = _fpsetround
+#pragma weak _fpsetround = fpsetround
 
-#include "synonyms.h"
+#include "lint.h"
 #include <ieeefp.h>
 #include "fp.h"
 
diff --git a/usr/src/lib/libc/amd64/fp/fpsetsticky.c b/usr/src/lib/libc/amd64/fp/fpsetsticky.c
index c764dd3075..7092506a5a 100644
--- a/usr/src/lib/libc/amd64/fp/fpsetsticky.c
+++ b/usr/src/lib/libc/amd64/fp/fpsetsticky.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,22 +18,23 @@
  *
  * 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 "lint.h"
 #include <ieeefp.h>
-#include "synonyms.h"
 
-#pragma weak fpsetsticky = _fpsetsticky
+#pragma weak _fpsetsticky = fpsetsticky
 
 extern void _getsw(int *), _putsw(int), _getmxcsr(int *), _putmxcsr(int);
 
 fp_except
-_fpsetsticky(fp_except s) {
+fpsetsticky(fp_except s) {
 	int sw, mxcsr;
 
 	_getsw(&sw);
diff --git a/usr/src/lib/libc/amd64/fp/fpstart.c b/usr/src/lib/libc/amd64/fp/fpstart.c
index 7648ced19a..a091d82977 100644
--- a/usr/src/lib/libc/amd64/fp/fpstart.c
+++ b/usr/src/lib/libc/amd64/fp/fpstart.c
@@ -43,7 +43,7 @@
 
 #pragma weak _fpstart = __fpstart
 
-#include "synonyms.h"
+#include "lint.h"
 #include <sys/types.h>
 #include <sys/sysi86.h>	/* for SI86FPHW/SI86FPSTART definitions */
 #include <sys/fp.h>	/* for FPU_CW_INIT and SSE_MXCSR_INIT */
diff --git a/usr/src/lib/libc/amd64/gen/abs.s b/usr/src/lib/libc/amd64/gen/abs.s
index fe559eb08f..cbbad9e274 100644
--- a/usr/src/lib/libc/amd64/gen/abs.s
+++ b/usr/src/lib/libc/amd64/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,11 +20,11 @@
  */
 
 /*
- * 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%"
 
@@ -39,10 +38,6 @@
  *	}
  */
 
-#include <sys/asm_linkage.h>
-
-	ANSI_PRAGMA_WEAK(llabs,function)
-
 #include "SYS.h"
 
 	ENTRY(abs)
diff --git a/usr/src/lib/libc/amd64/gen/ecvt.c b/usr/src/lib/libc/amd64/gen/ecvt.c
index 5b135f343c..23e82f8945 100644
--- a/usr/src/lib/libc/amd64/gen/ecvt.c
+++ b/usr/src/lib/libc/amd64/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"
 
 /*
@@ -38,13 +37,10 @@
  *
  */
 
-#pragma weak ecvt = _ecvt
-#pragma weak fcvt = _fcvt
-#pragma weak qecvt = _qecvt
-#pragma weak qfcvt = _qfcvt
-#pragma weak qgcvt = _qgcvt
+#pragma weak _ecvt = ecvt
+#pragma weak _fcvt = fcvt
 
-#include "synonyms.h"
+#include "lint.h"
 #include <sys/types.h>
 #include <stdlib.h>
 #include <floatingpoint.h>
diff --git a/usr/src/lib/libc/amd64/gen/lexp10.c b/usr/src/lib/libc/amd64/gen/lexp10.c
deleted file mode 100644
index 122d1aa736..0000000000
--- a/usr/src/lib/libc/amd64/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 2004 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/amd64/gen/llog10.c b/usr/src/lib/libc/amd64/gen/llog10.c
deleted file mode 100644
index 13407fa44a..0000000000
--- a/usr/src/lib/libc/amd64/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 2004 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/amd64/gen/ltostr.c b/usr/src/lib/libc/amd64/gen/ltostr.c
deleted file mode 100644
index a213156374..0000000000
--- a/usr/src/lib/libc/amd64/gen/ltostr.c
+++ /dev/null
@@ -1,67 +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 2004 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-/*
- *	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/amd64/gen/makectxt.c b/usr/src/lib/libc/amd64/gen/makectxt.c
index 1ca4bebd50..5b2ce15313 100644
--- a/usr/src/lib/libc/amd64/gen/makectxt.c
+++ b/usr/src/lib/libc/amd64/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.
  */
 
 /*	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>
@@ -120,6 +119,6 @@ resumecontext(void)
 {
 	ucontext_t uc;
 
-	getcontext(&uc);
-	setcontext(uc.uc_link);
+	(void) getcontext(&uc);
+	(void) setcontext(uc.uc_link);
 }
diff --git a/usr/src/lib/libc/amd64/gen/memccpy.s b/usr/src/lib/libc/amd64/gen/memccpy.s
index 2743161583..a3c57d0115 100644
--- a/usr/src/lib/libc/amd64/gen/memccpy.s
+++ b/usr/src/lib/libc/amd64/gen/memccpy.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,8 +32,6 @@
 
 	ANSI_PRAGMA_WEAK(memccpy,function)
 
-#include "SYS.h"
-
 	ENTRY(memccpy)	/* (void *dst, void *src, uchar_t c, size_t) */
 .loop:
 	decq	%rcx		/ decrement bytes to go
diff --git a/usr/src/lib/libc/amd64/gen/memcpy.s b/usr/src/lib/libc/amd64/gen/memcpy.s
index 1b77babf0a..7d5dc2f624 100644
--- a/usr/src/lib/libc/amd64/gen/memcpy.s
+++ b/usr/src/lib/libc/amd64/gen/memcpy.s
@@ -20,6 +20,11 @@
  */
 
 /*
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*
  * Copyright (c) 2008, Intel Corporation
  * All rights reserved.
  */
@@ -28,15 +33,16 @@
  * memcpy.s - copies two blocks of memory
  *	Implements memcpy() and memmove() libc primitives.
  */
-	.ident	"%Z%%M%	%I%	%E% SMI"
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 	.file	"%M%"
 
 #include <sys/asm_linkage.h>
+
 	ANSI_PRAGMA_WEAK(memmove,function)
 	ANSI_PRAGMA_WEAK(memcpy,function)
 
-#include "synonyms.h"
 #include "cache.h"
 #include "proc64_id.h"
 
diff --git a/usr/src/lib/libc/amd64/gen/memset.s b/usr/src/lib/libc/amd64/gen/memset.s
index 618fcb874d..754d72910f 100644
--- a/usr/src/lib/libc/amd64/gen/memset.s
+++ b/usr/src/lib/libc/amd64/gen/memset.s
@@ -20,18 +20,23 @@
  */
 
 /*
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*
  * Copyright (c) 2008, Intel Corporation
  * All rights reserved.
  */
-		.ident	"%Z%%M%	%I%	%E% SMI"
 
-		.file	"%M%"
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+	.file	"%M%"
 
 #include <sys/asm_linkage.h>
 
-		ANSI_PRAGMA_WEAK(memset,function)
+	ANSI_PRAGMA_WEAK(memset,function)
 
-#include "synonyms.h"
 #include "cache.h"
 #include "proc64_id.h"
 
diff --git a/usr/src/lib/libc/amd64/gen/proc64_support.s b/usr/src/lib/libc/amd64/gen/proc64_support.s
index ac2c354aa5..5ac7f046b2 100644
--- a/usr/src/lib/libc/amd64/gen/proc64_support.s
+++ b/usr/src/lib/libc/amd64/gen/proc64_support.s
@@ -20,6 +20,11 @@
  */
 
 /*
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*
  * Copyright (c) 2008, Intel Corporation
  * All rights reserved.
  */
@@ -28,12 +33,12 @@
  * Assembler support routines to getcpuid information used to set
  * cache size information. Cache information used by memset, strcpy, etc..
  */
-	.ident	"%Z%%M%	%I%	%E% SMI"
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 	.file	"%M%"
 
 #include <sys/asm_linkage.h>
-#include "synonyms.h"
 #include "proc64_id.h"
 
 	.global .memops_method
diff --git a/usr/src/lib/libc/amd64/gen/setjmp.s b/usr/src/lib/libc/amd64/gen/setjmp.s
index ab8b79fcec..762a88f3a7 100644
--- a/usr/src/lib/libc/amd64/gen/setjmp.s
+++ b/usr/src/lib/libc/amd64/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,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%"
 
@@ -54,8 +54,6 @@
 	ANSI_PRAGMA_WEAK(setjmp,function)
 	ANSI_PRAGMA_WEAK(longjmp,function)
 
-#include "SYS.h"
-
 	ENTRY(setjmp)
 	movq	%rbx, 0(%rdi)
 	movq	%r12, 8(%rdi)
diff --git a/usr/src/lib/libc/amd64/gen/siginfolst.c b/usr/src/lib/libc/amd64/gen/siginfolst.c
index 28a17bc804..fb2868f22f 100644
--- a/usr/src/lib/libc/amd64/gen/siginfolst.c
+++ b/usr/src/lib/libc/amd64/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.
  */
 
 /*	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/amd64/gen/siglongjmp.c b/usr/src/lib/libc/amd64/gen/siglongjmp.c
index 4bc4c579a4..07a89b485f 100644
--- a/usr/src/lib/libc/amd64/gen/siglongjmp.c
+++ b/usr/src/lib/libc/amd64/gen/siglongjmp.c
@@ -20,24 +20,22 @@
  */
 
 /*
- * 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"
 
-#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)
 {
 	/* LINTED alignment */
 	ucontext_t *ucp = (ucontext_t *)env;
@@ -47,5 +45,5 @@ _siglongjmp(sigjmp_buf env, int val)
 	else
 		ucp->uc_mcontext.gregs[REG_R0] = 1;
 
-	(void) _setcontext(ucp);
+	(void) setcontext(ucp);
 }
diff --git a/usr/src/lib/libc/amd64/gen/wschr.s b/usr/src/lib/libc/amd64/gen/wschr.s
index ced5362101..eb80866bf2 100644
--- a/usr/src/lib/libc/amd64/gen/wschr.s
+++ b/usr/src/lib/libc/amd64/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>
 
 	ANSI_PRAGMA_WEAK(wcschr,function)
 	ANSI_PRAGMA_WEAK(wschr,function)
 
-#include "SYS.h"
-
 	.align	8		/ accounts for .loop alignment and prolog
 
-	ENTRY(_wcschr)		/* (wchar_t *s, wchar_t wc) */
+	ENTRY(wcschr)		/* (wchar_t *s, wchar_t wc) */
 	movq	%rdi,%rax
 .loop:
 	movl	(%rax),%edx	/ %edx = wchar of string
@@ -87,8 +83,8 @@
 	addq	$4,%rax
 .found:
 	ret
-	SET_SIZE(_wcschr)
+	SET_SIZE(wcschr)
 
-	ENTRY(_wschr)
-	jmp	_wcschr		/ tail call into _wcschr
-	SET_SIZE(_wschr)
+	ENTRY(wschr)
+	jmp	wcschr		/ tail call into wcschr
+	SET_SIZE(wschr)
diff --git a/usr/src/lib/libc/amd64/gen/wslen.s b/usr/src/lib/libc/amd64/gen/wslen.s
index f27d0ba675..155191a997 100644
--- a/usr/src/lib/libc/amd64/gen/wslen.s
+++ b/usr/src/lib/libc/amd64/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++)
@@ -46,9 +46,7 @@
 	ANSI_PRAGMA_WEAK(wcslen,function)
 	ANSI_PRAGMA_WEAK(wslen,function)
 
-#include "SYS.h"
-
-	ENTRY(_wcslen)		/* (wchar_t *) */
+	ENTRY(wcslen)		/* (wchar_t *) */
 	xorl	%eax,%eax
 
 	.align	8
@@ -80,8 +78,8 @@
 .out3:
 	addq	$3, %rax
 	ret			
-	SET_SIZE(_wcslen)
+	SET_SIZE(wcslen)
 
-	ENTRY(_wslen)
-	jmp	_wcslen		/ tail call into _wcslen
-	SET_SIZE(_wslen)
+	ENTRY(wslen)
+	jmp	wcslen		/ tail call into wcslen
+	SET_SIZE(wslen)
diff --git a/usr/src/lib/libc/amd64/gen/wsncmp.s b/usr/src/lib/libc/amd64/gen/wsncmp.s
index b1e8fd91ff..7697cac3b7 100644
--- a/usr/src/lib/libc/amd64/gen/wsncmp.s
+++ b/usr/src/lib/libc/amd64/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>
 
 	ANSI_PRAGMA_WEAK(wcsncmp,function)
 	ANSI_PRAGMA_WEAK(wsncmp,function)
 
-#include "SYS.h"
-
-	ENTRY(_wcsncmp)		/* (wchar *ws1, wchar_t *ws2, size_t n) */
+	ENTRY(wcsncmp)		/* (wchar *ws1, wchar_t *ws2, size_t n) */
 	cmpq	%rdi,%rsi	/ same string?
 	je	.equal
 	incq	%rdx		/ will later predecrement this uint
@@ -96,8 +92,8 @@
 .notequal_0:
 	subl	(%rsi),%eax	/ return value is (*s1 - *--s2)
 	ret
-	SET_SIZE(_wcsncmp)
+	SET_SIZE(wcsncmp)
 
-	ENTRY(_wsncmp)
-	jmp	_wcsncmp	/ tail call into _wcsncmp
-	SET_SIZE(_wsncmp)
+	ENTRY(wsncmp)
+	jmp	wcsncmp		/ tail call into wcsncmp
+	SET_SIZE(wsncmp)
diff --git a/usr/src/lib/libc/amd64/inc/SYS.h b/usr/src/lib/libc/amd64/inc/SYS.h
index 3c45d609a8..e3b1e09bb3 100644
--- a/usr/src/lib/libc/amd64/inc/SYS.h
+++ b/usr/src/lib/libc/amd64/inc/SYS.h
@@ -18,8 +18,9 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -34,15 +35,6 @@
 #include <sys/asm_linkage.h>
 #include <sys/syscall.h>
 #include <sys/errno.h>
-#include "synonyms.h"
-
-#undef	syscall		/* override synonyms.h */
-
-/*
- * XX64 -- the SOS9 assembler doesn't recognize the 'syscall' instruction yet.
- * We compensate by defining the byte sequence here.
- */
-#define	syscall	.byte 0xf, 0x5
 
 #define	_fref_(name)	name@PLT
 #define	_daref_(name)	name@GOTPCREL(%rip)
diff --git a/usr/src/lib/libc/amd64/sys/_lwp_mutex_unlock.s b/usr/src/lib/libc/amd64/sys/_lwp_mutex_unlock.s
index bb8723a8ae..e89a141fa4 100644
--- a/usr/src/lib/libc/amd64/sys/_lwp_mutex_unlock.s
+++ b/usr/src/lib/libc/amd64/sys/_lwp_mutex_unlock.s
@@ -28,10 +28,6 @@
 
 	.file	"%M%"
 
-#include <sys/asm_linkage.h>
-
-	ANSI_PRAGMA_WEAK(_lwp_mutex_unlock,function)
-
 #include "SYS.h"
 #include <../assym.h>
 
diff --git a/usr/src/lib/libc/amd64/sys/door.s b/usr/src/lib/libc/amd64/sys/door.s
index 381e14b503..fc32051198 100644
--- a/usr/src/lib/libc/amd64/sys/door.s
+++ b/usr/src/lib/libc/amd64/sys/door.s
@@ -28,27 +28,18 @@
 
 	.file	"%M%"
 
-#include <sys/asm_linkage.h>
+#include "SYS.h"
+#include <sys/door.h>
 
 	/*
 	 * weak aliases for public interfaces
 	 */
-	ANSI_PRAGMA_WEAK(_door_bind,function)
-	ANSI_PRAGMA_WEAK(_door_getparam,function)
-	ANSI_PRAGMA_WEAK(_door_info,function)
-	ANSI_PRAGMA_WEAK(_door_revoke,function)
-	ANSI_PRAGMA_WEAK(_door_setparam,function)
-	ANSI_PRAGMA_WEAK(_door_unbind,function)
-
-	ANSI_PRAGMA_WEAK(door_bind,function)
-	ANSI_PRAGMA_WEAK(door_getparam,function)
-	ANSI_PRAGMA_WEAK(door_info,function)
-	ANSI_PRAGMA_WEAK(door_revoke,function)
-	ANSI_PRAGMA_WEAK(door_setparam,function)
-	ANSI_PRAGMA_WEAK(door_unbind,function)
-
-#include <sys/door.h>
-#include "SYS.h"
+	ANSI_PRAGMA_WEAK2(door_bind,__door_bind,function)
+	ANSI_PRAGMA_WEAK2(door_getparam,__door_getparam,function)
+	ANSI_PRAGMA_WEAK2(door_info,__door_info,function)
+	ANSI_PRAGMA_WEAK2(door_revoke,__door_revoke,function)
+	ANSI_PRAGMA_WEAK2(door_setparam,__door_setparam,function)
+	ANSI_PRAGMA_WEAK2(door_unbind,__door_unbind,function)
 
 /*
  * Offsets within struct door_results
@@ -127,7 +118,7 @@ door_restart:
 	call	*%rax
 	/* Exit the thread if we return here */
 	movq	$0, %rdi
-	call	_thr_terminate
+	call	_thrp_terminate
 	/* NOTREACHED */
 2:
 	/*
diff --git a/usr/src/lib/libc/amd64/sys/gettimeofday.s b/usr/src/lib/libc/amd64/sys/gettimeofday.s
index 0693fd8161..9dfd958292 100644
--- a/usr/src/lib/libc/amd64/sys/gettimeofday.s
+++ b/usr/src/lib/libc/amd64/sys/gettimeofday.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,8 +18,9 @@
  *
  * 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.
  */
 
@@ -28,19 +28,17 @@
 
 	.file	"%M%"
 
-#include <sys/asm_linkage.h>
+#include "SYS.h"
 
 	ANSI_PRAGMA_WEAK(gettimeofday,function)
 
-#include "SYS.h"
-
 /*
  *  implements int gettimeofday(struct timeval *tp, void *tzp)
  *
  *	note that tzp is always ignored
  */
 
-	ENTRY(_gettimeofday)
+	ENTRY(gettimeofday)
 /*
  *	use long long gethrestime()
  */
@@ -60,5 +58,5 @@
 	movq	%rdx, 8(%rcx)	/* store usecs into timeval ptr + 8. */
 1:
 	RETC			/* return 0 */
-	SET_SIZE(_gettimeofday)
+	SET_SIZE(gettimeofday)
 
diff --git a/usr/src/lib/libc/amd64/sys/lwp_private.s b/usr/src/lib/libc/amd64/sys/lwp_private.s
index d6f0f0621a..757dd83209 100644
--- a/usr/src/lib/libc/amd64/sys/lwp_private.s
+++ b/usr/src/lib/libc/amd64/sys/lwp_private.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,22 +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"
 
-	.file	"lwp_private.s"
-
-#include <sys/asm_linkage.h>
+	.file	"%M%"
 
 #include "SYS.h"
 
 /*
  * int
- * __lwp_setprivate(int cmd, int which, void *base)
+ * ___lwp_private(int cmd, int which, void *base)
  */
 	ENTRY(___lwp_private)
 	SYSTRAP_RVAL1(lwp_private)
diff --git a/usr/src/lib/libc/amd64/sys/syscall.s b/usr/src/lib/libc/amd64/sys/syscall.s
index 1eb1627751..d93ca204b6 100644
--- a/usr/src/lib/libc/amd64/sys/syscall.s
+++ b/usr/src/lib/libc/amd64/sys/syscall.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,8 +18,9 @@
  *
  * 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.
  */
 
@@ -28,16 +28,11 @@
 
 	.file	"%M%"
 
-#include <sys/asm_linkage.h>
-
-	ANSI_PRAGMA_WEAK(syscall,function)
-
 #include "SYS.h"
 
-#undef _syscall		/* override "synonyms.h" */
-#undef __systemcall
+	ANSI_PRAGMA_WEAK(syscall,function)
 
-	ENTRY(_syscall)
+	ENTRY(syscall)
 	pushq	%rbp
 	movq	%rsp, %rbp
 	/* construct a new call stack frame */
@@ -61,7 +56,7 @@
 	leave
 	SYSCERROR
 	ret
-	SET_SIZE(_syscall)
+	SET_SIZE(syscall)
 
 /*
  * Same as _syscall(), but restricted to 6 syscall arguments
diff --git a/usr/src/lib/libc/amd64/sys/sysi86.s b/usr/src/lib/libc/amd64/sys/sysi86.s
index 14e47db53c..bb1edbfd2a 100644
--- a/usr/src/lib/libc/amd64/sys/sysi86.s
+++ b/usr/src/lib/libc/amd64/sys/sysi86.s
@@ -28,14 +28,10 @@
 
 	.file	"%M%"
 
-#include <sys/asm_linkage.h>
+#include "SYS.h"
 
 	ANSI_PRAGMA_WEAK(sysi86,function)
 
-#include "SYS.h"
-
-	ENTRY(_sysi86)
-	SYSTRAP_RVAL1(sysi86)
-	SYSCERROR
+	SYSCALL_RVAL1(sysi86)
 	RET
-	SET_SIZE(_sysi86)
+	SET_SIZE(sysi86)
diff --git a/usr/src/lib/libc/amd64/sys/uadmin.c b/usr/src/lib/libc/amd64/sys/uadmin.c
index 8caf6d5bc3..bc15f4a9e3 100644
--- a/usr/src/lib/libc/amd64/sys/uadmin.c
+++ b/usr/src/lib/libc/amd64/sys/uadmin.c
@@ -26,8 +26,6 @@
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#pragma weak uadmin = _uadmin
-
 /*
  * Wrapper function to implement reboot w/ arguments on x86
  * platforms. Extract reboot arguments and place them in
@@ -35,7 +33,7 @@
  * All other commands are passed through.
  */
 
-#include "synonyms.h"
+#include "lint.h"
 #include <fcntl.h>
 #include <ctype.h>
 #include <stdio.h>
diff --git a/usr/src/lib/libc/amd64/sys/vforkx.s b/usr/src/lib/libc/amd64/sys/vforkx.s
index 507518572b..741cf593c7 100644
--- a/usr/src/lib/libc/amd64/sys/vforkx.s
+++ b/usr/src/lib/libc/amd64/sys/vforkx.s
@@ -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.
  */
 
@@ -28,11 +28,6 @@
 
 	.file	"%M%"
 
-#include <sys/asm_linkage.h>
-
-	ANSI_PRAGMA_WEAK(vforkx,function)
-	ANSI_PRAGMA_WEAK(vfork,function)
-
 #include "SYS.h"
 #include <assym.h>
 
diff --git a/usr/src/lib/libc/amd64/threads/asm_subr.s b/usr/src/lib/libc/amd64/threads/asm_subr.s
index 181b7b050e..fc724a0bfc 100644
--- a/usr/src/lib/libc/amd64/threads/asm_subr.s
+++ b/usr/src/lib/libc/amd64/threads/asm_subr.s
@@ -35,11 +35,11 @@
 	/*
 	 * This is where execution resumes when a thread created with
 	 * thr_create() or pthread_create() returns (see setup_context()).
-	 * We pass the (void *) return value to _thr_terminate().
+	 * We pass the (void *) return value to _thrp_terminate().
 	 */
 	ENTRY(_lwp_start)
 	movq	%rax, %rdi
-	call	_thr_terminate
+	call	_thrp_terminate
 	RET		/* actually, never returns */
 	SET_SIZE(_lwp_start)
 
diff --git a/usr/src/lib/libc/amd64/threads/machdep.c b/usr/src/lib/libc/amd64/threads/machdep.c
index b9b186398e..844490fabb 100644
--- a/usr/src/lib/libc/amd64/threads/machdep.c
+++ b/usr/src/lib/libc/amd64/threads/machdep.c
@@ -73,7 +73,7 @@ setup_context(ucontext_t *ucp, void *(*func)(ulwp_t *),
  * Machine-dependent startup code for a newly-created thread.
  */
 void *
-_thr_setup(ulwp_t *self)
+_thrp_setup(ulwp_t *self)
 {
 	self->ul_ustack.ss_sp = (void *)(self->ul_stktop - self->ul_stksiz);
 	self->ul_ustack.ss_size = self->ul_stksiz;
diff --git a/usr/src/lib/libc/amd64/unwind/call_frame_inst.c b/usr/src/lib/libc/amd64/unwind/call_frame_inst.c
index 70f6ebab46..f803556066 100644
--- a/usr/src/lib/libc/amd64/unwind/call_frame_inst.c
+++ b/usr/src/lib/libc/amd64/unwind/call_frame_inst.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,8 +18,9 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -31,7 +31,7 @@
  */
 
 #ifndef _LIBCRUN_
-#include "synonyms.h"
+#include "lint.h"
 #endif
 #include <sys/types.h>
 #include "stack_unwind.h"
@@ -144,19 +144,19 @@ fix_cfa(struct _Unwind_Context *ctx, struct register_state *rs)
 {
 	switch (rs[CF_ADDR].rule) {
 	default:
-	    ctx->cfa = 0;
+		ctx->cfa = 0;
 		break;
 	case register_rule:	/* CFA = offset + source_reg */
 		ctx->cfa = (ctx->current_regs)[rs[CF_ADDR].source_reg] +
-			rs[CF_ADDR].offset;
+		    rs[CF_ADDR].offset;
 		break;
 	case constant_rule:	/* CFA = offset */
 		ctx->cfa = rs[CF_ADDR].offset;
 		break;
 	case indirect_rule:	/* CFA = *(offset + source_reg) */
 		ctx->cfa = *(uint64_t *)
-			(ctx->current_regs[rs[CF_ADDR].source_reg] +
-			rs[CF_ADDR].offset);
+		    (ctx->current_regs[rs[CF_ADDR].source_reg] +
+		    rs[CF_ADDR].offset);
 		break;
 	}
 	ctx->entry_regs[SP_RSP] = ctx->cfa;
@@ -168,19 +168,19 @@ fix_ra(struct _Unwind_Context *ctx, struct register_state *rs)
 	switch (rs[RET_ADD].rule) {
 	case undefined_rule:
 	default:
-	    ctx->ra = 0;
+		ctx->ra = 0;
 		break;
 	case offset_rule:	/* RA = *(offset + CFA) */
 		ctx->ra = *(uint64_t *)(ctx->cfa + rs[RET_ADD].offset);
 		break;
 	case register_rule:	/* RA = offset + source_reg */
 		ctx->ra = ctx->current_regs[rs[RET_ADD].source_reg] +
-			rs[RET_ADD].offset;
+		    rs[RET_ADD].offset;
 		break;
 	case indirect_rule:	/* RA = *(offset + source_reg) */
 		ctx->ra = *(uint64_t *)
-			(ctx->current_regs[rs[RET_ADD].source_reg] +
-			rs[RET_ADD].offset);
+		    (ctx->current_regs[rs[RET_ADD].source_reg] +
+		    rs[RET_ADD].offset);
 		break;
 	}
 }
@@ -194,23 +194,23 @@ fix_reg(struct _Unwind_Context *ctx, struct register_state *rs, int index)
 		break;
 	case offset_rule:	/* target_reg = *(offset + CFA) */
 		ctx->entry_regs[index] = *(uint64_t *)
-			(ctx->cfa + rs[index].offset);
+		    (ctx->cfa + rs[index].offset);
 		break;
 	case is_offset_rule:	/* target_reg = offset + CFA */
 		ctx->entry_regs[index] = ctx->cfa + rs[index].offset;
 		break;
 	case register_rule:	/* target_reg = offset + source_reg */
 		ctx->entry_regs[index] =
-			ctx->current_regs[rs[index].source_reg] +
-			rs[index].offset;
+		    ctx->current_regs[rs[index].source_reg] +
+		    rs[index].offset;
 		break;
 	case constant_rule:	/* target_reg = offset */
 		ctx->entry_regs[index] = rs[index].offset;
 		break;
 	case indirect_rule:	/* target_reg = *(offset + source_reg) */
 		ctx->entry_regs[index] = *(uint64_t *)
-			(ctx->current_regs[rs[index].source_reg] +
-			rs[index].offset);
+		    (ctx->current_regs[rs[index].source_reg] +
+		    rs[index].offset);
 		break;
 	}
 }
@@ -249,7 +249,7 @@ _Unw_Rollback_Registers(struct eh_frame_fields *f,
 			return (0);
 		}
 		ctx->entry_regs[FP_RBP] = ((uint64_t *)
-			(ctx->current_regs[FP_RBP]))[0];
+		    (ctx->current_regs[FP_RBP]))[0];
 		ctx->cfa = ctx->current_regs[FP_RBP] + 16;
 		ctx->entry_regs[SP_RSP] = ctx->cfa;
 		ctx->entry_regs[GPR_RBX] = ctx->current_regs[GPR_RBX];
@@ -264,13 +264,13 @@ _Unw_Rollback_Registers(struct eh_frame_fields *f,
 	for (i = 0; i < 18; i++)
 		func_start_state[i] = nop;
 	first_pc = interpret_ops(f->cie_ops, f->cie_ops_end,
-		f->cie_reloc, ctx->func, ctx->pc, func_start_state, 0,
-		f->data_align, f->code_align, f->code_enc);
+	    f->cie_reloc, ctx->func, ctx->pc, func_start_state, 0,
+	    f->data_align, f->code_align, f->code_enc);
 	for (i = 0; i < 18; i++)
 		func_state[i] = func_start_state[i];
 	(void) interpret_ops(f->fde_ops, f->fde_ops_end,
-		f->fde_reloc, first_pc, ctx->pc, func_state, func_start_state,
-		f->data_align, f->code_align, f->code_enc);
+	    f->fde_reloc, first_pc, ctx->pc, func_state, func_start_state,
+	    f->data_align, f->code_align, f->code_enc);
 
 	fix_cfa(ctx, func_state);
 	if (ctx->cfa < ctx->current_regs[SP_RSP]) {
diff --git a/usr/src/lib/libc/amd64/unwind/eh_frame.c b/usr/src/lib/libc/amd64/unwind/eh_frame.c
index 8e3490b318..b4dcad7b24 100644
--- a/usr/src/lib/libc/amd64/unwind/eh_frame.c
+++ b/usr/src/lib/libc/amd64/unwind/eh_frame.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,8 +18,9 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -31,7 +31,7 @@
  */
 
 #ifndef _LIBCRUN_
-#include "synonyms.h"
+#include "lint.h"
 #endif
 #include <sys/types.h>
 #include <limits.h>
@@ -92,13 +92,13 @@ _Unw_Decode_FDE(struct eh_frame_fields *f, struct _Unwind_Context *ctx)
 	fde_data = ctx->fde;
 	data = fde_data;
 	fde_end = (void *)(((intptr_t)fde_data) + 4 +
-		_Unw_get_val(&data, 0, UNUM32, 1, 1, 0));
+	    _Unw_get_val(&data, 0, UNUM32, 1, 1, 0));
 	reloc = 0;
 	base = ((intptr_t)data) + reloc;
 	cie_data = (void *)(base -  _Unw_get_val(&data, 0, UNUM32, 1, 1, 0));
 	cdata = cie_data;
 	cie_end = (void *)(((intptr_t)cie_data) + 4 +
-		_Unw_get_val(&cdata, 0, UNUM32, 1, 1, 0));
+	    _Unw_get_val(&cdata, 0, UNUM32, 1, 1, 0));
 	creloc = 0;
 	/* data mapping has happened */
 
@@ -111,7 +111,7 @@ _Unw_Decode_FDE(struct eh_frame_fields *f, struct _Unwind_Context *ctx)
 	(void) _Unw_get_val(&cdata, creloc, UNUM8, 1, 1, 0);
 	/* LINTED alignment */
 	(*((uint64_t *)(&(augment[0]))))  =
-		_Unw_get_val(&cdata, creloc, ZTSTRING, 1, 1, 0);
+	    _Unw_get_val(&cdata, creloc, ZTSTRING, 1, 1, 0);
 	f->code_align = _Unw_get_val(&cdata, creloc, ULEB128, 1, 1, 0);
 	f->data_align = _Unw_get_val(&cdata, creloc, SLEB128, 1, 1, 0);
 	(void) _Unw_get_val(&cdata, creloc, UNUM8, 1, 1, 0);
@@ -371,7 +371,7 @@ locate_fde_for_pc(uint64_t pc, int enc,
 		    pi + (((pj - pi) >> (log_size + 1)) << log_size);
 				/* Don't use (pi+pj)>>1 */
 		get_table_ent_val(pr, table_end, enc, reloc, base,
-			&range_start, &range_end, &fde);
+		    &range_start, &range_end, &fde);
 
 		/* Return fde if tpc is in this range. */
 
diff --git a/usr/src/lib/libc/amd64/unwind/thrp_unwind.c b/usr/src/lib/libc/amd64/unwind/thrp_unwind.c
index 365cbf77be..648a93894d 100644
--- a/usr/src/lib/libc/amd64/unwind/thrp_unwind.c
+++ b/usr/src/lib/libc/amd64/unwind/thrp_unwind.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 2005 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 "thr_uberdata.h"
 #include "stack_unwind.h"
 #include "reg_num.h"
diff --git a/usr/src/lib/libc/amd64/unwind/unwind.c b/usr/src/lib/libc/amd64/unwind/unwind.c
index 1fb774a28e..788d7b2d68 100644
--- a/usr/src/lib/libc/amd64/unwind/unwind.c
+++ b/usr/src/lib/libc/amd64/unwind/unwind.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,7 +20,7 @@
  */
 
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -131,22 +130,21 @@
 #define	_Unwind_SetGR  _SUNW_Unwind_SetGR
 #define	_Unwind_SetIP  _SUNW_Unwind_SetIP
 #else
-#pragma weak _Unwind_DeleteException = _SUNW_Unwind_DeleteException
-#pragma weak _Unwind_ForcedUnwind = _SUNW_Unwind_ForcedUnwind
-#pragma weak _Unwind_GetCFA = _SUNW_Unwind_GetCFA
-#pragma weak _Unwind_GetGR = _SUNW_Unwind_GetGR
-#pragma weak _Unwind_GetIP = _SUNW_Unwind_GetIP
-#pragma weak _Unwind_GetLanguageSpecificData = \
-			_SUNW_Unwind_GetLanguageSpecificData
-#pragma weak _Unwind_GetRegionStart = _SUNW_Unwind_GetRegionStart
-#pragma weak _Unwind_RaiseException = _SUNW_Unwind_RaiseException
-#pragma weak _Unwind_Resume = _SUNW_Unwind_Resume
-#pragma weak _Unwind_SetGR = _SUNW_Unwind_SetGR
-#pragma weak _Unwind_SetIP = _SUNW_Unwind_SetIP
-
-#include "synonyms.h"
+#pragma weak _SUNW_Unwind_DeleteException = _Unwind_DeleteException
+#pragma weak _SUNW_Unwind_ForcedUnwind = _Unwind_ForcedUnwind
+#pragma weak _SUNW_Unwind_GetCFA = _Unwind_GetCFA
+#pragma weak _SUNW_Unwind_GetGR = _Unwind_GetGR
+#pragma weak _SUNW_Unwind_GetIP = _Unwind_GetIP
+#pragma weak _SUNW_Unwind_GetLanguageSpecificData = \
+		_Unwind_GetLanguageSpecificData
+#pragma weak _SUNW_Unwind_GetRegionStart = _Unwind_GetRegionStart
+#pragma weak _SUNW_Unwind_RaiseException = _Unwind_RaiseException
+#pragma weak _SUNW_Unwind_Resume = _Unwind_Resume
+#pragma weak _SUNW_Unwind_SetGR = _Unwind_SetGR
+#pragma weak _SUNW_Unwind_SetIP = _Unwind_SetIP
 #endif
 
+#include "lint.h"
 #include <string.h>
 #include "stack_unwind.h"
 #include "reg_num.h"
@@ -376,7 +374,7 @@ _Unwind_ForcedUnwind_Body(struct _Unwind_Exception *exception_object,
 
 	finish_capture(ctx, resume);
 	if (resume && down_one(ctx, ctx))
-	    return (_URC_FATAL_PHASE2_ERROR);
+		return (_URC_FATAL_PHASE2_ERROR);
 
 	do {
 		again = 0;
@@ -418,8 +416,8 @@ _Unwind_ForcedUnwind_Body(struct _Unwind_Exception *exception_object,
 		case _URC_END_OF_STACK:
 			ctx->cfa = ctx->ra = ctx->pc = 0;
 			res = (*stop)(1, phase,
-					exception_object->exception_class,
-					exception_object, ctx, stop_parameter);
+			    exception_object->exception_class,
+			    exception_object, ctx, stop_parameter);
 			return (_URC_END_OF_STACK);
 			break;
 		default: