--- old/usr/src/cmd/Adm/sun/Makefile	2014-11-25 12:56:23.957550271 -0500
+++ new/usr/src/cmd/Adm/sun/Makefile	2014-11-25 12:56:23.998884015 -0500
@@ -46,7 +46,7 @@
 .KEEP_STATE:
 
 $(ROOTETCFTPUSERSLINK):	$(ROOTETCFTPDFILES)
-	$(SYMLINK) ftpd/ftpusers $@
+	$(RM) $@; $(SYMLINK) ftpd/ftpusers $@
 
 all: $(ETCFILES) $(KVMFILES) $(SMBFILES) $(FTPDFILES)
 
--- old/usr/src/lib/libm/Makefile.com	2014-11-25 12:56:24.873997306 -0500
+++ new/usr/src/lib/libm/Makefile.com	2014-11-25 12:56:24.885967965 -0500
@@ -511,9 +511,7 @@
 LINTFLAGS64	+= $(LINTERROFF)
 LINTFLAGS64	+= -errchk=longptr64
 
-CPPFLAGS	+= -DLIBM_BUILD
-
-CFLAGS 		+= $(C_BIGPICFLAGS)
+CFLAGS		+= $(C_BIGPICFLAGS)
 CFLAGS64	+= $(C_BIGPICFLAGS)
 
 m9x_IL		= $(LIBMDIR)/common/m9x/__fenv_$(TARGET_ARCH).il
--- old/usr/src/lib/libm/Makefile.libm.com	2014-11-25 12:56:25.337318707 -0500
+++ new/usr/src/lib/libm/Makefile.libm.com	2014-11-25 12:56:25.349290050 -0500
@@ -31,7 +31,7 @@
 # compatibility.
 C99MODE		=
 
-M4FLAGS		= -D__STDC__ -DELFOBJ -DPIC
+M4FLAGS		= -D__STDC__ -DPIC
 
 LDBLDIR_sparc	= Q
 LDBLDIR_i386	= LD
@@ -39,13 +39,11 @@
 
 LM_IL		= $(LIBMDIR)/$(TARGET_ARCH)/src/locallibm.il
 
-CFLAGS		+= $(C_PICFLAGS) -D__INLINE $(XSTRCONST) $(LM_IL)
-CFLAGS64	+= $(C_PICFLAGS) -D__INLINE $(XSTRCONST) $(LM_IL)
+CFLAGS		+= $(C_PICFLAGS) $(XSTRCONST) $(LM_IL)
+CFLAGS64	+= $(C_PICFLAGS) $(XSTRCONST) $(LM_IL)
 sparc_CFLAGS	+= -Wa,-xarch=v8plus
 
-CPPFLAGS	+= -DELFOBJ \
-		-DLIBM_MT_FEX_SYNC \
-		-I$(LIBMSRC)/C \
+CPPFLAGS	+= -I$(LIBMSRC)/C \
 		-I$(LIBMSRC)/$(LDBLDIR) -I$(LIBMDIR)/$(TARGET_ARCH)/src
 
 # GCC needs __C99FEATURES__ such that the implementations of isunordered,
--- old/usr/src/lib/libm/amd64/src/__swapFLAGS.s	2014-11-25 12:56:25.742671994 -0500
+++ new/usr/src/lib/libm/amd64/src/__swapFLAGS.s	2014-11-25 12:56:25.754254792 -0500
@@ -29,7 +29,6 @@
 	.file	"__swapFLAGS.s"
 
 #include "libm.h"
-#include "libm_synonyms.h"
 
 /*
  * swap exception masks
--- old/usr/src/lib/libm/amd64/src/acosl.s	2014-11-25 12:56:26.159177731 -0500
+++ new/usr/src/lib/libm/amd64/src/acosl.s	2014-11-25 12:56:26.171594753 -0500
@@ -30,9 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(acosl,function)
-#include "libm_synonyms.h"
-
-#undef fabs
 
 	ENTRY(acosl)
 	fldt	8(%rsp)			/ push x
--- old/usr/src/lib/libm/amd64/src/asinl.s	2014-11-25 12:56:26.570146045 -0500
+++ new/usr/src/lib/libm/amd64/src/asinl.s	2014-11-25 12:56:26.582126405 -0500
@@ -30,9 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(asinl,function)
-#include "libm_synonyms.h"
-
-#undef fabs
 
 	ENTRY(asinl)
 	fldt	8(%rsp)			/ push x
--- old/usr/src/lib/libm/amd64/src/atan2l.s	2014-11-25 12:56:26.993407254 -0500
+++ new/usr/src/lib/libm/amd64/src/atan2l.s	2014-11-25 12:56:27.025616258 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(atan2l,function)
-#include "libm_synonyms.h"
 
 	ENTRY(atan2l)
 	fldt	8(%rsp)			/ push y
--- old/usr/src/lib/libm/amd64/src/atanl.s	2014-11-25 12:56:27.871873534 -0500
+++ new/usr/src/lib/libm/amd64/src/atanl.s	2014-11-25 12:56:27.925367211 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(atanl,function)
-#include "libm_synonyms.h"
 
 	ENTRY(atanl)
 	fldt	8(%rsp)			/ push arg
--- old/usr/src/lib/libm/amd64/src/copysignl.s	2014-11-25 12:56:28.341690855 -0500
+++ new/usr/src/lib/libm/amd64/src/copysignl.s	2014-11-25 12:56:28.353196808 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(copysignl,function)
-#include "libm_synonyms.h"
 
 	ENTRY(copysignl)
 	movl	16(%rsp),%eax
--- old/usr/src/lib/libm/amd64/src/exp10l.s	2014-11-25 12:56:28.825898008 -0500
+++ new/usr/src/lib/libm/amd64/src/exp10l.s	2014-11-25 12:56:28.838007681 -0500
@@ -29,8 +29,6 @@
         .file "exp10l.s"
 
 #include "libm.h"
-LIBM_ANSI_PRAGMA_WEAK(exp10l,function)
-#include "libm_synonyms.h"
 
 	.data
 	.align	16
--- old/usr/src/lib/libm/amd64/src/exp2l.s	2014-11-25 12:56:29.249321085 -0500
+++ new/usr/src/lib/libm/amd64/src/exp2l.s	2014-11-25 12:56:29.261479791 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(exp2l,function)
-#include "libm_synonyms.h"
 
 	ENTRY(exp2l)
 	movl	16(%rsp),%ecx		/ cx <--sign&bexp(x)
--- old/usr/src/lib/libm/amd64/src/expl.s	2014-11-25 12:56:29.674101471 -0500
+++ new/usr/src/lib/libm/amd64/src/expl.s	2014-11-25 12:56:29.686521448 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(expl,function)
-#include "libm_synonyms.h"
 
 	.data
 	.align	16
--- old/usr/src/lib/libm/amd64/src/expm1l.s	2014-11-25 12:56:30.120550366 -0500
+++ new/usr/src/lib/libm/amd64/src/expm1l.s	2014-11-25 12:56:30.132033545 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(expm1l,function)
-#include "libm_synonyms.h"
 
 	.data
 	.align	16
--- old/usr/src/lib/libm/amd64/src/fabsl.s	2014-11-25 12:56:30.552289801 -0500
+++ new/usr/src/lib/libm/amd64/src/fabsl.s	2014-11-25 12:56:30.564872354 -0500
@@ -30,11 +30,9 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(fabsl,function)
-#include "libm_synonyms.h"
 
 	ENTRY(fabsl)
 	fldt    8(%rsp)
-#undef	fabs
 	fabs
 	ret
 	.align	16
--- old/usr/src/lib/libm/amd64/src/floorl.s	2014-11-25 12:56:30.969550219 -0500
+++ new/usr/src/lib/libm/amd64/src/floorl.s	2014-11-25 12:56:30.982386864 -0500
@@ -31,7 +31,6 @@
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(ceill,function)
 LIBM_ANSI_PRAGMA_WEAK(floorl,function)
-#include "libm_synonyms.h"
 
 	ENTRY(ceill)
 	subq	$16,%rsp
--- old/usr/src/lib/libm/amd64/src/fmod.s	2014-11-25 12:56:31.392345720 -0500
+++ new/usr/src/lib/libm/amd64/src/fmod.s	2014-11-25 12:56:31.405382478 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(fmod,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
 	ENTRY(fmod)
--- old/usr/src/lib/libm/amd64/src/fmodf.s	2014-11-25 12:56:31.813605420 -0500
+++ new/usr/src/lib/libm/amd64/src/fmodf.s	2014-11-25 12:56:31.825189210 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(fmodf,function)
-#include "libm_synonyms.h"
 
 	ENTRY(fmodf)
 	push	%rbp
--- old/usr/src/lib/libm/amd64/src/fmodl.s	2014-11-25 12:56:32.254638007 -0500
+++ new/usr/src/lib/libm/amd64/src/fmodl.s	2014-11-25 12:56:32.267565788 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(fmodl,function)
-#include "libm_synonyms.h"
 
 	ENTRY(fmodl)
 	fldt	24(%rsp)		/ load arg y
--- old/usr/src/lib/libm/amd64/src/ieee_funcl.s	2014-11-25 12:56:32.683610359 -0500
+++ new/usr/src/lib/libm/amd64/src/ieee_funcl.s	2014-11-25 12:56:32.695599913 -0500
@@ -29,12 +29,6 @@
         .file "ieee_funcl.s"
 
 #include "libm.h"
-LIBM_ANSI_PRAGMA_WEAK(isinfl,function)
-LIBM_ANSI_PRAGMA_WEAK(isnormall,function)
-LIBM_ANSI_PRAGMA_WEAK(issubnormall,function)
-LIBM_ANSI_PRAGMA_WEAK(iszerol,function)
-LIBM_ANSI_PRAGMA_WEAK(signbitl,function)
-#include "libm_synonyms.h"
 
 	ENTRY(isinfl)
 	movl	16(%rsp),%eax		/ ax <-- sign and bexp of x 
--- old/usr/src/lib/libm/amd64/src/ilogbl.s	2014-11-25 12:56:33.100906127 -0500
+++ new/usr/src/lib/libm/amd64/src/ilogbl.s	2014-11-25 12:56:33.112301013 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(ilogbl,function)
-#include "libm_synonyms.h"
 #include "xpg6.h"
 
 	.data
--- old/usr/src/lib/libm/amd64/src/log10l.s	2014-11-25 12:56:33.528455087 -0500
+++ new/usr/src/lib/libm/amd64/src/log10l.s	2014-11-25 12:56:33.550620690 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(log10l,function)
-#include "libm_synonyms.h"
 
 	ENTRY(log10l)
 	fldlg2	
--- old/usr/src/lib/libm/amd64/src/log2l.s	2014-11-25 12:56:34.095939363 -0500
+++ new/usr/src/lib/libm/amd64/src/log2l.s	2014-11-25 12:56:34.108272531 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(log2l,function)
-#include "libm_synonyms.h"
 
 	ENTRY(log2l)
 	fld1			/ push 1.0
--- old/usr/src/lib/libm/amd64/src/logl.s	2014-11-25 12:56:34.513063951 -0500
+++ new/usr/src/lib/libm/amd64/src/logl.s	2014-11-25 12:56:34.525837957 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(logl,function)
-#include "libm_synonyms.h"
 
 	ENTRY(logl)
 	fldln2	
--- old/usr/src/lib/libm/amd64/src/powl.s	2014-11-25 12:56:34.922617690 -0500
+++ new/usr/src/lib/libm/amd64/src/powl.s	2014-11-25 12:56:34.935145971 -0500
@@ -55,11 +55,8 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(powl,function)
-#include "libm_synonyms.h"
 #include "xpg6.h"
 
-#undef fabs
-
 	.data
 	.align	16
 negzero:
--- old/usr/src/lib/libm/amd64/src/remainder.s	2014-11-25 12:56:35.359528673 -0500
+++ new/usr/src/lib/libm/amd64/src/remainder.s	2014-11-25 12:56:35.370842596 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(remainder,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
 	ENTRY(remainder)
--- old/usr/src/lib/libm/amd64/src/remainderf.s	2014-11-25 12:56:35.789910969 -0500
+++ new/usr/src/lib/libm/amd64/src/remainderf.s	2014-11-25 12:56:35.801429552 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(remainderf,function)
-#include "libm_synonyms.h"
 
 	ENTRY(remainderf)
 	push	%rbp
--- old/usr/src/lib/libm/amd64/src/remainderl.s	2014-11-25 12:56:36.197632329 -0500
+++ new/usr/src/lib/libm/amd64/src/remainderl.s	2014-11-25 12:56:36.220507806 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(remainderl,function)
-#include "libm_synonyms.h"
 
 	ENTRY(remainderl)
 	fldt	24(%rsp)		/ load arg y
--- old/usr/src/lib/libm/amd64/src/remquol.s	2014-11-25 12:56:37.104912574 -0500
+++ new/usr/src/lib/libm/amd64/src/remquol.s	2014-11-25 12:56:37.118265551 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(remquol,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 	ENTRY(remquol)
 	fldt	24(%rsp)		/ load arg y
--- old/usr/src/lib/libm/amd64/src/rintl.s	2014-11-25 12:56:37.532287107 -0500
+++ new/usr/src/lib/libm/amd64/src/rintl.s	2014-11-25 12:56:37.549957221 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(rintl,function)
-#include "libm_synonyms.h"
 
 	ENTRY(rintl)
 	fldt	8(%rsp)			/ load x
--- old/usr/src/lib/libm/amd64/src/rndintl.s	2014-11-25 12:56:38.123294276 -0500
+++ new/usr/src/lib/libm/amd64/src/rndintl.s	2014-11-25 12:56:38.135409793 -0500
@@ -29,13 +29,6 @@
         .file "rndintl.s"
 
 #include "libm.h"
-LIBM_ANSI_PRAGMA_WEAK(aintl,function)
-LIBM_ANSI_PRAGMA_WEAK(irintl,function)
-LIBM_ANSI_PRAGMA_WEAK(anintl,function)
-LIBM_ANSI_PRAGMA_WEAK(nintl,function)
-#include "libm_synonyms.h"
-
-#undef fabs
 
 	ENTRY(aintl)
 	movq	%rsp,%rax
--- old/usr/src/lib/libm/amd64/src/scalbnl.s	2014-11-25 12:56:38.554478475 -0500
+++ new/usr/src/lib/libm/amd64/src/scalbnl.s	2014-11-25 12:56:38.566646058 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(scalbnl,function)
-#include "libm_synonyms.h"
 
 	ENTRY(scalbnl)
 	subq	$16,%rsp
--- old/usr/src/lib/libm/amd64/src/sqrtl.s	2014-11-25 12:56:39.504941172 -0500
+++ new/usr/src/lib/libm/amd64/src/sqrtl.s	2014-11-25 12:56:39.532819012 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(sqrtl,function)
-#include "libm_synonyms.h"
 
 	ENTRY(sqrtl)
 	fldt	8(%rsp)
--- old/usr/src/lib/libm/common/C/acos.c	2014-11-25 12:56:39.986125540 -0500
+++ new/usr/src/lib/libm/common/C/acos.c	2014-11-25 12:56:39.997773506 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak acos = __acos
+#pragma weak __acos = acos
 
 /* INDENT OFF */
 /*
@@ -56,7 +56,6 @@
  */
 /* INDENT ON */
 
-#include "libm_synonyms.h"	/* __acos, __sqrt, __isnan */
 #include "libm_protos.h"	/* _SVID_libm_error */
 #include "libm_macros.h"
 #include <math.h>
--- old/usr/src/lib/libm/common/C/acosh.c	2014-11-25 12:56:40.391195098 -0500
+++ new/usr/src/lib/libm/common/C/acosh.c	2014-11-25 12:56:40.402674028 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak acosh = __acosh
+#pragma weak __acosh = acosh
 
 /* INDENT OFF */
 /*
@@ -46,7 +46,6 @@
  */
 /* INDENT ON */
 
-#include "libm_synonyms.h"	/* __acosh, __log, __log1p */
 #include "libm_protos.h"	/* _SVID_libm_error */
 #include "libm_macros.h"
 #include <math.h>
--- old/usr/src/lib/libm/common/C/asin.c	2014-11-25 12:56:40.785701741 -0500
+++ new/usr/src/lib/libm/common/C/asin.c	2014-11-25 12:56:40.797086035 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak asin = __asin
+#pragma weak __asin = asin
 
 /* INDENT OFF */
 /*
@@ -62,7 +62,6 @@
  */
 /* INDENT ON */
 
-#include "libm_synonyms.h"	/* __asin, __sqrt, __isnan */
 #include "libm_protos.h"	/* _SVID_libm_error */
 #include "libm_macros.h"
 #include <math.h>
--- old/usr/src/lib/libm/common/C/asinh.c	2014-11-25 12:56:41.185314461 -0500
+++ new/usr/src/lib/libm/common/C/asinh.c	2014-11-25 12:56:41.196815643 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak asinh = __asinh
+#pragma weak __asinh = asinh
 
 /* INDENT OFF */
 /*
@@ -43,7 +43,6 @@
  */
 /* INDENT ON */
 
-#include "libm_synonyms.h"	/* __asinh */
 #include "libm_macros.h"
 #include <math.h>
 
--- old/usr/src/lib/libm/common/C/atan.c	2014-11-25 12:56:41.578549828 -0500
+++ new/usr/src/lib/libm/common/C/atan.c	2014-11-25 12:56:41.590043591 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak atan = __atan
+#pragma weak __atan = atan
 
 /* INDENT OFF */
 /*
@@ -82,7 +82,6 @@
 /* INDENT ON */
 
 #include "libm.h"
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
 extern const double _TBL_atan[];
--- old/usr/src/lib/libm/common/C/atan2.c	2014-11-25 12:56:41.980359458 -0500
+++ new/usr/src/lib/libm/common/C/atan2.c	2014-11-25 12:56:41.992068669 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak atan2 = __atan2
+#pragma weak __atan2 = atan2
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/C/atan2pi.c	2014-11-25 12:56:42.425413557 -0500
+++ new/usr/src/lib/libm/common/C/atan2pi.c	2014-11-25 12:56:42.436892147 -0500
@@ -26,8 +26,6 @@
  * Use is subject to license terms.
  */
 
-#pragma weak atan2pi = __atan2pi
-
 /*
  * atan2pi(x) = atan2(x)/pi
  */
--- old/usr/src/lib/libm/common/C/atanh.c	2014-11-25 12:56:42.828702924 -0500
+++ new/usr/src/lib/libm/common/C/atanh.c	2014-11-25 12:56:42.840377656 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak atanh = __atanh
+#pragma weak __atanh = atanh
 
 /* INDENT OFF */
 /*
@@ -51,7 +51,6 @@
 /* INDENT ON */
 
 #include "libm.h"
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 #include <math.h>
 
--- old/usr/src/lib/libm/common/C/ceil.c	2014-11-25 12:56:43.221884985 -0500
+++ new/usr/src/lib/libm/common/C/ceil.c	2014-11-25 12:56:43.233735127 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak ceil = __ceil
+#pragma weak __ceil = ceil
 
 /*
  * ceil(x) returns the least integral value bigger than or equal to x.
--- old/usr/src/lib/libm/common/C/copysign.c	2014-11-25 12:56:43.614080762 -0500
+++ new/usr/src/lib/libm/common/C/copysign.c	2014-11-25 12:56:43.625607433 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak copysign = __copysign
-#endif
+#pragma weak __copysign = copysign
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/C/cos.c	2014-11-25 12:56:44.005766026 -0500
+++ new/usr/src/lib/libm/common/C/cos.c	2014-11-25 12:56:44.018626443 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak cos = __cos
+#pragma weak __cos = cos
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/C/cosh.c	2014-11-25 12:56:44.455988726 -0500
+++ new/usr/src/lib/libm/common/C/cosh.c	2014-11-25 12:56:44.467500564 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak cosh = __cosh
+#pragma weak __cosh = cosh
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/C/erf.c	2014-11-25 12:56:44.875726296 -0500
+++ new/usr/src/lib/libm/common/C/erf.c	2014-11-25 12:56:44.887248699 -0500
@@ -27,8 +27,8 @@
  * Use is subject to license terms.
  */
 
-#pragma weak erf = __erf
-#pragma weak erfc = __erfc
+#pragma weak __erf = erf
+#pragma weak __erfc = erfc
 
 /* INDENT OFF */
 /*
@@ -127,7 +127,6 @@
  */
 /* INDENT ON */
 
-#include "libm_synonyms.h"	/* __erf, __erfc, __exp */
 #include "libm_macros.h"
 #include <math.h>
 
--- old/usr/src/lib/libm/common/C/exp.c	2014-11-25 12:56:45.318914173 -0500
+++ new/usr/src/lib/libm/common/C/exp.c	2014-11-25 12:56:45.330651625 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak exp = __exp
+#pragma weak __exp = exp
 
 /*
  * exp(x)
--- old/usr/src/lib/libm/common/C/exp10.c	2014-11-25 12:56:45.756844575 -0500
+++ new/usr/src/lib/libm/common/C/exp10.c	2014-11-25 12:56:45.769492888 -0500
@@ -26,8 +26,6 @@
  * Use is subject to license terms.
  */
 
-#pragma weak exp10 = __exp10
-
 /* INDENT OFF */
 /*
  * exp10(x)
--- old/usr/src/lib/libm/common/C/exp2.c	2014-11-25 12:56:46.164452980 -0500
+++ new/usr/src/lib/libm/common/C/exp2.c	2014-11-25 12:56:46.176776640 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak exp2 = __exp2
+#pragma weak __exp2 = exp2
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/C/expm1.c	2014-11-25 12:56:46.563785969 -0500
+++ new/usr/src/lib/libm/common/C/expm1.c	2014-11-25 12:56:46.575355697 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak expm1 = __expm1
+#pragma weak __expm1 = expm1
 
 /* INDENT OFF */
 /*
@@ -127,7 +127,6 @@
  */
 /* INDENT ON */
 
-#include "libm_synonyms.h"	/* __expm1 */
 #include "libm_macros.h"
 #include <math.h>
 
--- old/usr/src/lib/libm/common/C/fabs.c	2014-11-25 12:56:46.971358105 -0500
+++ new/usr/src/lib/libm/common/C/fabs.c	2014-11-25 12:56:46.982971509 -0500
@@ -27,10 +27,9 @@
  * Use is subject to license terms.
  */
 
-#pragma weak fabs = __fabs
+#pragma weak __fabs = fabs
 
 #include "libm.h"
-#include "libm_synonyms.h"
 #include "libm_macros.h"
 #include <math.h>
 
--- old/usr/src/lib/libm/common/C/floor.c	2014-11-25 12:56:47.364473310 -0500
+++ new/usr/src/lib/libm/common/C/floor.c	2014-11-25 12:56:47.376003915 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak floor = __floor
+#pragma weak __floor = floor
 
 /*
  * floor(x) returns the biggest integral value less than or equal to x.
--- old/usr/src/lib/libm/common/C/fmod.c	2014-11-25 12:56:47.755244784 -0500
+++ new/usr/src/lib/libm/common/C/fmod.c	2014-11-25 12:56:47.768166720 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak fmod = __fmod
+#pragma weak __fmod = fmod
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/C/gamma.c	2014-11-25 12:56:48.153479507 -0500
+++ new/usr/src/lib/libm/common/C/gamma.c	2014-11-25 12:56:48.164889812 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak gamma = __gamma
+#pragma weak __gamma = gamma
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/C/gamma_r.c	2014-11-25 12:56:48.565107321 -0500
+++ new/usr/src/lib/libm/common/C/gamma_r.c	2014-11-25 12:56:48.576668943 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak gamma_r = __gamma_r
+#pragma weak __gamma_r = gamma_r
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/C/hypot.c	2014-11-25 12:56:48.967323203 -0500
+++ new/usr/src/lib/libm/common/C/hypot.c	2014-11-25 12:56:48.978851041 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak hypot = __hypot
-#endif
+#pragma weak __hypot = hypot
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/C/ilogb.c	2014-11-25 12:56:49.425630532 -0500
+++ new/usr/src/lib/libm/common/C/ilogb.c	2014-11-25 12:56:49.437395488 -0500
@@ -27,14 +27,12 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak ilogb = __ilogb
-#endif
+#pragma weak __ilogb = ilogb
 
 #include "libm.h"
 #include "xpg6.h"	/* __xpg6 */
 
-#if defined(USE_FPSCALE) || defined(__x86)
+#if defined(__x86)
 static const double two52 = 4503599627370496.0;
 #else
 /*
@@ -57,7 +55,7 @@
 	v <<= 1;
 	return (r + ((0xffffaa50 >> v) & 0x3));
 }
-#endif	/* defined(USE_FPSCALE) */
+#endif	/* defined(__x86) */
 
 static int
 raise_invalid(int v) {	/* SUSv3 requires ilogb(0,+/-Inf,NaN) raise invalid */
@@ -80,7 +78,7 @@
 		if ((px[LOWORD] | k) == 0)
 			return (raise_invalid(0x80000001));
 		else {
-#if defined(USE_FPSCALE) || defined(__x86)
+#if defined(__x86)
 			x *= two52;
 			return (((px[HIWORD] & 0x7ff00000) >> 20) - 1075);
 #else
--- old/usr/src/lib/libm/common/C/j0.c	2014-11-25 12:56:49.824399997 -0500
+++ new/usr/src/lib/libm/common/C/j0.c	2014-11-25 12:56:49.836158961 -0500
@@ -36,11 +36,10 @@
  *	y0(-ve)=y1(-ve)=yn(n,-ve) are NaN with invalid signal.
  */
 
-#pragma weak j0 = __j0
-#pragma weak y0 = __y0
+#pragma weak __j0 = j0
+#pragma weak __y0 = y0
 
 #include "libm.h"
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 #include <math.h>
 #include <values.h>
--- old/usr/src/lib/libm/common/C/j1.c	2014-11-25 12:56:50.236590866 -0500
+++ new/usr/src/lib/libm/common/C/j1.c	2014-11-25 12:56:50.248076097 -0500
@@ -36,11 +36,10 @@
  *	y0(-ve)=y1(-ve)=yn(n,-ve) are NaN with invalid signal.
  */
 
-#pragma weak j1 = __j1
-#pragma weak y1 = __y1
+#pragma weak __j1 = j1
+#pragma weak __y1 = y1
 
 #include "libm.h"
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 #include <math.h>
 #include <values.h>
--- old/usr/src/lib/libm/common/C/jn.c	2014-11-25 12:56:50.654159138 -0500
+++ new/usr/src/lib/libm/common/C/jn.c	2014-11-25 12:56:50.665625486 -0500
@@ -27,8 +27,8 @@
  * Use is subject to license terms.
  */
 
-#pragma weak jn = __jn
-#pragma weak yn = __yn
+#pragma weak __jn = jn
+#pragma weak __yn = yn
 
 /*
  * floating point Bessel's function of the 1st and 2nd kind
--- old/usr/src/lib/libm/common/C/lgamma.c	2014-11-25 12:56:51.067123014 -0500
+++ new/usr/src/lib/libm/common/C/lgamma.c	2014-11-25 12:56:51.078811247 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak lgamma = __lgamma
+#pragma weak __lgamma = lgamma
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/C/lgamma_r.c	2014-11-25 12:56:51.477522826 -0500
+++ new/usr/src/lib/libm/common/C/lgamma_r.c	2014-11-25 12:56:51.488963042 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak lgamma_r = __lgamma_r
+#pragma weak __lgamma_r = lgamma_r
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/C/libm.h	2014-11-25 12:56:51.877517603 -0500
+++ new/usr/src/lib/libm/common/C/libm.h	2014-11-25 12:56:51.888917194 -0500
@@ -52,9 +52,9 @@
 #if defined(__sparc)
 
 #define	LIBM_ANSI_PRAGMA_WEAK(sym,stype) \
-	.weak sym; \
-	.type sym,#stype; \
-sym	= __/**/sym
+	.weak __/**/sym;		 \
+	.type __/**/sym,#stype;		 \
+__/**/sym	= sym
 
 #ifndef SET_FILE
 #define	SET_FILE(x) \
@@ -151,9 +151,9 @@
 #elif defined(__x86)
 
 #define	LIBM_ANSI_PRAGMA_WEAK(sym,stype) \
-	.weak sym; \
-	.type sym,@stype; \
-sym	= __/**/sym
+	.weak __/**/sym;		 \
+	.type __/**/sym,@stype;		 \
+__/**/sym	= sym
 
 #ifdef PIC
 #if defined(__amd64)
@@ -196,7 +196,6 @@
 #else	/* defined(_ASM) */
 
 #include "libm_macros.h"
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 #include "libm_inlines.h"
 #include <math.h>
--- old/usr/src/lib/libm/common/C/libm_protos.h	2014-11-25 12:56:52.283165271 -0500
+++ new/usr/src/lib/libm/common/C/libm_protos.h	2014-11-25 12:56:52.294645178 -0500
@@ -29,90 +29,15 @@
 #ifndef _C_LIBM_PROTOS_H
 #define	_C_LIBM_PROTOS_H
 
-#ifdef LIBMOPT_BUILD
-#define	_TBL_cos	__libmopt_TBL_cos
-#define	_TBL_exp2_512	__libmopt_TBL_exp2_512
-#define	_TBL_ipio2_inf	__libmopt_TBL_ipio2_inf
-#define	_TBL_jlog_n1	__libmopt_TBL_jlog_n1
-#define	_TBL_jlog_n2	__libmopt_TBL_jlog_n2
-#define	_TBL_jlog_p1	__libmopt_TBL_jlog_p1
-#define	_TBL_jlog_p2	__libmopt_TBL_jlog_p2
-#define	_TBL_log10	__libmopt_TBL_log10
-#define	_TBL_log2_14	__libmopt_TBL_log2_14
-#define	_TBL_log2_9	__libmopt_TBL_log2_9
-#define	_TBL_sin	__libmopt_TBL_sin
-#define	_TBL_sincosx	__libmopt_TBL_sincosx
-#define	_TBL_xexp	__libmopt_TBL_xexp
-#define	_TBL_xlog	__libmopt_TBL_xlog
-#define	__k_cos_	__libmopt__k_cos_
-#define	__k_sin_	__libmopt__k_sin_
-#define	__k_sincos_	__libmopt__k_sincos_
-#define	__reduction	__libmopt__reduction
-#define	__rem_pio2	__libmopt__rem_pio2
-#define	__rem_pio2m	__libmopt__rem_pio2m
-#else	/* defined(LIBMOPT_BUILD) */
-#ifdef LIBM_BUILD
-#define	_SVID_libm_err	__libm_SVID_libm_err	/* not used by -lsunmath */
-#define	_TBL_atan	__libm_TBL_atan
-#define	_TBL_atan1	__libm_TBL_atan1
-#define	_TBL_atan_hi	__libm_TBL_atan_hi	/* not used by -lsunmath */
-#define	_TBL_atan_lo	__libm_TBL_atan_lo	/* not used by -lsunmath */
-#define	_TBL_exp2_hi	__libm_TBL_exp2_hi	/* not used by -lsunmath */
-#define	_TBL_exp2_lo	__libm_TBL_exp2_lo	/* not used by -lsunmath */
-#define	_TBL_ipio2_inf	__libm_TBL_ipio2_inf
-#define	_TBL_log	__libm_TBL_log
-#define	_TBL_log2_hi	__libm_TBL_log2_hi	/* not used by -lsunmath */
-#define	_TBL_log2_lo	__libm_TBL_log2_lo	/* not used by -lsunmath */
-#define	_TBL_log_hi	__libm_TBL_log_hi	/* not used by -lsunmath */
-#define	_TBL_log_lo	__libm_TBL_log_lo	/* not used by -lsunmath */
-#define	_TBL_sincos	__libm_TBL_sincos
-#define	_TBL_sincosx	__libm_TBL_sincosx
-#define	_TBL_tan_hi	__libm_TBL_tan_hi	/* not used by -lsunmath */
-#define	_TBL_tan_lo	__libm_TBL_tan_lo	/* not used by -lsunmath */
-#define	__k_cexp	__libm__k_cexp		/* C99 libm */
-#define	__k_cexpl	__libm__k_cexpl		/* C99 libm */
-#define	__k_clog_r	__libm__k_clog_r	/* C99 libm */
-#define	__k_clog_rl	__libm__k_clog_rl	/* C99 libm */
-#define	__k_atan2	__libm__k_atan2		/* C99 libm */
-#define	__k_atan2l	__libm__k_atan2l	/* C99 libm */
-#define	__k_cos		__libm__k_cos
-#define	__k_lgamma	__libm__k_lgamma
-#define	__k_sin		__libm__k_sin
-#define	__k_sincos	__libm__k_sincos
-#define	__k_tan		__libm__k_tan
-#define	__reduction	__libm__reduction	/* i386 only */
+/*
+ * Many symbols used to be namespaced with __libm to prevent collisions.  All
+ * but these two were otherwise scoped local and directly bound, so that
+ * collision could not occur.
+ *
+ * For reasons unknown, these two are global (but private).
+ */
 #define	__rem_pio2	__libm__rem_pio2
 #define	__rem_pio2m	__libm__rem_pio2m
-#define	__k_cosf	__libm__k_cosf		/* C99 libm */
-#define	__k_cosl	__libm__k_cosl		/* C99 libm */
-#define	__k_lgammal	__libm__k_lgammal	/* C99 libm */
-#define	__k_sincosf	__libm__k_sincosf	/* C99 libm */
-#define	__k_sincosl	__libm__k_sincosl	/* C99 libm */
-#define	__k_sinf	__libm__k_sinf		/* C99 libm */
-#define	__k_sinl	__libm__k_sinl		/* C99 libm */
-#define	__k_tanf	__libm__k_tanf		/* C99 libm */
-#define	__k_tanl	__libm__k_tanl		/* C99 libm */
-#define	__poly_libmq	__libm__poly_libmq	/* C99 libm */
-#define	__rem_pio2l	__libm__rem_pio2l	/* C99 libm */
-#define	_TBL_atanl_hi	__libm_TBL_atanl_hi	/* C99 libm */
-#define	_TBL_atanl_lo	__libm_TBL_atanl_lo	/* C99 libm */
-#define	_TBL_cosl_hi	__libm_TBL_cosl_hi	/* C99 libm */
-#define	_TBL_cosl_lo	__libm_TBL_cosl_lo	/* C99 libm */
-#define	_TBL_expl_hi	__libm_TBL_expl_hi	/* C99 libm */
-#define	_TBL_expl_lo	__libm_TBL_expl_lo	/* C99 libm */
-#define	_TBL_expm1l	__libm_TBL_expm1l	/* C99 libm */
-#define	_TBL_expm1lx	__libm_TBL_expm1lx	/* C99 libm */
-#define	_TBL_ipio2l_inf	__libm_TBL_ipio2l_inf	/* C99 libm */
-#define	_TBL_logl_hi	__libm_TBL_logl_hi	/* C99 libm */
-#define	_TBL_logl_lo	__libm_TBL_logl_lo	/* C99 libm */
-#define	_TBL_r_atan_hi	__libm_TBL_r_atan_hi	/* C99 libm */
-#define	_TBL_r_atan_lo	__libm_TBL_r_atan_lo	/* C99 libm */
-#define	_TBL_sinl_hi	__libm_TBL_sinl_hi	/* C99 libm */
-#define	_TBL_sinl_lo	__libm_TBL_sinl_lo	/* C99 libm */
-#define	_TBL_tanl_hi	__libm_TBL_tanl_hi	/* C99 libm */
-#define	_TBL_tanl_lo	__libm_TBL_tanl_lo	/* C99 libm */
-#endif	/* defined(LIBM_BUILD) */
-#endif	/* defined(LIBMOPT_BUILD) */
 
 #ifndef _ASM
 #ifdef __STDC__
--- old/usr/src/lib/libm/common/C/libm_synonyms.h	2014-11-25 12:56:52.686790432 -0500
+++ /dev/null	2014-11-25 12:56:52.000000000 -0500
@@ -1,749 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * 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.
- * 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 2011 Nexenta Systems, Inc.  All rights reserved.
- */
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#ifndef _LIBM_SYNONYMS_H
-#define	_LIBM_SYNONYMS_H
-
-#if defined(ELFOBJ) && !defined(lint)
-
-#define	cabs			__cabs			/* C99 <complex.h> */
-#define	cabsf			__cabsf			/* C99 <complex.h> */
-#define	cabsl			__cabsl			/* C99 <complex.h> */
-#define	cacos			__cacos			/* C99 <complex.h> */
-#define	cacosf			__cacosf		/* C99 <complex.h> */
-#define	cacosl			__cacosl		/* C99 <complex.h> */
-#define	cacosh			__cacosh		/* C99 <complex.h> */
-#define	cacoshf			__cacoshf		/* C99 <complex.h> */
-#define	cacoshl			__cacoshl		/* C99 <complex.h> */
-#define	carg			__carg			/* C99 <complex.h> */
-#define	cargf			__cargf			/* C99 <complex.h> */
-#define	cargl			__cargl			/* C99 <complex.h> */
-#define	casin			__casin			/* C99 <complex.h> */
-#define	casinf			__casinf		/* C99 <complex.h> */
-#define	casinl			__casinl		/* C99 <complex.h> */
-#define	casinh			__casinh		/* C99 <complex.h> */
-#define	casinhf			__casinhf		/* C99 <complex.h> */
-#define	casinhl			__casinhl		/* C99 <complex.h> */
-#define	catan			__catan			/* C99 <complex.h> */
-#define	catanf			__catanf		/* C99 <complex.h> */
-#define	catanl			__catanl		/* C99 <complex.h> */
-#define	catanh			__catanh		/* C99 <complex.h> */
-#define	catanhf			__catanhf		/* C99 <complex.h> */
-#define	catanhl			__catanhl		/* C99 <complex.h> */
-#define	ccos			__ccos			/* C99 <complex.h> */
-#define	ccosf			__ccosf			/* C99 <complex.h> */
-#define	ccosl			__ccosl			/* C99 <complex.h> */
-#define	ccosh			__ccosh			/* C99 <complex.h> */
-#define	ccoshf			__ccoshf		/* C99 <complex.h> */
-#define	ccoshl			__ccoshl		/* C99 <complex.h> */
-#define	cexp			__cexp			/* C99 <complex.h> */
-#define	cexpf			__cexpf			/* C99 <complex.h> */
-#define	cexpl			__cexpl			/* C99 <complex.h> */
-#define	cimag			__cimag			/* C99 <complex.h> */
-#define	cimagf			__cimagf		/* C99 <complex.h> */
-#define	cimagl			__cimagl		/* C99 <complex.h> */
-#define	clog			__clog			/* C99 <complex.h> */
-#define	clogf			__clogf			/* C99 <complex.h> */
-#define	clogl			__clogl			/* C99 <complex.h> */
-#define	conj			__conj			/* C99 <complex.h> */
-#define	conjf			__conjf			/* C99 <complex.h> */
-#define	conjl			__conjl			/* C99 <complex.h> */
-#define	cpow			__cpow			/* C99 <complex.h> */
-#define	cpowf			__cpowf			/* C99 <complex.h> */
-#define	cpowl			__cpowl			/* C99 <complex.h> */
-#define	cproj			__cproj			/* C99 <complex.h> */
-#define	cprojf			__cprojf		/* C99 <complex.h> */
-#define	cprojl			__cprojl		/* C99 <complex.h> */
-#define	creal			__creal			/* C99 <complex.h> */
-#define	crealf			__crealf		/* C99 <complex.h> */
-#define	creall			__creall		/* C99 <complex.h> */
-#define	csin			__csin			/* C99 <complex.h> */
-#define	csinf			__csinf			/* C99 <complex.h> */
-#define	csinl			__csinl			/* C99 <complex.h> */
-#define	csinh			__csinh			/* C99 <complex.h> */
-#define	csinhf			__csinhf		/* C99 <complex.h> */
-#define	csinhl			__csinhl		/* C99 <complex.h> */
-#define	csqrt			__csqrt			/* C99 <complex.h> */
-#define	csqrtf			__csqrtf		/* C99 <complex.h> */
-#define	csqrtl			__csqrtl		/* C99 <complex.h> */
-#define	ctan			__ctan			/* C99 <complex.h> */
-#define	ctanf			__ctanf			/* C99 <complex.h> */
-#define	ctanl			__ctanl			/* C99 <complex.h> */
-#define	ctanh			__ctanh			/* C99 <complex.h> */
-#define	ctanhf			__ctanhf		/* C99 <complex.h> */
-#define	ctanhl			__ctanhl		/* C99 <complex.h> */
-#define	abrupt_underflow_	__abrupt_underflow_
-#define	acos			__acos
-#define	acosd			__acosd
-#define	acosdf			__acosdf
-#define	acosdl			__acosdl
-#define	acosf			__acosf
-#define	acosh			__acosh
-#define	acoshf			__acoshf
-#define	acoshl			__acoshl
-#define	acosl			__acosl
-#define	acosp			__acosp
-#define	acospf			__acospf
-#define	acospi			__acospi
-#define	acospif			__acospif
-#define	acospil			__acospil
-#define	acospl			__acospl
-#define	aint			__aint
-#define	aintf			__aintf
-#define	aintl			__aintl
-#define	anint			__anint
-#define	anintf			__anintf
-#define	anintl			__anintl
-#define	annuity			__annuity
-#define	annuityf		__annuityf
-#define	annuityl		__annuityl
-#define	asin			__asin
-#define	asind			__asind
-#define	asindf			__asindf
-#define	asindl			__asindl
-#define	asinf			__asinf
-#define	asinh			__asinh
-#define	asinhf			__asinhf
-#define	asinhl			__asinhl
-#define	asinl			__asinl
-#define	asinp			__asinp
-#define	asinpf			__asinpf
-#define	asinpi			__asinpi
-#define	asinpif			__asinpif
-#define	asinpil			__asinpil
-#define	asinpl			__asinpl
-#define	atan			__atan
-#define	atan2			__atan2
-#define	atan2d			__atan2d
-#define	atan2df			__atan2df
-#define	atan2dl			__atan2dl
-#define	atan2f			__atan2f
-#define	atan2l			__atan2l
-#define	atan2pi			__atan2pi
-#define	atan2pif		__atan2pif
-#define	atan2pil		__atan2pil
-#define	atand			__atand
-#define	atandf			__atandf
-#define	atandl			__atandl
-#define	atanf			__atanf
-#define	atanh			__atanh
-#define	atanhf			__atanhf
-#define	atanhl			__atanhl
-#define	atanl			__atanl
-#define	atanp			__atanp
-#define	atanpf			__atanpf
-#define	atanpi			__atanpi
-#define	atanpif			__atanpif
-#define	atanpil			__atanpil
-#define	atanpl			__atanpl
-#define	cbrt			__cbrt
-#define	cbrtf			__cbrtf
-#define	cbrtl			__cbrtl
-#define	ceil			__ceil
-#define	ceilf			__ceilf
-#define	ceill			__ceill
-#define	compound		__compound
-#define	compoundf		__compoundf
-#define	compoundl		__compoundl
-#define	convert_external	__convert_external
-#define	convert_external_	__convert_external_
-#define	copysign		__copysign
-#define	copysignf		__copysignf
-#define	copysignl		__copysignl
-#define	cos			__cos
-#define	cosd			__cosd
-#define	cosdf			__cosdf
-#define	cosdl			__cosdl
-#define	cosf			__cosf
-#define	cosh			__cosh
-#define	coshf			__coshf
-#define	coshl			__coshl
-#define	cosl			__cosl
-#define	cosp			__cosp
-#define	cospf			__cospf
-#define	cospi			__cospi
-#define	cospif			__cospif
-#define	cospil			__cospil
-#define	cospl			__cospl
-#define	d_acos_			__d_acos_
-#define	d_acosd_		__d_acosd_
-#define	d_acosh_		__d_acosh_
-#define	d_acosp_		__d_acosp_
-#define	d_acospi_		__d_acospi_
-#define	d_addran_		__d_addran_
-#define	d_addrans_		__d_addrans_
-#define	d_aint_			__d_aint_
-#define	d_anint_		__d_anint_
-#define	d_annuity_		__d_annuity_
-#define	d_asin_			__d_asin_
-#define	d_asind_		__d_asind_
-#define	d_asinh_		__d_asinh_
-#define	d_asinp_		__d_asinp_
-#define	d_asinpi_		__d_asinpi_
-#define	d_atan2_		__d_atan2_
-#define	d_atan2d_		__d_atan2d_
-#define	d_atan2pi_		__d_atan2pi_
-#define	d_atan_			__d_atan_
-#define	d_atand_		__d_atand_
-#define	d_atanh_		__d_atanh_
-#define	d_atanp_		__d_atanp_
-#define	d_atanpi_		__d_atanpi_
-#define	d_cbrt_			__d_cbrt_
-#define	d_ceil_			__d_ceil_
-#define	d_compound_		__d_compound_
-#define	d_copysign_		__d_copysign_
-#define	d_cos_			__d_cos_
-#define	d_cosd_			__d_cosd_
-#define	d_cosh_			__d_cosh_
-#define	d_cosp_			__d_cosp_
-#define	d_cospi_		__d_cospi_
-#define	d_erf_			__d_erf_
-#define	d_erfc_			__d_erfc_
-#define	d_exp10_		__d_exp10_
-#define	d_exp2_			__d_exp2_
-#define	d_exp_			__d_exp_
-#define	d_expm1_		__d_expm1_
-#define	d_fabs_			__d_fabs_
-#define	d_floor_		__d_floor_
-#define	d_fmod_			__d_fmod_
-#define	d_get_addrans_		__d_get_addrans_
-#define	d_hypot_		__d_hypot_
-#define	d_infinity_		__d_infinity_
-#define	d_init_addrans_		__d_init_addrans_
-#define	d_j0_			__d_j0_
-#define	d_j1_			__d_j1_
-#define	d_jn_			__d_jn_
-#define	d_lcran_		__d_lcran_
-#define	d_lcrans_		__d_lcrans_
-#define	d_lgamma_		__d_lgamma_
-#define	d_lgamma_r_		__d_lgamma_r_
-#define	d_log10_		__d_log10_
-#define	d_log1p_		__d_log1p_
-#define	d_log2_			__d_log2_
-#define	d_log_			__d_log_
-#define	d_logb_			__d_logb_
-#define	d_max_normal_		__d_max_normal_
-#define	d_max_subnormal_	__d_max_subnormal_
-#define	d_min_normal_		__d_min_normal_
-#define	d_min_subnormal_	__d_min_subnormal_
-#define	d_mwcran_		__d_mwcran_
-#define	d_mwcrans_		__d_mwcrans_
-#define	d_nextafter_		__d_nextafter_
-#define	d_pow_			__d_pow_
-#define	d_quiet_nan_		__d_quiet_nan_
-#define	d_remainder_		__d_remainder_
-#define	d_rint_			__d_rint_
-#define	d_scalb_		__d_scalb_
-#define	d_scalbn_		__d_scalbn_
-#define	d_set_addrans_		__d_set_addrans_
-#define	d_shufrans_		__d_shufrans_
-#define	d_signaling_nan_	__d_signaling_nan_
-#define	d_significand_		__d_significand_
-#define	d_sin_			__d_sin_
-#define	d_sincos_		__d_sincos_
-#define	d_sincosd_		__d_sincosd_
-#define	d_sincosp_		__d_sincosp_
-#define	d_sincospi_		__d_sincospi_
-#define	d_sind_			__d_sind_
-#define	d_sinh_			__d_sinh_
-#define	d_sinp_			__d_sinp_
-#define	d_sinpi_		__d_sinpi_
-#define	d_sqrt_			__d_sqrt_
-#define	d_tan_			__d_tan_
-#define	d_tand_			__d_tand_
-#define	d_tanh_			__d_tanh_
-#define	d_tanp_			__d_tanp_
-#define	d_tanpi_		__d_tanpi_
-#define	d_y0_			__d_y0_
-#define	d_y1_			__d_y1_
-#define	d_yn_			__d_yn_
-#define	drem			__drem
-#define	erf			__erf
-#define	erfc			__erfc
-#define	erfcf			__erfcf
-#define	erfcl			__erfcl
-#define	erff			__erff
-#define	erfl			__erfl
-#define	exp			__exp
-#define	exp10			__exp10
-#define	exp10f			__exp10f
-#define	exp10l			__exp10l
-#define	exp2			__exp2
-#define	exp2f			__exp2f
-#define	exp2l			__exp2l
-#define	expf			__expf
-#define	expl			__expl
-#define	expm1			__expm1
-#define	expm1f			__expm1f
-#define	expm1l			__expm1l
-#define	fabs			__fabs
-#define	fabsf			__fabsf
-#define	fabsl			__fabsl
-#define	fdim			__fdim				/* C99 */
-#define	fdimf			__fdimf				/* C99 */
-#define	fdiml			__fdiml				/* C99 */
-#define	finitef			__finitef
-#define	finitel			__finitel
-#define	floor			__floor
-#define	floorf			__floorf
-#define	floorl			__floorl
-#define	fma			__fma				/* C99 */
-#define	fmaf			__fmaf				/* C99 */
-#define	fmal			__fmal				/* C99 */
-#define	fmax			__fmax				/* C99 */
-#define	fmaxf			__fmaxf				/* C99 */
-#define	fmaxl			__fmaxl				/* C99 */
-#define	fmin			__fmin				/* C99 */
-#define	fminf			__fminf				/* C99 */
-#define	fminl			__fminl				/* C99 */
-#define	fmod			__fmod
-#define	fmodf			__fmodf
-#define	fmodl			__fmodl
-#define	fp_class		__fp_class
-#define	fp_classf		__fp_classf
-#define	fp_classl		__fp_classl
-#define	frexp			__frexp				/* S10 */
-#define	frexpf			__frexpf			/* S10 */
-#define	frexpl			__frexpl			/* S10 */
-#define	gamma			__gamma
-#define	gamma_r			__gamma_r
-#define	gammaf			__gammaf
-#define	gammaf_r		__gammaf_r
-#define	gammal			__gammal
-#define	gammal_r		__gammal_r
-#define	gradual_underflow_	__gradual_underflow_
-#define	hypot			__hypot
-#define	hypotf			__hypotf
-#define	hypotl			__hypotl
-#define	i_addran_		__i_addran_
-#define	i_addrans_		__i_addrans_
-#define	i_get_addrans_		__i_get_addrans_
-#define	i_get_lcrans_		__i_get_lcrans_
-#define	i_get_mwcrans_		__i_get_mwcrans_
-#define	i_init_addrans_		__i_init_addrans_
-#define	i_init_lcrans_		__i_init_lcrans_
-#define	i_init_mwcrans_		__i_init_mwcrans_
-#define	i_lcran_		__i_lcran_
-#define	i_lcrans_		__i_lcrans_
-#define	i_llmwcran_		__i_llmwcran_
-#define	i_llmwcrans_		__i_llmwcrans_
-#define	i_mwcran_		__i_mwcran_
-#define	i_mwcrans_		__i_mwcrans_
-#define	i_set_addrans_		__i_set_addrans_
-#define	i_set_lcrans_		__i_set_lcrans_
-#define	i_set_mwcrans_		__i_set_mwcrans_
-#define	i_shufrans_		__i_shufrans_
-#define	id_finite_		__id_finite_
-#define	id_fp_class_		__id_fp_class_
-#define	id_ilogb_		__id_ilogb_
-#define	id_irint_		__id_irint_
-#define	id_isinf_		__id_isinf_
-#define	id_isnan_		__id_isnan_
-#define	id_isnormal_		__id_isnormal_
-#define	id_issubnormal_		__id_issubnormal_
-#define	id_iszero_		__id_iszero_
-#define	id_nint_		__id_nint_
-#define	id_signbit_		__id_signbit_
-#define	ieee_flags		__ieee_flags
-#define	ieee_flags_		__ieee_flags_
-#define	ieee_handler		__ieee_handler
-#define	ieee_handler_		__ieee_handler_
-#define	ieee_handlers		__ieee_handlers
-#define	ieee_retrospective	__ieee_retrospective
-#define	ieee_retrospective_	__ieee_retrospective_
-#define	ilogb			__ilogb
-#define	ilogbf			__ilogbf
-#define	ilogbl			__ilogbl
-#define	infinity		__infinity
-#define	infinityf		__infinityf
-#define	infinityl		__infinityl
-#define	iq_finite_		__iq_finite_
-#define	iq_fp_class_		__iq_fp_class_
-#define	iq_ilogb_		__iq_ilogb_
-#define	iq_isinf_		__iq_isinf_
-#define	iq_isnan_		__iq_isnan_
-#define	iq_isnormal_		__iq_isnormal_
-#define	iq_issubnormal_		__iq_issubnormal_
-#define	iq_iszero_		__iq_iszero_
-#define	iq_signbit_		__iq_signbit_
-#define	ir_finite_		__ir_finite_
-#define	ir_fp_class_		__ir_fp_class_
-#define	ir_ilogb_		__ir_ilogb_
-#define	ir_irint_		__ir_irint_
-#define	ir_isinf_		__ir_isinf_
-#define	ir_isnan_		__ir_isnan_
-#define	ir_isnormal_		__ir_isnormal_
-#define	ir_issubnormal_		__ir_issubnormal_
-#define	ir_iszero_		__ir_iszero_
-#define	ir_nint_		__ir_nint_
-#define	ir_signbit_		__ir_signbit_
-#define	irint			__irint
-#define	irintf			__irintf
-#define	irintl			__irintl
-#define	isinf			__isinf
-#define	isinff			__isinff
-#define	isinfl			__isinfl
-#define	isnan			__isnan
-#define	isnanf			__isnanf
-#define	isnanl			__isnanl
-#define	isnormal		__isnormal
-#define	isnormalf		__isnormalf
-#define	isnormall		__isnormall
-#define	issubnormal		__issubnormal
-#define	issubnormalf		__issubnormalf
-#define	issubnormall		__issubnormall
-#define	iszero			__iszero
-#define	iszerof			__iszerof
-#define	iszerol			__iszerol
-#define	j0			__j0
-#define	j0f			__j0f
-#define	j0l			__j0l
-#define	j1			__j1
-#define	j1f			__j1f
-#define	j1l			__j1l
-#define	jn			__jn
-#define	jnf			__jnf
-#define	jnl			__jnl
-#define	ldexp			__ldexp				/* S10 */
-#define	ldexpf			__ldexpf			/* S10 */
-#define	ldexpl			__ldexpl			/* S10 */
-#define	lgamma			__lgamma
-#define	lgamma_r		__lgamma_r
-#define	lgammaf			__lgammaf
-#define	lgammaf_r		__lgammaf_r
-#define	lgammal			__lgammal
-#define	lgammal_r		__lgammal_r
-#define	llrint			__llrint			/* C99 */
-#define	llrintf			__llrintf			/* C99 */
-#define	llrintl			__llrintl			/* C99 */
-#define	llround			__llround			/* C99 */
-#define	llroundf		__llroundf			/* C99 */
-#define	llroundl		__llroundl			/* C99 */
-#define	lrint			__lrint				/* C99 */
-#define	lrintf			__lrintf			/* C99 */
-#define	lrintl			__lrintl			/* C99 */
-#define	lround			__lround			/* C99 */
-#define	lroundf			__lroundf			/* C99 */
-#define	lroundl			__lroundl			/* C99 */
-#define	log			__log
-#define	log10			__log10
-#define	log10f			__log10f
-#define	log10l			__log10l
-#define	log1p			__log1p
-#define	log1pf			__log1pf
-#define	log1pl			__log1pl
-#define	log2			__log2
-#define	log2f			__log2f
-#define	log2l			__log2l
-#define	logb			__logb
-#define	logbf			__logbf
-#define	logbl			__logbl
-#define	logf			__logf
-#define	logl			__logl
-#define	max_normal		__max_normal
-#define	max_normalf		__max_normalf
-#define	max_normall		__max_normall
-#define	max_subnormal		__max_subnormal
-#define	max_subnormalf		__max_subnormalf
-#define	max_subnormall		__max_subnormall
-#define	min_normal		__min_normal
-#define	min_normalf		__min_normalf
-#define	min_normall		__min_normall
-#define	min_subnormal		__min_subnormal
-#define	min_subnormalf		__min_subnormalf
-#define	min_subnormall		__min_subnormall
-#define	modf			__modf				/* S10 */
-#define	modff			__modff				/* S10 */
-#define	modfl			__modfl				/* S10 */
-#define	nan			__nan				/* C99 */
-#define	nanf			__nanf				/* C99 */
-#define	nanl			__nanl				/* C99 */
-#define	nearbyint		__nearbyint			/* C99 */
-#define	nearbyintf		__nearbyintf			/* C99 */
-#define	nearbyintl		__nearbyintl			/* C99 */
-#define	nextafter		__nextafter
-#define	nextafterf		__nextafterf
-#define	nextafterl		__nextafterl
-#define	nexttoward		__nexttoward			/* C99 */
-#define	nexttowardf		__nexttowardf			/* C99 */
-#define	nexttowardl		__nexttowardl			/* C99 */
-#define	nint			__nint
-#define	nintf			__nintf
-#define	nintl			__nintl
-#define	nonstandard_arithmetic	__nonstandard_arithmetic
-#define	nonstandard_arithmetic_	__nonstandard_arithmetic_
-#define	pow			__pow
-#define	pow_di			__pow_di
-#define	pow_li			__pow_li
-#define	pow_ri			__pow_ri
-#define	powf			__powf
-#define	powl			__powl
-#define	q_copysign_		__q_copysign_
-#define	q_fabs_			__q_fabs_
-#define	q_fmod_			__q_fmod_
-#define	q_infinity_		__q_infinity_
-#define	q_max_normal_		__q_max_normal_
-#define	q_max_subnormal_	__q_max_subnormal_
-#define	q_min_normal_		__q_min_normal_
-#define	q_min_subnormal_	__q_min_subnormal_
-#define	q_nextafter_		__q_nextafter_
-#define	q_quiet_nan_		__q_quiet_nan_
-#define	q_remainder_		__q_remainder_
-#define	q_scalbn_		__q_scalbn_
-#define	q_signaling_nan_	__q_signaling_nan_
-#define	quiet_nan		__quiet_nan
-#define	quiet_nanf		__quiet_nanf
-#define	quiet_nanl		__quiet_nanl
-#define	r_acos_			__r_acos_
-#define	r_acosd_		__r_acosd_
-#define	r_acosh_		__r_acosh_
-#define	r_acosp_		__r_acosp_
-#define	r_acospi_		__r_acospi_
-#define	r_addran_		__r_addran_
-#define	r_addrans_		__r_addrans_
-#define	r_aint_			__r_aint_
-#define	r_anint_		__r_anint_
-#define	r_annuity_		__r_annuity_
-#define	r_asin_			__r_asin_
-#define	r_asind_		__r_asind_
-#define	r_asinh_		__r_asinh_
-#define	r_asinp_		__r_asinp_
-#define	r_asinpi_		__r_asinpi_
-#define	r_atan2_		__r_atan2_
-#define	r_atan2d_		__r_atan2d_
-#define	r_atan2pi_		__r_atan2pi_
-#define	r_atan_			__r_atan_
-#define	r_atand_		__r_atand_
-#define	r_atanh_		__r_atanh_
-#define	r_atanp_		__r_atanp_
-#define	r_atanpi_		__r_atanpi_
-#define	r_cbrt_			__r_cbrt_
-#define	r_ceil_			__r_ceil_
-#define	r_compound_		__r_compound_
-#define	r_copysign_		__r_copysign_
-#define	r_cos_			__r_cos_
-#define	r_cosd_			__r_cosd_
-#define	r_cosh_			__r_cosh_
-#define	r_cosp_			__r_cosp_
-#define	r_cospi_		__r_cospi_
-#define	r_erf_			__r_erf_
-#define	r_erfc_			__r_erfc_
-#define	r_exp10_		__r_exp10_
-#define	r_exp2_			__r_exp2_
-#define	r_exp_			__r_exp_
-#define	r_expm1_		__r_expm1_
-#define	r_fabs_			__r_fabs_
-#define	r_floor_		__r_floor_
-#define	r_fmod_			__r_fmod_
-#define	r_get_addrans_		__r_get_addrans_
-#define	r_hypot_		__r_hypot_
-#define	r_infinity_		__r_infinity_
-#define	r_init_addrans_		__r_init_addrans_
-#define	r_j0_			__r_j0_
-#define	r_j1_			__r_j1_
-#define	r_jn_			__r_jn_
-#define	r_lcran_		__r_lcran_
-#define	r_lcrans_		__r_lcrans_
-#define	r_lgamma_		__r_lgamma_
-#define	r_lgamma_r_		__r_lgamma_r_
-#define	r_log10_		__r_log10_
-#define	r_log1p_		__r_log1p_
-#define	r_log2_			__r_log2_
-#define	r_log_			__r_log_
-#define	r_logb_			__r_logb_
-#define	r_max_normal_		__r_max_normal_
-#define	r_max_subnormal_	__r_max_subnormal_
-#define	r_min_normal_		__r_min_normal_
-#define	r_min_subnormal_	__r_min_subnormal_
-#define	r_mwcran_		__r_mwcran_
-#define	r_mwcrans_		__r_mwcrans_
-#define	r_nextafter_		__r_nextafter_
-#define	r_pow_			__r_pow_
-#define	r_quiet_nan_		__r_quiet_nan_
-#define	r_remainder_		__r_remainder_
-#define	r_rint_			__r_rint_
-#define	r_scalb_		__r_scalb_
-#define	r_scalbn_		__r_scalbn_
-#define	r_set_addrans_		__r_set_addrans_
-#define	r_shufrans_		__r_shufrans_
-#define	r_signaling_nan_	__r_signaling_nan_
-#define	r_significand_		__r_significand_
-#define	r_sin_			__r_sin_
-#define	r_sincos_		__r_sincos_
-#define	r_sincosd_		__r_sincosd_
-#define	r_sincosp_		__r_sincosp_
-#define	r_sincospi_		__r_sincospi_
-#define	r_sind_			__r_sind_
-#define	r_sinh_			__r_sinh_
-#define	r_sinp_			__r_sinp_
-#define	r_sinpi_		__r_sinpi_
-#define	r_sqrt_			__r_sqrt_
-#define	r_tan_			__r_tan_
-#define	r_tand_			__r_tand_
-#define	r_tanh_			__r_tanh_
-#define	r_tanp_			__r_tanp_
-#define	r_tanpi_		__r_tanpi_
-#define	r_y0_			__r_y0_
-#define	r_y1_			__r_y1_
-#define	r_yn_			__r_yn_
-#define	remainder		__remainder
-#define	remainderf		__remainderf
-#define	remainderl		__remainderl
-#define	remquo			__remquo			/* C99 */
-#define	remquof			__remquof			/* C99 */
-#define	remquol			__remquol			/* C99 */
-#define	rint			__rint
-#define	rintf			__rintf
-#define	rintl			__rintl
-#define	round			__round				/* C99 */
-#define	roundf			__roundf			/* C99 */
-#define	roundl			__roundl			/* C99 */
-#define	scalb			__scalb
-#define	scalbf			__scalbf
-#define	scalbl			__scalbl
-#define	scalbln			__scalbln			/* C99 */
-#define	scalblnf		__scalblnf			/* C99 */
-#define	scalblnl		__scalblnl			/* C99 */
-#define	scalbn			__scalbn
-#define	scalbnf			__scalbnf
-#define	scalbnl			__scalbnl
-#define	sigfpe			__sigfpe
-#define	sigfpe_			__sigfpe_
-#define	signaling_nan		__signaling_nan
-#define	signaling_nanf		__signaling_nanf
-#define	signaling_nanl		__signaling_nanl
-#define	signbit			__signbit
-#define	signbitf		__signbitf
-#define	signbitl		__signbitl
-#define	signgam			__signgam
-#define	signgamf		__signgamf
-#define	signgaml		__signgaml
-#define	significand		__significand
-#define	significandf		__significandf
-#define	significandl		__significandl
-#define	sin			__sin
-#define	sincos			__sincos
-#define	sincosd			__sincosd
-#define	sincosdf		__sincosdf
-#define	sincosdl		__sincosdl
-#define	sincosf			__sincosf
-#define	sincosl			__sincosl
-#define	sincosp			__sincosp
-#define	sincospf		__sincospf
-#define	sincospi		__sincospi
-#define	sincospif		__sincospif
-#define	sincospil		__sincospil
-#define	sincospl		__sincospl
-#define	sind			__sind
-#define	sindf			__sindf
-#define	sindl			__sindl
-#define	sinf			__sinf
-#define	sinh			__sinh
-#define	sinhf			__sinhf
-#define	sinhl			__sinhl
-#define	sinl			__sinl
-#define	sinp			__sinp
-#define	sinpf			__sinpf
-#define	sinpi			__sinpi
-#define	sinpif			__sinpif
-#define	sinpil			__sinpil
-#define	sinpl			__sinpl
-#define	smwcran_		__smwcran_
-#define	sqrt			__sqrt
-#define	sqrtf			__sqrtf
-#define	sqrtl			__sqrtl
-#define	standard_arithmetic	__standard_arithmetic
-#define	standard_arithmetic_	__standard_arithmetic_
-#define	tan			__tan
-#define	tand			__tand
-#define	tandf			__tandf
-#define	tandl			__tandl
-#define	tanf			__tanf
-#define	tanh			__tanh
-#define	tanhf			__tanhf
-#define	tanhl			__tanhl
-#define	tanl			__tanl
-#define	tanp			__tanp
-#define	tanpf			__tanpf
-#define	tanpi			__tanpi
-#define	tanpif			__tanpif
-#define	tanpil			__tanpil
-#define	tanpl			__tanpl
-#define	tgamma			__tgamma			/* C99 */
-#define	tgammaf			__tgammaf			/* C99 */
-#define	tgammal			__tgammal			/* C99 */
-#define	trunc			__trunc				/* C99 */
-#define	truncf			__truncf			/* C99 */
-#define	truncl			__truncl			/* C99 */
-#define	u_addrans_		__u_addrans_
-#define	u_lcrans_		__u_lcrans_
-#define	u_llmwcran_		__u_llmwcran_
-#define	u_llmwcrans_		__u_llmwcrans_
-#define	u_mwcran_		__u_mwcran_
-#define	u_mwcrans_		__u_mwcrans_
-#define	u_shufrans_		__u_shufrans_
-#define	y0			__y0
-#define	y0f			__y0f
-#define	y0l			__y0l
-#define	y1			__y1
-#define	y1f			__y1f
-#define	y1l			__y1l
-#define	yn			__yn
-#define	ynf			__ynf
-#define	ynl			__ynl
-
-/*
- *  these are libdl entry points
- */
-#define	dlclose			_dlclose
-#define	dlopen			_dlopen
-#define	dlsym			_dlsym
-
-/*
- *  these are libc entry points
- */
-#define	finite			_finite
-#define	fpclass			_fpclass
-#define	isnand			_isnand
-#define	sigaction		_sigaction
-#define	sigemptyset		_sigemptyset
-#define	unordered		_unordered
-#define	write			_write
-#ifdef _REENTRANT
-#define	mutex_lock		_mutex_lock
-#define	mutex_unlock		_mutex_unlock
-#define	thr_getspecific		_thr_getspecific
-#define	thr_keycreate		_thr_keycreate
-#define	thr_main		_thr_main
-#define	thr_setspecific		_thr_setspecific
-#endif
-
-#endif /* defined(ELFOBJ) && !defined(lint) */
-
-#endif	/* _LIBM_SYNONYMS_H */
--- old/usr/src/lib/libm/common/C/libm_thread.h	2014-11-25 12:56:52.910626469 -0500
+++ /dev/null	2014-11-25 12:56:52.000000000 -0500
@@ -1,44 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * 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.
- * 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 2011 Nexenta Systems, Inc.  All rights reserved.
- */
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#ifndef _LIBM_THREAD_H
-#define	_LIBM_THREAD_H
-
-#include <synch.h>
-#include <thread.h>
-
-/*
- * -lthread function(s) not prototyped anywhere
- */
-extern int thr_main(void);
-/*
- * function call(s) local to libsunmath
- */
-extern void *__tsd_alloc(thread_key_t *, int, int);
-#endif	/* _LIBM_THREAD_H */
--- old/usr/src/lib/libm/common/C/log.c	2014-11-25 12:56:53.060827450 -0500
+++ new/usr/src/lib/libm/common/C/log.c	2014-11-25 12:56:53.072201731 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak log = __log
+#pragma weak __log = log
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/C/log10.c	2014-11-25 12:56:53.466051274 -0500
+++ new/usr/src/lib/libm/common/C/log10.c	2014-11-25 12:56:53.477871811 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak log10 = __log10
+#pragma weak __log10 = log10
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/C/log1p.c	2014-11-25 12:56:53.871734575 -0500
+++ new/usr/src/lib/libm/common/C/log1p.c	2014-11-25 12:56:53.883395011 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak log1p = __log1p
+#pragma weak __log1p = log1p
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/C/log2.c	2014-11-25 12:56:54.338649585 -0500
+++ new/usr/src/lib/libm/common/C/log2.c	2014-11-25 12:56:54.351018013 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak log2 = __log2
+#pragma weak __log2 = log2
 
 /* INDENT OFF */
 /*
@@ -88,7 +88,6 @@
 /* INDENT ON */
 
 #include "libm.h"
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
 extern const double _TBL_log[];
--- old/usr/src/lib/libm/common/C/logb.c	2014-11-25 12:56:54.769226250 -0500
+++ new/usr/src/lib/libm/common/C/logb.c	2014-11-25 12:56:54.780836574 -0500
@@ -27,16 +27,14 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak logb = __logb
-#pragma weak _logb = __logb
-#endif
+#pragma weak __logb = logb
+#pragma weak _logb = logb
 
 #include "libm.h"
 #include "xpg6.h"	/* __xpg6 */
 #define	_C99SUSv3_logb	_C99SUSv3_logb_subnormal_is_like_ilogb
 
-#if defined(USE_FPSCALE) || defined(__x86)
+#if defined(__x86)
 static const double two52 = 4503599627370496.0;
 #else
 /*
@@ -59,7 +57,7 @@
 	v <<= 1;
 	return (r + ((0xffffaa50 >> v) & 0x3));
 }
-#endif	/* defined(USE_FPSCALE) */
+#endif	/* defined(__x86) */
 
 double
 logb(double x) {
@@ -69,7 +67,7 @@
 		if ((px[LOWORD] | k) == 0)
 			return (_SVID_libm_err(x, x, 45));
 		else if ((__xpg6 & _C99SUSv3_logb) != 0) {
-#if defined(USE_FPSCALE) || defined(__x86)
+#if defined(__x86)
 			x *= two52;
 			return ((double) (((px[HIWORD] & 0x7ff00000) >> 20)
 				- 1075));
--- old/usr/src/lib/libm/common/C/nextafter.c	2014-11-25 12:56:55.165435313 -0500
+++ new/usr/src/lib/libm/common/C/nextafter.c	2014-11-25 12:56:55.177020234 -0500
@@ -26,8 +26,8 @@
  * Use is subject to license terms.
  */
 
-#pragma weak nextafter = __nextafter
-#pragma weak _nextafter = __nextafter
+#pragma weak __nextafter = nextafter
+#pragma weak _nextafter = nextafter
 
 #include "libm.h"
 #include <float.h>		/* DBL_MIN */
--- old/usr/src/lib/libm/common/C/pow.c	2014-11-25 12:56:55.561708807 -0500
+++ new/usr/src/lib/libm/common/C/pow.c	2014-11-25 12:56:55.573509292 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak pow = __pow
-#endif
+#pragma weak __pow = pow
 
 /*
  * pow(x,y) return x**y
--- old/usr/src/lib/libm/common/C/remainder.c	2014-11-25 12:56:55.976234768 -0500
+++ new/usr/src/lib/libm/common/C/remainder.c	2014-11-25 12:56:55.987579736 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak remainder = __remainder
+#pragma weak __remainder = remainder
 
 /*
  * remainder(x,p)
--- old/usr/src/lib/libm/common/C/rint.c	2014-11-25 12:56:56.373333509 -0500
+++ new/usr/src/lib/libm/common/C/rint.c	2014-11-25 12:56:56.384758082 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak rint = __rint
+#pragma weak __rint = rint
 
 /*
  * rint(x) return x rounded to integral according to the rounding direction
--- old/usr/src/lib/libm/common/C/scalb.c	2014-11-25 12:56:56.768684175 -0500
+++ new/usr/src/lib/libm/common/C/scalb.c	2014-11-25 12:56:56.780663150 -0500
@@ -26,8 +26,8 @@
  * Use is subject to license terms.
  */
 
-#pragma weak scalb = __scalb
-#pragma weak _scalb = __scalb
+#pragma weak __scalb = scalb
+#pragma weak _scalb = scalb
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/C/scalbn.c	2014-11-25 12:56:57.163527347 -0500
+++ new/usr/src/lib/libm/common/C/scalbn.c	2014-11-25 12:56:57.175165477 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak scalbn = __scalbn
+#pragma weak __scalbn = scalbn
 
 #include "libm.h"
 
@@ -36,7 +36,7 @@
 	tiny	= 1.0e-300,
 	twom54	= 5.5511151231257827021181583404541015625e-17;
 
-#if defined(USE_FPSCALE) || defined(__x86)
+#if defined(__x86)
 static const double two52 = 4503599627370496.0;
 #else
 /*
@@ -70,7 +70,7 @@
 	px[LOWORD] = w;
 	return (1 - s);
 }
-#endif	/* defined(USE_FPSCALE) */
+#endif	/* defined(__x86) */
 
 double
 scalbn(double x, int n) {
@@ -87,7 +87,7 @@
 	if (k == 0) {
 		if ((hx | px[LOWORD]) == 0 || n == 0)
 			return (x);
-#if defined(USE_FPSCALE) || defined(__x86)
+#if defined(__x86)
 		x *= two52;
 		ix = px[HIWORD];
 		k = ((ix & ~0x80000000) >> 20) - 52;
--- old/usr/src/lib/libm/common/C/signgam.c	2014-11-25 12:56:57.581494792 -0500
+++ new/usr/src/lib/libm/common/C/signgam.c	2014-11-25 12:56:57.593501031 -0500
@@ -27,9 +27,8 @@
  * Use is subject to license terms.
  */
 
-#pragma weak signgam = __signgam
+#pragma weak __signgam = signgam
 
-#include "libm_synonyms.h"
 #include <math.h>
 
 int signgam = 0;
--- old/usr/src/lib/libm/common/C/significand.c	2014-11-25 12:56:57.985013494 -0500
+++ new/usr/src/lib/libm/common/C/significand.c	2014-11-25 12:56:57.996340282 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak significand = __significand
-#endif
+#pragma weak __significand = significand
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/C/sin.c	2014-11-25 12:56:58.381061440 -0500
+++ new/usr/src/lib/libm/common/C/sin.c	2014-11-25 12:56:58.392728513 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak sin = __sin
+#pragma weak __sin = sin
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/C/sincos.c	2014-11-25 12:56:58.783116773 -0500
+++ new/usr/src/lib/libm/common/C/sincos.c	2014-11-25 12:56:58.794730731 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak sincos = __sincos
+#pragma weak __sincos = sincos
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/C/sincospi.c	2014-11-25 12:56:59.245260847 -0500
+++ new/usr/src/lib/libm/common/C/sincospi.c	2014-11-25 12:56:59.258435887 -0500
@@ -27,8 +27,6 @@
  * Use is subject to license terms.
  */
 
-#pragma weak sincospi = __sincospi
-
 /* INDENT OFF */
 /*
  * void sincospi(double x, double *s, double *c)
@@ -72,7 +70,6 @@
  */
 
 #include "libm.h"
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 #include "libm_macros.h"
 #include <math.h>
--- old/usr/src/lib/libm/common/C/sinh.c	2014-11-25 12:56:59.651724457 -0500
+++ new/usr/src/lib/libm/common/C/sinh.c	2014-11-25 12:56:59.663172475 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak sinh = __sinh
+#pragma weak __sinh = sinh
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/C/sqrt.c	2014-11-25 12:57:00.049107283 -0500
+++ new/usr/src/lib/libm/common/C/sqrt.c	2014-11-25 12:57:00.060576633 -0500
@@ -26,11 +26,10 @@
  * Use is subject to license terms.
  */
 
-#pragma weak sqrt = __sqrt
+#pragma weak __sqrt = sqrt
 
 #include "libm.h"
 
-#ifdef __INLINE
 
 extern double __inline_sqrt(double);
 
@@ -43,108 +42,3 @@
 	return ((x < 0.0)? _SVID_libm_err(x, x, 26) : z);
 }
 
-#else	/* defined(__INLINE) */
-
-/*
- * Warning: This correctly rounded sqrt is extremely slow because it computes
- * the sqrt bit by bit using integer arithmetic.
- */
-
-static const double big = 1.0e30, small = 1.0e-30;
-
-double
-sqrt(double x)
-{
-	double		z;
-	unsigned	r, t1, s1, ix1, q1;
-	int		ix0, s0, j, q, m, n, t;
-	int		 *px = (int *)&x, *pz = (int *)&z;
-
-	ix0 = px[HIWORD];
-	ix1 = px[LOWORD];
-	if ((ix0 & 0x7ff00000) == 0x7ff00000) { /* x is inf or NaN */
-		if (ix0 == 0xfff00000 && ix1 == 0)
-			return (_SVID_libm_err(x, x, 26));
-		return (x + x);
-	}
-	if (((ix0 & 0x7fffffff) | ix1) == 0)	/* x is zero */
-		return (x);
-
-	/* extract exponent and significand */
-	m = ilogb(x);
-	z = scalbn(x, -m);
-	ix0 = (pz[HIWORD] & 0x000fffff) | 0x00100000;
-	ix1 = pz[LOWORD];
-	n = m >> 1;
-	if (n + n != m) {
-		ix0 = (ix0 << 1) | (ix1 >> 31);
-		ix1 <<= 1;
-		m -= 1;
-	}
-
-	/* generate sqrt(x) bit by bit */
-	ix0 = (ix0 << 1) | (ix1 >> 31);
-	ix1 <<= 1;
-	q = q1 = s0 = s1 = 0;
-	r = 0x00200000;
-
-	for (j = 1; j <= 22; j++) {
-		t = s0 + r;
-		if (t <= ix0) {
-			s0 = t + r;
-			ix0 -= t;
-			q += r;
-		}
-		ix0 = (ix0 << 1) | (ix1 >> 31);
-		ix1 <<= 1;
-		r >>= 1;
-	}
-
-	r = 0x80000000;
-	for (j = 1; j <= 32; j++) {
-		t1 = s1 + r;
-		t = s0;
-		if (t < ix0 || (t == ix0 && t1 <= ix1)) {
-			s1 = t1 + r;
-			if ((t1 & 0x80000000) == 0x80000000 &&
-			    (s1 & 0x80000000) == 0)
-				s0 += 1;
-			ix0 -= t;
-			if (ix1 < t1)
-				ix0 -= 1;
-			ix1 -= t1;
-			q1 += r;
-		}
-		ix0 = (ix0 << 1) | (ix1 >> 31);
-		ix1 <<= 1;
-		r >>= 1;
-	}
-
-	/* round */
-	if ((ix0 | ix1) == 0)
-		goto done;
-	z = big - small;	/* trigger inexact flag */
-	if (z < big)
-		goto done;
-	if (q1 == 0xffffffff) {
-		q1 = 0;
-		q += 1;
-		goto done;
-	}
-	z = big + small;
-	if (z > big) {
-		if (q1 == 0xfffffffe)
-			q += 1;
-		q1 += 2;
-		goto done;
-	}
-	q1 += (q1 & 1);
-done:
-	pz[HIWORD] = (q >> 1) + 0x3fe00000;
-	pz[LOWORD] = q1 >> 1;
-	if ((q & 1) == 1)
-		pz[LOWORD] |= 0x80000000;
-	return (scalbn(z, n));
-}
-
-#endif	/* defined(__INLINE) */
--- old/usr/src/lib/libm/common/C/tan.c	2014-11-25 12:57:00.467549994 -0500
+++ new/usr/src/lib/libm/common/C/tan.c	2014-11-25 12:57:00.478999542 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak tan = __tan
+#pragma weak __tan = tan
 
 /* INDENT OFF */
 /*
@@ -41,7 +41,6 @@
 /* INDENT ON */
 
 #include "libm.h"
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 #include <math.h>
 
--- old/usr/src/lib/libm/common/C/tanh.c	2014-11-25 12:57:00.877552977 -0500
+++ new/usr/src/lib/libm/common/C/tanh.c	2014-11-25 12:57:00.889208315 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak tanh = __tanh
+#pragma weak __tanh = tanh
 
 /* INDENT OFF */
 /*
@@ -56,7 +56,6 @@
  */
 
 #include "libm.h"
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 #include <math.h>
 
--- old/usr/src/lib/libm/common/LD/__lgammal.c	2014-11-25 12:57:01.277414162 -0500
+++ new/usr/src/lib/libm/common/LD/__lgammal.c	2014-11-25 12:57:01.289011544 -0500
@@ -49,7 +49,6 @@
  */
 
 #include "libm.h"
-#include "libm_synonyms.h"
 #include "longdouble.h"
 
 static long double neg(long double, int *);
--- old/usr/src/lib/libm/common/LD/__poly_libmq.c	2014-11-25 12:57:01.693122152 -0500
+++ new/usr/src/lib/libm/common/LD/__poly_libmq.c	2014-11-25 12:57:01.704567631 -0500
@@ -28,7 +28,6 @@
  */
 
 #include "libm.h"
-#include "libm_synonyms.h"
 
 long double __poly_libmq(x,n,p)
 long double x,p[];
--- old/usr/src/lib/libm/common/LD/acoshl.c	2014-11-25 12:57:02.087630938 -0500
+++ new/usr/src/lib/libm/common/LD/acoshl.c	2014-11-25 12:57:02.099241950 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak acoshl = __acoshl
-#endif
+#pragma weak __acoshl = acoshl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/LD/asinhl.c	2014-11-25 12:57:02.480794008 -0500
+++ new/usr/src/lib/libm/common/LD/asinhl.c	2014-11-25 12:57:02.492341792 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak asinhl = __asinhl
-#endif
+#pragma weak __asinhl = asinhl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/LD/atan2pil.c	2014-11-25 12:57:02.887734699 -0500
+++ new/usr/src/lib/libm/common/LD/atan2pil.c	2014-11-25 12:57:02.899218942 -0500
@@ -27,10 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak atan2pil = __atan2pil
-
 #include "libm.h"
-#include "libm_synonyms.h"
 
 #define GENERIC	long double
 #define ATAN2PI	atan2pil
--- old/usr/src/lib/libm/common/LD/atanhl.c	2014-11-25 12:57:03.294084022 -0500
+++ new/usr/src/lib/libm/common/LD/atanhl.c	2014-11-25 12:57:03.305795158 -0500
@@ -27,10 +27,9 @@
  * Use is subject to license terms.
  */
 
-#pragma weak atanhl = __atanhl
+#pragma weak __atanhl = atanhl
 
 #include "libm.h"
-#include "libm_synonyms.h"
 
 #define GENERIC	long double
 #define	ATANH 	atanhl
@@ -40,7 +39,7 @@
  *	ATANH(x) = --- * LOG(1 + -------) = 0.5 * LOG1P(2 * --------)
  *                  2             1 - x                      1 - x
  * Note: to guarantee ATANH(-x) = -ATANH(x), we use
- *                 sign(x)             |x|  
+ *                 sign(x)             |x|
  *	ATANH(x) = ------- * LOG1P(2*-------).
  *                    2              1 - |x|
  *
@@ -65,7 +64,7 @@
 
 GENERIC ATANH(x)
 GENERIC x;
-{	
+{
 	GENERIC t;
 	t = FABS(x);
 	if (t == one) return x/zero;
--- old/usr/src/lib/libm/common/LD/cbrtl.c	2014-11-25 12:57:03.724955044 -0500
+++ new/usr/src/lib/libm/common/LD/cbrtl.c	2014-11-25 12:57:03.736470401 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak cbrtl = __cbrtl
-#endif
+#pragma weak __cbrtl = cbrtl
 
 #include "libm.h"
 #include "longdouble.h"
--- old/usr/src/lib/libm/common/LD/coshl.c	2014-11-25 12:57:04.129868723 -0500
+++ new/usr/src/lib/libm/common/LD/coshl.c	2014-11-25 12:57:04.141206907 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak coshl = __coshl
-#endif
+#pragma weak __coshl = coshl
 
 #include "libm.h"
 #include "longdouble.h"
--- old/usr/src/lib/libm/common/LD/cosl.c	2014-11-25 12:57:04.572449684 -0500
+++ new/usr/src/lib/libm/common/LD/cosl.c	2014-11-25 12:57:04.585114878 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak cosl = __cosl
+#pragma weak __cosl = cosl
 
 /* INDENT OFF */
 /* cosl(x)
@@ -63,7 +63,6 @@
 /* INDENT ON */
 
 #include "libm.h"
-#include "libm_synonyms.h"
 #include "longdouble.h"
 
 #include <sys/isa_defs.h>
--- old/usr/src/lib/libm/common/LD/erfl.c	2014-11-25 12:57:04.972036675 -0500
+++ new/usr/src/lib/libm/common/LD/erfl.c	2014-11-25 12:57:04.983582007 -0500
@@ -32,7 +32,7 @@
  *			     x
  *		      2      |\
  *     erf(x)  =  ---------  | exp(-t*t)dt
- *	 	   sqrt(pi) \| 
+ *	 	   sqrt(pi) \|
  *			     0
  *
  *     erfc(x) =  1-erf(x)
@@ -40,14 +40,14 @@
  * method:
  * 	Since erf(-x) = -erf(x), we assume x>=0.
  *	For x near 0, we have the expansion
- * 
+ *
  *     	    erf(x) = (2/sqrt(pi))*(x - x^3/3 + x^5/10 - x^7/42 + ....).
  *
  * 	Since 2/sqrt(pi) = 1.128379167095512573896158903121545171688,
  *	we use x + x*P(x^2) to approximate erf(x). This formula will
  *	guarantee the error less than one ulp where x is not too far
  *	away from 0. We note that erf(x)=x at x = 0.6174...... After
- *	some experiment, we choose the following approximation on 
+ *	some experiment, we choose the following approximation on
  *	interval [0,0.84375].
  *
  *	For x in [0,0.84375]
@@ -59,17 +59,17 @@
  *		   = 0.5 + ((0.5-x)-x*P)  if x in [0.25,0.84375]
  *	precision: |P(x^2)-(erf(x)-x)/x| <= 2**-122.50
  *
- *	For x in [0.84375,1.25], let s = x - 1, and 
+ *	For x in [0.84375,1.25], let s = x - 1, and
  *	c = 0.84506291151 rounded to single (24 bits)
  *	   erf(x)  = c  + P1(s)/Q1(s)
- *	   erfc(x) = (1-c)  - P1(s)/Q1(s) 
+ *	   erfc(x) = (1-c)  - P1(s)/Q1(s)
  *	precision: |P1/Q1 - (erf(x)-c)| <= 2**-118.41
- *	
  *
- *	For x in [1.25,1.75], let s = x - 1.5, and 
+ *
+ *	For x in [1.25,1.75], let s = x - 1.5, and
  *	c = 0.95478588343 rounded to single (24 bits)
  *	   erf(x)  = c  + P2(s)/Q2(s)
- *	   erfc(x) = (1-c)  - P2(s)/Q2(s) 
+ *	   erfc(x) = (1-c)  - P2(s)/Q2(s)
  *	precision: |P1/Q1 - (erf(x)-c)| <= 2**-123.83
  *
  *
@@ -84,16 +84,16 @@
  *	precision: absolute error of R2/S2 is bounded by 2**-120.07
  *
  *	Else if inf > x >= 107
- *	   erf(x)  = 1 with inexact 
+ *	   erf(x)  = 1 with inexact
  *	   erfc(x) = 0 with underflow
- *	
+ *
  *	Special case:
  *	   erf(inf)  = 1
  *	   erfc(inf) = 0
  */
 
-#pragma weak erfl = __erfl
-#pragma weak erfcl = __erfcl
+#pragma weak __erfl = erfl
+#pragma weak __erfcl = erfcl
 
 #include "libm.h"
 #include "longdouble.h"
@@ -132,7 +132,7 @@
    8.069088733716068462496835658928566920933e-0021L,
 };
 
-/* 
+/*
  * Rational erf(x) = ((float)0.84506291151) + P1(x-1)/Q1(x-1) on [0.84375,1.25]
  */
 static long double C1   = (long double)((float)0.84506291151);
@@ -164,7 +164,7 @@
    4.753866999959432971956781228148402971454e-0006L,
   -1.002287602111660026053981728549540200683e-0006L,
 };
-/* 
+/*
  * Rational erf(x) = ((float)0.95478588343) + P2(x-1.5)/Q2(x-1.5)
  * on [1.25,1.75]
  */
@@ -274,7 +274,7 @@
    1.000L,
 };
 
-long double erfl(x) 
+long double erfl(x)
 long double x;
 {
 	long double erfcl(long double),s,y,t;
@@ -299,7 +299,7 @@
 	    s = y-onehalf;
 	    t = C2+__poly_libmq(s,12,P2)/(one+s*__poly_libmq(s,13,Q2));
 	    return (signbitl(x))? -t: t;
-	} 
+	}
 	if (y<=9.0L) t = erfcl(y); else t = tiny;
 	return (signbitl(x))? t-one: one-t;
 }
@@ -331,7 +331,7 @@
 	    s = x-onehalf;
 	    t = one-C2;
 	    return t - __poly_libmq(s,12,P2)/(one+s*__poly_libmq(s,13,Q2));
-	} 
+	}
 	if (x>=107.0L) return nearunfl*nearunfl;		/* underflow */
 	else if (x >= L16_3) {
 	    y = __poly_libmq(x,15,R2);
--- old/usr/src/lib/libm/common/LD/finitel.c	2014-11-25 12:57:05.388867481 -0500
+++ new/usr/src/lib/libm/common/LD/finitel.c	2014-11-25 12:57:05.400324696 -0500
@@ -27,10 +27,6 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak finitel = __finitel
-#endif
-
 #include "libm.h"
 
 #if defined(__sparc)
--- old/usr/src/lib/libm/common/LD/gammal.c	2014-11-25 12:57:05.782818242 -0500
+++ new/usr/src/lib/libm/common/LD/gammal.c	2014-11-25 12:57:05.794405212 -0500
@@ -27,14 +27,13 @@
  * Use is subject to license terms.
  */
 
-#pragma weak gammal = __gammal
+#pragma weak __gammal = gammal
 
 /*
  * long double gammal(long double x);
  */
 
 #include "libm.h"
-#include "libm_synonyms.h"
 #include "longdouble.h"
 
 extern int signgam;
--- old/usr/src/lib/libm/common/LD/gammal_r.c	2014-11-25 12:57:06.175996620 -0500
+++ new/usr/src/lib/libm/common/LD/gammal_r.c	2014-11-25 12:57:06.187530866 -0500
@@ -31,7 +31,7 @@
  * long double gammal_r(long double x, int *signgamlp);
  */
 
-#pragma weak gammal_r = __gammal_r
+#pragma weak __gammal_r = gammal_r
 
 #include "libm.h"
 #include "longdouble.h"
--- old/usr/src/lib/libm/common/LD/hypotl.c	2014-11-25 12:57:06.569162754 -0500
+++ new/usr/src/lib/libm/common/LD/hypotl.c	2014-11-25 12:57:06.580655558 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak hypotl = __hypotl
-#endif
+#pragma weak __hypotl = hypotl
 
 /*
  * hypotl(x,y)
--- old/usr/src/lib/libm/common/LD/isnanl.c	2014-11-25 12:57:06.994855694 -0500
+++ new/usr/src/lib/libm/common/LD/isnanl.c	2014-11-25 12:57:07.006276621 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak isnanl = __isnanl
-#endif
+#pragma weak __isnanl = isnanl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/LD/j0l.c	2014-11-25 12:57:07.392861904 -0500
+++ new/usr/src/lib/libm/common/LD/j0l.c	2014-11-25 12:57:07.404701295 -0500
@@ -36,11 +36,10 @@
  *	y0(-ve)=y1(-ve)=yn(n,-ve) are NaN with invalid signal.
  */
 
-#pragma weak j0l = __j0l
-#pragma weak y0l = __y0l
+#pragma weak __j0l = j0l
+#pragma weak __y0l = y0l
 
 #include "libm.h"
-#include "libm_synonyms.h"
 
 #include "longdouble.h"
 
--- old/usr/src/lib/libm/common/LD/j1l.c	2014-11-25 12:57:07.838255298 -0500
+++ new/usr/src/lib/libm/common/LD/j1l.c	2014-11-25 12:57:07.850147036 -0500
@@ -36,11 +36,10 @@
  *	y0(-ve)=y1(-ve)=yn(n,-ve) are NaN with invalid signal.
  */
 
-#pragma weak j1l = __j1l
-#pragma weak y1l = __y1l
+#pragma weak __j1l = j1l
+#pragma weak __y1l = y1l
 
 #include "libm.h"
-#include "libm_synonyms.h"
 #include "longdouble.h"
 #include <math.h>
 #if defined(__SUNPRO_C)
--- old/usr/src/lib/libm/common/LD/jnl.c	2014-11-25 12:57:08.286482904 -0500
+++ new/usr/src/lib/libm/common/LD/jnl.c	2014-11-25 12:57:08.298038131 -0500
@@ -27,10 +27,8 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak jnl = __jnl
-#pragma weak ynl = __ynl
-#endif
+#pragma weak __jnl = jnl
+#pragma weak __ynl = ynl
 
 /*
  * floating point Bessel's function of the 1st and 2nd kind
--- old/usr/src/lib/libm/common/LD/lgammal.c	2014-11-25 12:57:08.694706758 -0500
+++ new/usr/src/lib/libm/common/LD/lgammal.c	2014-11-25 12:57:08.706107193 -0500
@@ -27,14 +27,13 @@
  * Use is subject to license terms.
  */
 
-#pragma weak lgammal = __lgammal
+#pragma weak __lgammal = lgammal
 
 /*
  * long double lgammal(long double x);
  */
 
 #include "libm.h"
-#include "libm_synonyms.h"
 #include "longdouble.h"
 
 extern int signgam;
--- old/usr/src/lib/libm/common/LD/lgammal_r.c	2014-11-25 12:57:09.091286043 -0500
+++ new/usr/src/lib/libm/common/LD/lgammal_r.c	2014-11-25 12:57:09.102854291 -0500
@@ -31,7 +31,7 @@
  * long double lgammal_r(long double x, int *signgamlp);
  */
 
-#pragma weak lgammal_r = __lgammal_r
+#pragma weak __lgammal_r = lgammal_r
 
 #include "libm.h"
 #include "longdouble.h"
--- old/usr/src/lib/libm/common/LD/log1pl.c	2014-11-25 12:57:09.591576785 -0500
+++ new/usr/src/lib/libm/common/LD/log1pl.c	2014-11-25 12:57:09.603025818 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak log1pl = __log1pl
-#endif
+#pragma weak __log1pl = log1pl
 
 /*
  * log1pl(x)
--- old/usr/src/lib/libm/common/LD/logbl.c	2014-11-25 12:57:10.164818427 -0500
+++ new/usr/src/lib/libm/common/LD/logbl.c	2014-11-25 12:57:10.176244091 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak logbl = __logbl
-#endif
+#pragma weak __logbl = logbl
 
 #include "libm.h"
 #include "xpg6.h"	/* __xpg6 */
--- old/usr/src/lib/libm/common/LD/nextafterl.c	2014-11-25 12:57:10.566690136 -0500
+++ new/usr/src/lib/libm/common/LD/nextafterl.c	2014-11-25 12:57:10.578102165 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak nextafterl = __nextafterl
-#endif
+#pragma weak __nextafterl = nextafterl
 
 #include "libm.h"
 #include <float.h>		/* LDBL_MAX, LDBL_MIN */
--- old/usr/src/lib/libm/common/LD/scalbl.c	2014-11-25 12:57:10.964482535 -0500
+++ new/usr/src/lib/libm/common/LD/scalbl.c	2014-11-25 12:57:10.976008180 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak scalbl = __scalbl
+#pragma weak __scalbl = scalbl
 
 /*
  * scalbl(x,n): return x * 2**n by manipulating exponent.
--- old/usr/src/lib/libm/common/LD/signgaml.c	2014-11-25 12:57:11.365248434 -0500
+++ new/usr/src/lib/libm/common/LD/signgaml.c	2014-11-25 12:57:11.376789424 -0500
@@ -27,10 +27,9 @@
  * Use is subject to license terms.
  */
 
-#pragma weak signgaml = __signgaml
+#pragma weak __signgaml = signgaml
 
 #include "libm.h"
-#include "libm_synonyms.h"
 #include "longdouble.h"
 
 int signgaml = 0;
--- old/usr/src/lib/libm/common/LD/significandl.c	2014-11-25 12:57:11.756396672 -0500
+++ new/usr/src/lib/libm/common/LD/significandl.c	2014-11-25 12:57:11.769359086 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak significandl = __significandl
-#endif
+#pragma weak __significandl = significandl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/LD/sincosl.c	2014-11-25 12:57:12.150897147 -0500
+++ new/usr/src/lib/libm/common/LD/sincosl.c	2014-11-25 12:57:12.162245102 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak sincosl = __sincosl
+#pragma weak __sincosl = sincosl
 
 /* INDENT OFF */
 /* cosl(x)
@@ -62,7 +62,6 @@
 /* INDENT ON */
 
 #include "libm.h"
-#include "libm_synonyms.h"
 #include "longdouble.h"
 
 #include <sys/isa_defs.h>
--- old/usr/src/lib/libm/common/LD/sincospil.c	2014-11-25 12:57:12.548355650 -0500
+++ new/usr/src/lib/libm/common/LD/sincospil.c	2014-11-25 12:57:12.559794143 -0500
@@ -27,8 +27,6 @@
  * Use is subject to license terms.
  */
 
-#pragma weak sincospil = __sincospil
-
 /*
  * void sincospil(long double x, long double *s, long double *c)
  * *s = sinl(pi*x); *c = cosl(pi*x);
@@ -71,7 +69,6 @@
  */
 
 #include "libm.h"
-#include "libm_synonyms.h"
 #include "longdouble.h"
 
 #include <sys/isa_defs.h>
--- old/usr/src/lib/libm/common/LD/sinhl.c	2014-11-25 12:57:12.982866625 -0500
+++ new/usr/src/lib/libm/common/LD/sinhl.c	2014-11-25 12:57:12.994269297 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak sinhl = __sinhl
+#pragma weak __sinhl = sinhl
 
 #include "libm.h"
 #include "longdouble.h"
@@ -37,14 +37,14 @@
  *
  * Method :
  *	1. reduce x to non-negative by SINH(-x) = - SINH(x).
- *	2. 
+ *	2.
  *
  *	                                      EXPM1(x) + EXPM1(x)/(EXPM1(x)+1)
  *	    0 <= x <= lnovft     : SINH(x) := --------------------------------
  *			       		                      2
  *
  *     lnovft <= x <  INF	 : SINH(x) := EXP(x-MEP1*ln2)*2**ME
- *	
+ *
  * here
  *	lnovft		logarithm of the overflow threshold
  *			= MEP1*ln2 chopped to machine precision.
--- old/usr/src/lib/libm/common/LD/sinl.c	2014-11-25 12:57:13.388012377 -0500
+++ new/usr/src/lib/libm/common/LD/sinl.c	2014-11-25 12:57:13.399508965 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak sinl = __sinl
+#pragma weak __sinl = sinl
 
 /* INDENT OFF */
 /* sinl(x)
@@ -63,7 +63,6 @@
 /* INDENT ON */
 
 #include "libm.h"
-#include "libm_synonyms.h"
 #include "longdouble.h"
 
 #include <sys/isa_defs.h>
--- old/usr/src/lib/libm/common/LD/sinpil.c	2014-11-25 12:57:13.786113963 -0500
+++ new/usr/src/lib/libm/common/LD/sinpil.c	2014-11-25 12:57:13.797552293 -0500
@@ -27,8 +27,6 @@
  * Use is subject to license terms.
  */
 
-#pragma weak sinpil = __sinpil
-
 /* long double sinpil(long double x),
  * return long double precision sinl(pi*x).
  *
@@ -70,7 +68,6 @@
  */
 
 #include "libm.h"
-#include "libm_synonyms.h"
 #include "longdouble.h"
 
 #include <sys/isa_defs.h>
--- old/usr/src/lib/libm/common/LD/tanhl.c	2014-11-25 12:57:14.243515958 -0500
+++ new/usr/src/lib/libm/common/LD/tanhl.c	2014-11-25 12:57:14.270240353 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak tanhl = __tanhl
-#endif
+#pragma weak __tanhl = tanhl
 
 /*
  * tanhl(x) returns the hyperbolic tangent of x
--- old/usr/src/lib/libm/common/LD/tanl.c	2014-11-25 12:57:15.005418826 -0500
+++ new/usr/src/lib/libm/common/LD/tanl.c	2014-11-25 12:57:15.026509521 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak tanl = __tanl
+#pragma weak __tanl = tanl
 
 /* INDENT OFF */
 /* cosl(x)
@@ -62,7 +62,6 @@
 /* INDENT ON */
 
 #include "libm.h"
-#include "libm_synonyms.h"
 #include "longdouble.h"
 
 #include <sys/isa_defs.h>
--- old/usr/src/lib/libm/common/Q/acoshl.c	2014-11-25 12:57:15.478077536 -0500
+++ new/usr/src/lib/libm/common/Q/acoshl.c	2014-11-25 12:57:15.489869264 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak acoshl = __acoshl
-#endif
+#pragma weak __acoshl = acoshl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/Q/acosl.c	2014-11-25 12:57:16.011905488 -0500
+++ new/usr/src/lib/libm/common/Q/acosl.c	2014-11-25 12:57:16.023452448 -0500
@@ -44,7 +44,7 @@
  *	if |x|>1, return NaN with invalid signal.
  */
 
-#pragma weak acosl = __acosl
+#pragma weak __acosl = acosl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/Q/asinhl.c	2014-11-25 12:57:16.416684920 -0500
+++ new/usr/src/lib/libm/common/Q/asinhl.c	2014-11-25 12:57:16.428081183 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak asinhl = __asinhl
-#endif
+#pragma weak __asinhl = asinhl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/Q/asinl.c	2014-11-25 12:57:16.812478200 -0500
+++ new/usr/src/lib/libm/common/Q/asinl.c	2014-11-25 12:57:16.823970207 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak asinl = __asinl
-#endif
+#pragma weak __asinl = asinl
 
 /*
  *	asinl(x) = atan2l(x,sqrt(1-x*x));
--- old/usr/src/lib/libm/common/Q/atan2l.c	2014-11-25 12:57:17.210157011 -0500
+++ new/usr/src/lib/libm/common/Q/atan2l.c	2014-11-25 12:57:17.221651450 -0500
@@ -56,7 +56,7 @@
  * shown.
  */
 
-#pragma weak atan2l = __atan2l
+#pragma weak __atan2l = atan2l
 
 #include "libm.h"
 #include "longdouble.h"
--- old/usr/src/lib/libm/common/Q/atan2pil.c	2014-11-25 12:57:17.612699791 -0500
+++ new/usr/src/lib/libm/common/Q/atan2pil.c	2014-11-25 12:57:17.624212844 -0500
@@ -27,8 +27,6 @@
  * Use is subject to license terms.
  */
 
-#pragma weak atan2pil = __atan2pil
-
 #include "libm.h"
 
 /*
--- old/usr/src/lib/libm/common/Q/atanhl.c	2014-11-25 12:57:18.005031508 -0500
+++ new/usr/src/lib/libm/common/Q/atanhl.c	2014-11-25 12:57:18.019792029 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak atanhl = __atanhl
+#pragma weak __atanhl = atanhl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/Q/atanl.c	2014-11-25 12:57:18.444785188 -0500
+++ new/usr/src/lib/libm/common/Q/atanl.c	2014-11-25 12:57:18.456403849 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak atanl = __atanl
+#pragma weak __atanl = atanl
 
 /*
  * atanl(x)
--- old/usr/src/lib/libm/common/Q/cbrtl.c	2014-11-25 12:57:18.908610671 -0500
+++ new/usr/src/lib/libm/common/Q/cbrtl.c	2014-11-25 12:57:18.920037619 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak cbrtl = __cbrtl
+#pragma weak __cbrtl = cbrtl
 
 #include "libm.h"
 #include "longdouble.h"
--- old/usr/src/lib/libm/common/Q/copysignl.c	2014-11-25 12:57:19.733302061 -0500
+++ new/usr/src/lib/libm/common/Q/copysignl.c	2014-11-25 12:57:19.748001837 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak copysignl = __copysignl
-#endif
+#pragma weak __copysignl = copysignl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/Q/coshl.c	2014-11-25 12:57:20.899975501 -0500
+++ new/usr/src/lib/libm/common/Q/coshl.c	2014-11-25 12:57:20.911442754 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak coshl = __coshl
+#pragma weak __coshl = coshl
 
 #include "libm.h"
 #include "longdouble.h"
--- old/usr/src/lib/libm/common/Q/cosl.c	2014-11-25 12:57:21.305764928 -0500
+++ new/usr/src/lib/libm/common/Q/cosl.c	2014-11-25 12:57:21.317280718 -0500
@@ -59,7 +59,7 @@
  *	computer TRIG(x) returns trig(x) nearly rounded.
  */
 
-#pragma weak cosl = __cosl
+#pragma weak __cosl = cosl
 
 #include "libm.h"
 #include "longdouble.h"
--- old/usr/src/lib/libm/common/Q/erfl.c	2014-11-25 12:57:21.724570351 -0500
+++ new/usr/src/lib/libm/common/Q/erfl.c	2014-11-25 12:57:21.736278047 -0500
@@ -93,8 +93,8 @@
  *	   erfc(inf) = 0
  */
 
-#pragma weak erfl = __erfl
-#pragma weak erfcl = __erfcl
+#pragma weak __erfl = erfl
+#pragma weak __erfcl = erfcl
 
 #include "libm.h"
 #include "longdouble.h"
--- old/usr/src/lib/libm/common/Q/exp10l.c	2014-11-25 12:57:22.171820128 -0500
+++ new/usr/src/lib/libm/common/Q/exp10l.c	2014-11-25 12:57:22.183342344 -0500
@@ -27,8 +27,6 @@
  * Use is subject to license terms.
  */
 
-#pragma weak exp10l = __exp10l
-
 #include "libm.h"
 #include "longdouble.h"
 
--- old/usr/src/lib/libm/common/Q/exp2l.c	2014-11-25 12:57:22.577142062 -0500
+++ new/usr/src/lib/libm/common/Q/exp2l.c	2014-11-25 12:57:22.589301629 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak exp2l = __exp2l
+#pragma weak __exp2l = exp2l
 
 #include "libm.h"
 #include "longdouble.h"
--- old/usr/src/lib/libm/common/Q/expl.c	2014-11-25 12:57:22.974638129 -0500
+++ new/usr/src/lib/libm/common/Q/expl.c	2014-11-25 12:57:22.986102288 -0500
@@ -67,7 +67,7 @@
  * hexadecimal values.
  */
 
-#pragma weak expl = __expl
+#pragma weak __expl = expl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/Q/expm1l.c	2014-11-25 12:57:23.397327870 -0500
+++ new/usr/src/lib/libm/common/Q/expm1l.c	2014-11-25 12:57:23.408840771 -0500
@@ -27,9 +27,8 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak expm1l = __expm1l
-#endif
+#pragma weak __expm1l = expm1l
+
 #if !defined(__sparc)
 #error Unsupported architecture
 #endif
--- old/usr/src/lib/libm/common/Q/fabsl.c	2014-11-25 12:57:23.802353531 -0500
+++ new/usr/src/lib/libm/common/Q/fabsl.c	2014-11-25 12:57:23.814058558 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak fabsl = __fabsl
+#pragma weak __fabsl = fabsl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/Q/finitel.c	2014-11-25 12:57:24.219758466 -0500
+++ new/usr/src/lib/libm/common/Q/finitel.c	2014-11-25 12:57:24.235834203 -0500
@@ -27,10 +27,6 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak finitel = __finitel
-#endif
-
 #include "libm.h"
 
 #if defined(__sparc)
--- old/usr/src/lib/libm/common/Q/floorl.c	2014-11-25 12:57:24.675099536 -0500
+++ new/usr/src/lib/libm/common/Q/floorl.c	2014-11-25 12:57:24.686564864 -0500
@@ -35,8 +35,8 @@
  * with the same sign as x's,  including 0.0.
  */
 
-#pragma weak ceill = __ceill
-#pragma weak floorl = __floorl
+#pragma weak __ceill = ceill
+#pragma weak __floorl = floorl
 
 #include "libm.h"
 #include "longdouble.h"
--- old/usr/src/lib/libm/common/Q/fmodl.c	2014-11-25 12:57:25.092859054 -0500
+++ new/usr/src/lib/libm/common/Q/fmodl.c	2014-11-25 12:57:25.104174143 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak fmodl = __fmodl
+#pragma weak __fmodl = fmodl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/Q/gammal.c	2014-11-25 12:57:25.514774067 -0500
+++ new/usr/src/lib/libm/common/Q/gammal.c	2014-11-25 12:57:25.526284922 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak gammal = __gammal
+#pragma weak __gammal = gammal
 
 /*
  * long double gammal(long double x);
--- old/usr/src/lib/libm/common/Q/gammal_r.c	2014-11-25 12:57:25.926272398 -0500
+++ new/usr/src/lib/libm/common/Q/gammal_r.c	2014-11-25 12:57:25.938224801 -0500
@@ -31,7 +31,7 @@
  * long double gammal_r(long double x, int *signgamlp);
  */
 
-#pragma weak gammal_r = __gammal_r
+#pragma weak __gammal_r = gammal_r
 
 #include "libm.h"
 #include "longdouble.h"
--- old/usr/src/lib/libm/common/Q/hypotl.c	2014-11-25 12:57:26.348421184 -0500
+++ new/usr/src/lib/libm/common/Q/hypotl.c	2014-11-25 12:57:26.359877156 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak hypotl = __hypotl
+#pragma weak __hypotl = hypotl
 
 /*
  * long double hypotl(long double x, long double y);
--- old/usr/src/lib/libm/common/Q/ieee_funcl.c	2014-11-25 12:57:26.778741793 -0500
+++ new/usr/src/lib/libm/common/Q/ieee_funcl.c	2014-11-25 12:57:26.790457934 -0500
@@ -27,14 +27,6 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak isinfl = __isinfl
-#pragma weak isnormall = __isnormall
-#pragma weak issubnormall = __issubnormall
-#pragma weak iszerol = __iszerol
-#pragma weak signbitl = __signbitl
-#endif
-
 #include "libm.h"
 
 #if defined(__sparc)
--- old/usr/src/lib/libm/common/Q/ilogbl.c	2014-11-25 12:57:27.181850563 -0500
+++ new/usr/src/lib/libm/common/Q/ilogbl.c	2014-11-25 12:57:27.193177878 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak ilogbl = __ilogbl
-#endif
+#pragma weak __ilogbl = ilogbl
 
 #include "libm.h"
 #include "xpg6.h"	/* __xpg6 */
--- old/usr/src/lib/libm/common/Q/isnanl.c	2014-11-25 12:57:27.580595351 -0500
+++ new/usr/src/lib/libm/common/Q/isnanl.c	2014-11-25 12:57:27.592673940 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak isnanl = __isnanl
-#endif
+#pragma weak __isnanl = isnanl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/Q/j0l.c	2014-11-25 12:57:28.012604382 -0500
+++ new/usr/src/lib/libm/common/Q/j0l.c	2014-11-25 12:57:28.024380712 -0500
@@ -36,8 +36,8 @@
  *	y0(-ve)=y1(-ve)=yn(n,-ve) are NaN with invalid signal.
  */
 
-#pragma weak j0l = __j0l
-#pragma weak y0l = __y0l
+#pragma weak __j0l = j0l
+#pragma weak __y0l = y0l
 
 #include "libm.h"
 #include "longdouble.h"
--- old/usr/src/lib/libm/common/Q/j1l.c	2014-11-25 12:57:28.459164678 -0500
+++ new/usr/src/lib/libm/common/Q/j1l.c	2014-11-25 12:57:28.470734979 -0500
@@ -36,8 +36,8 @@
  *	y0(-ve)=y1(-ve)=yn(n,-ve) are NaN with invalid signal.
  */
 
-#pragma weak j1l = __j1l
-#pragma weak y1l = __y1l
+#pragma weak __j1l = j1l
+#pragma weak __y1l = y1l
 
 #include "libm.h"
 #include "longdouble.h"
--- old/usr/src/lib/libm/common/Q/jnl.c	2014-11-25 12:57:28.905994847 -0500
+++ new/usr/src/lib/libm/common/Q/jnl.c	2014-11-25 12:57:28.917583194 -0500
@@ -27,10 +27,8 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak jnl = __jnl
-#pragma weak ynl = __ynl
-#endif
+#pragma weak __jnl = jnl
+#pragma weak __ynl = ynl
 
 /*
  * floating point Bessel's function of the 1st and 2nd kind
--- old/usr/src/lib/libm/common/Q/lgammal.c	2014-11-25 12:57:29.503756108 -0500
+++ new/usr/src/lib/libm/common/Q/lgammal.c	2014-11-25 12:57:29.521814851 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak lgammal = __lgammal
+#pragma weak __lgammal = lgammal
 
 /*
  * long double lgammal(long double x);
--- old/usr/src/lib/libm/common/Q/lgammal_r.c	2014-11-25 12:57:29.968049153 -0500
+++ new/usr/src/lib/libm/common/Q/lgammal_r.c	2014-11-25 12:57:29.979583932 -0500
@@ -31,7 +31,7 @@
  * long double lgammal_r(long double x, int *signgamlp);
  */
 
-#pragma weak lgammal_r = __lgammal_r
+#pragma weak __lgammal_r = lgammal_r
 
 #include "libm.h"
 #include "longdouble.h"
--- old/usr/src/lib/libm/common/Q/log10l.c	2014-11-25 12:57:30.374957772 -0500
+++ new/usr/src/lib/libm/common/Q/log10l.c	2014-11-25 12:57:30.386663439 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak log10l = __log10l
-#endif
+#pragma weak __log10l = log10l
 
 /*
  * log10l(X)
--- old/usr/src/lib/libm/common/Q/log1pl.c	2014-11-25 12:57:30.838748629 -0500
+++ new/usr/src/lib/libm/common/Q/log1pl.c	2014-11-25 12:57:30.850364169 -0500
@@ -109,7 +109,7 @@
  * shown.
  */
 
-#pragma weak log1pl = __log1pl
+#pragma weak __log1pl = log1pl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/Q/log2l.c	2014-11-25 12:57:31.273405523 -0500
+++ new/usr/src/lib/libm/common/Q/log2l.c	2014-11-25 12:57:31.284951910 -0500
@@ -39,7 +39,7 @@
  *	LOG2(x) = n + (1/ln2)*log(x)
  */
 
-#pragma weak log2l = __log2l
+#pragma weak __log2l = log2l
 
 #include "libm.h"
 #include "longdouble.h"
--- old/usr/src/lib/libm/common/Q/logbl.c	2014-11-25 12:57:31.692338012 -0500
+++ new/usr/src/lib/libm/common/Q/logbl.c	2014-11-25 12:57:31.704030686 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak logbl = __logbl
-#endif
+#pragma weak __logbl = logbl
 
 #include "libm.h"
 #include "xpg6.h"	/* __xpg6 */
--- old/usr/src/lib/libm/common/Q/logl.c	2014-11-25 12:57:32.111745385 -0500
+++ new/usr/src/lib/libm/common/Q/logl.c	2014-11-25 12:57:32.123176802 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak logl = __logl
+#pragma weak __logl = logl
 
 /*
  * logl(x)
--- old/usr/src/lib/libm/common/Q/nextafterl.c	2014-11-25 12:57:32.520669343 -0500
+++ new/usr/src/lib/libm/common/Q/nextafterl.c	2014-11-25 12:57:32.532070253 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak nextafterl = __nextafterl
-#endif
+#pragma weak __nextafterl = nextafterl
 
 #include "libm.h"
 #include <float.h>		/* LDBL_MAX, LDBL_MIN */
--- old/usr/src/lib/libm/common/Q/powl.c	2014-11-25 12:57:32.940075638 -0500
+++ new/usr/src/lib/libm/common/Q/powl.c	2014-11-25 12:57:32.951753092 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak powl = __powl
-#endif
+#pragma weak __powl = powl
 
 #include "libm.h"
 #include "xpg6.h"	/* __xpg6 */
--- old/usr/src/lib/libm/common/Q/remainderl.c	2014-11-25 12:57:33.376309034 -0500
+++ new/usr/src/lib/libm/common/Q/remainderl.c	2014-11-25 12:57:33.387877964 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak remainderl = __remainderl
+#pragma weak __remainderl = remainderl
 
 #include "libm.h"
 #include "longdouble.h"
--- old/usr/src/lib/libm/common/Q/rintl.c	2014-11-25 12:57:33.811376904 -0500
+++ new/usr/src/lib/libm/common/Q/rintl.c	2014-11-25 12:57:33.822951986 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak rintl = __rintl
+#pragma weak __rintl = rintl
 
 /*
  * rintl(long double x) return x rounded to integral according to
--- old/usr/src/lib/libm/common/Q/rndintl.c	2014-11-25 12:57:34.528082955 -0500
+++ new/usr/src/lib/libm/common/Q/rndintl.c	2014-11-25 12:57:34.554293206 -0500
@@ -26,11 +26,6 @@
  * Use is subject to license terms.
  */
 
-#pragma weak aintl = __aintl
-#pragma weak anintl = __anintl
-#pragma weak irintl = __irintl
-#pragma weak nintl = __nintl
-
 /*
  * aintl(x)	return x chopped to integral value
  * anintl(x)	return sign(x)*(|x|+0.5) chopped to integral value
--- old/usr/src/lib/libm/common/Q/scalbl.c	2014-11-25 12:57:35.406205641 -0500
+++ new/usr/src/lib/libm/common/Q/scalbl.c	2014-11-25 12:57:35.432137717 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak scalbl = __scalbl
+#pragma weak __scalbl = scalbl
 
 /*
  * scalbl(x,n): return x * 2^n by manipulating exponent.
--- old/usr/src/lib/libm/common/Q/scalbnl.c	2014-11-25 12:57:35.817573516 -0500
+++ new/usr/src/lib/libm/common/Q/scalbnl.c	2014-11-25 12:57:35.829096338 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak scalbnl = __scalbnl
-#endif
+#pragma weak __scalbnl = scalbnl
 
 #include "libm.h"
 #include <float.h>		/* LDBL_MAX, LDBL_MIN */
--- old/usr/src/lib/libm/common/Q/signgaml.c	2014-11-25 12:57:36.216470823 -0500
+++ new/usr/src/lib/libm/common/Q/signgaml.c	2014-11-25 12:57:36.228389904 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak signgaml = __signgaml
+#pragma weak __signgaml = signgaml
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/Q/significandl.c	2014-11-25 12:57:36.612906920 -0500
+++ new/usr/src/lib/libm/common/Q/significandl.c	2014-11-25 12:57:36.624616069 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak significandl = __significandl
-#endif
+#pragma weak __significandl = significandl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/Q/sincosl.c	2014-11-25 12:57:37.040669186 -0500
+++ new/usr/src/lib/libm/common/Q/sincosl.c	2014-11-25 12:57:37.052013083 -0500
@@ -58,7 +58,7 @@
  *	computer TRIG(x) returns trig(x) nearly rounded.
  */
 
-#pragma weak sincosl = __sincosl
+#pragma weak __sincosl = sincosl
 
 #include "libm.h"
 #include "longdouble.h"
--- old/usr/src/lib/libm/common/Q/sincospil.c	2014-11-25 12:57:37.440365564 -0500
+++ new/usr/src/lib/libm/common/Q/sincospil.c	2014-11-25 12:57:37.451652861 -0500
@@ -27,8 +27,6 @@
  * Use is subject to license terms.
  */
 
-#pragma weak sincospil = __sincospil
-
 /*
  * void sincospil(long double x, long double *s, long double *c)
  * *s = sinl(pi*x); *c = cosl(pi*x);
--- old/usr/src/lib/libm/common/Q/sinhl.c	2014-11-25 12:57:37.845747450 -0500
+++ new/usr/src/lib/libm/common/Q/sinhl.c	2014-11-25 12:57:37.857038289 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak sinhl = __sinhl
+#pragma weak __sinhl = sinhl
 
 #include "libm.h"
 #include "longdouble.h"
--- old/usr/src/lib/libm/common/Q/sinl.c	2014-11-25 12:57:38.263181159 -0500
+++ new/usr/src/lib/libm/common/Q/sinl.c	2014-11-25 12:57:38.274598601 -0500
@@ -59,7 +59,7 @@
  *	computer TRIG(x) returns trig(x) nearly rounded.
  */
 
-#pragma weak sinl = __sinl
+#pragma weak __sinl = sinl
 
 #include "libm.h"
 #include "longdouble.h"
--- old/usr/src/lib/libm/common/Q/sinpil.c	2014-11-25 12:57:38.672497513 -0500
+++ new/usr/src/lib/libm/common/Q/sinpil.c	2014-11-25 12:57:38.683915087 -0500
@@ -27,8 +27,6 @@
  * Use is subject to license terms.
  */
 
-#pragma weak sinpil = __sinpil
-
 /*
  * long double sinpil(long double x),
  * return long double precision sinl(pi*x).
--- old/usr/src/lib/libm/common/Q/sqrtl.c	2014-11-25 12:57:39.100506424 -0500
+++ new/usr/src/lib/libm/common/Q/sqrtl.c	2014-11-25 12:57:39.112061967 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak sqrtl = __sqrtl
+#pragma weak __sqrtl = sqrtl
 
 #include "libm.h"
 #include "longdouble.h"
--- old/usr/src/lib/libm/common/Q/tanhl.c	2014-11-25 12:57:39.785476882 -0500
+++ new/usr/src/lib/libm/common/Q/tanhl.c	2014-11-25 12:57:39.797149249 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak tanhl = __tanhl
-#endif
+#pragma weak __tanhl = tanhl
 
 /*
  * tanhl(x) returns the hyperbolic tangent of x
--- old/usr/src/lib/libm/common/Q/tanl.c	2014-11-25 12:57:40.193031177 -0500
+++ new/usr/src/lib/libm/common/Q/tanl.c	2014-11-25 12:57:40.204417713 -0500
@@ -58,7 +58,7 @@
  *	computer TRIG(x) returns trig(x) nearly rounded.
  */
 
-#pragma weak tanl = __tanl
+#pragma weak __tanl = tanl
 
 #include "libm.h"
 #include "longdouble.h"
--- old/usr/src/lib/libm/common/R/acosf.c	2014-11-25 12:57:40.604231737 -0500
+++ new/usr/src/lib/libm/common/R/acosf.c	2014-11-25 12:57:40.615781056 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak acosf = __acosf
+#pragma weak __acosf = acosf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/acoshf.c	2014-11-25 12:57:40.999073342 -0500
+++ new/usr/src/lib/libm/common/R/acoshf.c	2014-11-25 12:57:41.013773448 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak acoshf = __acoshf
+#pragma weak __acoshf = acoshf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/asinf.c	2014-11-25 12:57:41.397423341 -0500
+++ new/usr/src/lib/libm/common/R/asinf.c	2014-11-25 12:57:41.409322265 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak asinf = __asinf
+#pragma weak __asinf = asinf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/asinhf.c	2014-11-25 12:57:41.797703548 -0500
+++ new/usr/src/lib/libm/common/R/asinhf.c	2014-11-25 12:57:41.809116949 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak asinhf = __asinhf
+#pragma weak __asinhf = asinhf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/atan2f.c	2014-11-25 12:57:42.195356347 -0500
+++ new/usr/src/lib/libm/common/R/atan2f.c	2014-11-25 12:57:42.206776924 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak atan2f = __atan2f
+#pragma weak __atan2f = atan2f
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/atan2pif.c	2014-11-25 12:57:42.635312514 -0500
+++ new/usr/src/lib/libm/common/R/atan2pif.c	2014-11-25 12:57:42.659102353 -0500
@@ -26,8 +26,6 @@
  * Use is subject to license terms.
  */
 
-#pragma weak atan2pif = __atan2pif
-
 #include "libm.h"
 
 static const double invpi = 0.3183098861837906715377675;
--- old/usr/src/lib/libm/common/R/atanf.c	2014-11-25 12:57:43.101439104 -0500
+++ new/usr/src/lib/libm/common/R/atanf.c	2014-11-25 12:57:43.112943144 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak atanf = __atanf
+#pragma weak __atanf = atanf
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/R/atanhf.c	2014-11-25 12:57:43.508889908 -0500
+++ new/usr/src/lib/libm/common/R/atanhf.c	2014-11-25 12:57:43.520329369 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak atanhf = __atanhf
+#pragma weak __atanhf = atanhf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/besself.c	2014-11-25 12:57:43.905334613 -0500
+++ new/usr/src/lib/libm/common/R/besself.c	2014-11-25 12:57:43.916969918 -0500
@@ -26,12 +26,12 @@
  * Use is subject to license terms.
  */
 
-#pragma weak j0f = __j0f
-#pragma weak j1f = __j1f
-#pragma weak jnf = __jnf
-#pragma weak y0f = __y0f
-#pragma weak y1f = __y1f
-#pragma weak ynf = __ynf
+#pragma weak __j0f = j0f
+#pragma weak __j1f = j1f
+#pragma weak __jnf = jnf
+#pragma weak __y0f = y0f
+#pragma weak __y1f = y1f
+#pragma weak __ynf = ynf
 
 #include "libm.h"
 #include <float.h>
--- old/usr/src/lib/libm/common/R/cbrtf.c	2014-11-25 12:57:44.670561570 -0500
+++ new/usr/src/lib/libm/common/R/cbrtf.c	2014-11-25 12:57:45.149524600 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak cbrtf = __cbrtf
+#pragma weak __cbrtf = cbrtf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/copysignf.c	2014-11-25 12:57:45.544754773 -0500
+++ new/usr/src/lib/libm/common/R/copysignf.c	2014-11-25 12:57:45.556242348 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak copysignf = __copysignf
-#endif
+#pragma weak __copysignf = copysignf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/cosf.c	2014-11-25 12:57:45.972603815 -0500
+++ new/usr/src/lib/libm/common/R/cosf.c	2014-11-25 12:57:45.984256783 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak cosf = __cosf
+#pragma weak __cosf = cosf
 
 /*
  * See sincosf.c
--- old/usr/src/lib/libm/common/R/coshf.c	2014-11-25 12:57:46.380015853 -0500
+++ new/usr/src/lib/libm/common/R/coshf.c	2014-11-25 12:57:46.391596069 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak coshf = __coshf
+#pragma weak __coshf = coshf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/erff.c	2014-11-25 12:57:46.778086325 -0500
+++ new/usr/src/lib/libm/common/R/erff.c	2014-11-25 12:57:46.789663035 -0500
@@ -26,8 +26,8 @@
  * Use is subject to license terms.
  */
 
-#pragma weak erff = __erff
-#pragma weak erfcf = __erfcf
+#pragma weak __erff = erff
+#pragma weak __erfcf = erfcf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/exp10f.c	2014-11-25 12:57:47.211358619 -0500
+++ new/usr/src/lib/libm/common/R/exp10f.c	2014-11-25 12:57:47.222706251 -0500
@@ -27,8 +27,6 @@
  * Use is subject to license terms.
  */
 
-#pragma weak exp10f = __exp10f
-
 #include "libm.h"
 
 extern double exp10(double);
--- old/usr/src/lib/libm/common/R/exp2f.c	2014-11-25 12:57:47.619590730 -0500
+++ new/usr/src/lib/libm/common/R/exp2f.c	2014-11-25 12:57:47.631183976 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak exp2f = __exp2f
+#pragma weak __exp2f = exp2f
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/expf.c	2014-11-25 12:57:48.019248716 -0500
+++ new/usr/src/lib/libm/common/R/expf.c	2014-11-25 12:57:48.030759007 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak expf = __expf
+#pragma weak __expf = expf
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/R/expm1f.c	2014-11-25 12:57:48.442108757 -0500
+++ new/usr/src/lib/libm/common/R/expm1f.c	2014-11-25 12:57:48.453584684 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak expm1f = __expm1f
+#pragma weak __expm1f = expm1f
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/fabsf.c	2014-11-25 12:57:48.858285307 -0500
+++ new/usr/src/lib/libm/common/R/fabsf.c	2014-11-25 12:57:48.869548943 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak fabsf = __fabsf
+#pragma weak __fabsf = fabsf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/floorf.c	2014-11-25 12:57:49.330596376 -0500
+++ new/usr/src/lib/libm/common/R/floorf.c	2014-11-25 12:57:49.342082133 -0500
@@ -27,8 +27,8 @@
  * Use is subject to license terms.
  */
 
-#pragma weak ceilf = __ceilf
-#pragma weak floorf = __floorf
+#pragma weak __ceilf = ceilf
+#pragma weak __floorf = floorf
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/R/fmodf.c	2014-11-25 12:57:49.895225843 -0500
+++ new/usr/src/lib/libm/common/R/fmodf.c	2014-11-25 12:57:49.907126200 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak fmodf = __fmodf
+#pragma weak __fmodf = fmodf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/gammaf.c	2014-11-25 12:57:50.424938731 -0500
+++ new/usr/src/lib/libm/common/R/gammaf.c	2014-11-25 12:57:50.436868472 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak gammaf = __gammaf
+#pragma weak __gammaf = gammaf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/gammaf_r.c	2014-11-25 12:57:50.832565723 -0500
+++ new/usr/src/lib/libm/common/R/gammaf_r.c	2014-11-25 12:57:50.844294681 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak gammaf_r = __gammaf_r
+#pragma weak __gammaf_r = gammaf_r
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/hypotf.c	2014-11-25 12:57:51.228954131 -0500
+++ new/usr/src/lib/libm/common/R/hypotf.c	2014-11-25 12:57:51.240491740 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak hypotf = __hypotf
+#pragma weak __hypotf = hypotf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/ilogbf.c	2014-11-25 12:57:51.627572130 -0500
+++ new/usr/src/lib/libm/common/R/ilogbf.c	2014-11-25 12:57:51.639248715 -0500
@@ -27,14 +27,12 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak ilogbf = __ilogbf
-#endif
+#pragma weak __ilogbf = ilogbf
 
 #include "libm.h"
 #include "xpg6.h"	/* __xpg6 */
 
-#if defined(USE_FPSCALE) || defined(__x86)
+#if defined(__x86)
 static const float two25 = 33554432.0F;
 #else
 /*
@@ -53,7 +51,7 @@
 	v <<= 1;
 	return (r + ((0xffffaa50 >> v) & 0x3));
 }
-#endif	/* defined(USE_FPSCALE) */
+#endif	/* defined(__x86) */
 
 static int
 raise_invalid(int v) {	/* SUSv3 requires ilogbf(0,+/-Inf,NaN) raise invalid */
@@ -76,7 +74,7 @@
 		if (k == 0)
 			return (raise_invalid(0x80000001));
 		else {
-#if defined(USE_FPSCALE) || defined(__x86)
+#if defined(__x86)
 			x *= two25;
 			return (((*((int *) &x) & 0x7f800000) >> 23) - 152);
 #else
--- old/usr/src/lib/libm/common/R/isnanf.c	2014-11-25 12:57:52.067187970 -0500
+++ new/usr/src/lib/libm/common/R/isnanf.c	2014-11-25 12:57:52.078616657 -0500
@@ -27,10 +27,8 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak isnanf = __isnanf
-#pragma weak _isnanf = __isnanf
-#endif
+#pragma weak __isnanf = isnanf
+#pragma weak _isnanf = isnanf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/lgammaf.c	2014-11-25 12:57:52.464807716 -0500
+++ new/usr/src/lib/libm/common/R/lgammaf.c	2014-11-25 12:57:52.476283705 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak lgammaf = __lgammaf
+#pragma weak __lgammaf = lgammaf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/lgammaf_r.c	2014-11-25 12:57:52.862946117 -0500
+++ new/usr/src/lib/libm/common/R/lgammaf_r.c	2014-11-25 12:57:52.874594466 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak lgammaf_r = __lgammaf_r
+#pragma weak __lgammaf_r = lgammaf_r
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/log10f.c	2014-11-25 12:57:53.263732480 -0500
+++ new/usr/src/lib/libm/common/R/log10f.c	2014-11-25 12:57:53.275156960 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak log10f = __log10f
+#pragma weak __log10f = log10f
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/log1pf.c	2014-11-25 12:57:53.661447674 -0500
+++ new/usr/src/lib/libm/common/R/log1pf.c	2014-11-25 12:57:53.673046914 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak log1pf = __log1pf
+#pragma weak __log1pf = log1pf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/log2f.c	2014-11-25 12:57:54.061701875 -0500
+++ new/usr/src/lib/libm/common/R/log2f.c	2014-11-25 12:57:54.073414017 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak log2f = __log2f
+#pragma weak __log2f = log2f
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/logbf.c	2014-11-25 12:57:54.699330066 -0500
+++ new/usr/src/lib/libm/common/R/logbf.c	2014-11-25 12:57:54.711002264 -0500
@@ -27,15 +27,13 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak logbf = __logbf
-#endif
+#pragma weak __logbf = logbf
 
 #include "libm.h"
 #include "xpg6.h"	/* __xpg6 */
 #define	_C99SUSv3_logb	_C99SUSv3_logb_subnormal_is_like_ilogb
 
-#if defined(USE_FPSCALE) || defined(__x86)
+#if defined(__x86)
 static const float two25 = 33554432.0F;
 #else
 /*
@@ -54,7 +52,7 @@
 	v <<= 1;
 	return (r + ((0xffffaa50 >> v) & 0x3));
 }
-#endif	/* defined(USE_FPSCALE) */
+#endif	/* defined(__x86) */
 
 static float
 raise_division(float t) {
@@ -71,7 +69,7 @@
 		if (k == 0)
 			return (raise_division(-1.0F));
 		else if ((__xpg6 & _C99SUSv3_logb) != 0) {
-#if defined(USE_FPSCALE) || defined(__x86)
+#if defined(__x86)
 			x *= two25;
 			return ((float) (((*((int *) &x) & 0x7f800000) >> 23) -
 				152));
--- old/usr/src/lib/libm/common/R/logf.c	2014-11-25 12:57:55.123201626 -0500
+++ new/usr/src/lib/libm/common/R/logf.c	2014-11-25 12:57:55.134616511 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak logf = __logf
+#pragma weak __logf = logf
 
 /*
  * Algorithm:
--- old/usr/src/lib/libm/common/R/nextafterf.c	2014-11-25 12:57:55.525713108 -0500
+++ new/usr/src/lib/libm/common/R/nextafterf.c	2014-11-25 12:57:55.537673343 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak nextafterf = __nextafterf
-#endif
+#pragma weak __nextafterf = nextafterf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/powf.c	2014-11-25 12:57:55.923453959 -0500
+++ new/usr/src/lib/libm/common/R/powf.c	2014-11-25 12:57:55.935106141 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak powf = __powf
+#pragma weak __powf = powf
 
 #include "libm.h"
 #include "xpg6.h"	/* __xpg6 */
--- old/usr/src/lib/libm/common/R/remainderf.c	2014-11-25 12:57:56.338808664 -0500
+++ new/usr/src/lib/libm/common/R/remainderf.c	2014-11-25 12:57:56.350280645 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak remainderf = __remainderf
-#endif
+#pragma weak __remainderf = remainderf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/rintf.c	2014-11-25 12:57:56.734220555 -0500
+++ new/usr/src/lib/libm/common/R/rintf.c	2014-11-25 12:57:56.745885972 -0500
@@ -27,13 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak aintf = __aintf
-#pragma weak anintf = __anintf
-#pragma weak irintf = __irintf
-#pragma weak nintf = __nintf
-#pragma weak rintf = __rintf
-#endif
+#pragma weak __rintf = rintf
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/R/scalbf.c	2014-11-25 12:57:57.140321385 -0500
+++ new/usr/src/lib/libm/common/R/scalbf.c	2014-11-25 12:57:57.151745161 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak scalbf = __scalbf
+#pragma weak __scalbf = scalbf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/scalbnf.c	2014-11-25 12:57:57.537157197 -0500
+++ new/usr/src/lib/libm/common/R/scalbnf.c	2014-11-25 12:57:57.548791356 -0500
@@ -27,16 +27,14 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak scalbnf = __scalbnf
-#endif
+#pragma weak __scalbnf = scalbnf
 
 #include "libm.h"
 #include <float.h>		/* FLT_MAX, FLT_MIN */
 #include <stdlib.h>		/* abs */
 
 static const float twom25f = 2.98023223876953125e-8F;
-#if defined(USE_FPSCALE) || defined(__x86)
+#if defined(__x86)
 static const float two23f = 8388608.0F;
 #else
 /*
@@ -55,7 +53,7 @@
 	v <<= 1;
 	return (r + ((0xffffaa50 >> v) & 0x3));
 }
-#endif	/* defined(USE_FPSCALE) */
+#endif	/* defined(__x86) */
 
 float
 scalbnf(float x, int n) {
@@ -72,7 +70,7 @@
 	if (ix == 0 || n == 0)
 		return (x);
 	if (k == 0) {
-#if defined(USE_FPSCALE) || defined(__x86)
+#if defined(__x86)
 		x *= two23f;
 		k = ((*px & ~0x80000000) >> 23) - 23;
 #else
--- old/usr/src/lib/libm/common/R/signgamf.c	2014-11-25 12:57:58.012649899 -0500
+++ new/usr/src/lib/libm/common/R/signgamf.c	2014-11-25 12:57:58.024146944 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak signgamf = __signgamf
+#pragma weak __signgamf = signgamf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/significandf.c	2014-11-25 12:57:58.406689921 -0500
+++ new/usr/src/lib/libm/common/R/significandf.c	2014-11-25 12:57:58.418147281 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak significandf = __significandf
-#endif
+#pragma weak __significandf = significandf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/sincosf.c	2014-11-25 12:57:58.805549490 -0500
+++ new/usr/src/lib/libm/common/R/sincosf.c	2014-11-25 12:57:58.816970007 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak sincosf = __sincosf
+#pragma weak __sincosf = sincosf
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/R/sincospif.c	2014-11-25 12:57:59.533216399 -0500
+++ new/usr/src/lib/libm/common/R/sincospif.c	2014-11-25 12:57:59.574472589 -0500
@@ -27,8 +27,6 @@
  * Use is subject to license terms.
  */
 
-#pragma weak sincospif = __sincospif
-
 #include "libm.h"
 
 extern void sincospi(double, double *, double *);
--- old/usr/src/lib/libm/common/R/sinf.c	2014-11-25 12:58:00.181784029 -0500
+++ new/usr/src/lib/libm/common/R/sinf.c	2014-11-25 12:58:00.193459779 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak sinf = __sinf
+#pragma weak __sinf = sinf
 
 /*
  * See sincosf.c
--- old/usr/src/lib/libm/common/R/sinhf.c	2014-11-25 12:58:00.593881426 -0500
+++ new/usr/src/lib/libm/common/R/sinhf.c	2014-11-25 12:58:00.605280338 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak sinhf = __sinhf
+#pragma weak __sinhf = sinhf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/sqrtf.c	2014-11-25 12:58:01.037930054 -0500
+++ new/usr/src/lib/libm/common/R/sqrtf.c	2014-11-25 12:58:01.049361791 -0500
@@ -26,11 +26,10 @@
  * Use is subject to license terms.
  */
 
-#pragma weak sqrtf = __sqrtf
+#pragma weak __sqrtf = sqrtf
 
 #include "libm.h"
 
-#ifdef __INLINE
 
 extern float __inline_sqrtf(float);
 
@@ -39,71 +38,3 @@
 	return (__inline_sqrtf(x));
 }
 
-#else	/* defined(__INLINE) */
-
-static const float huge = 1.0e35F, tiny = 1.0e-35F, zero = 0.0f;
-
-float
-sqrtf(float x) {
-	float	dz, w;
-	int 	*pw = (int *)&w;
-	int	ix, j, r, q, m, n, s, t;
-
-	w = x;
-	ix = pw[0];
-	if (ix <= 0) {
-		/* x is <= 0 or nan */
-		j = ix & 0x7fffffff;
-		if (j == 0)
-			return (w);
-		return ((w * zero) / zero);
-	}
-
-	if ((ix & 0x7f800000) == 0x7f800000) {
-		/* x is +inf or nan */
-		return (w * w);
-	}
-
-	m = ir_ilogb_(&w);
-	n = -m;
-	w = r_scalbn_(&w, (int *)&n);
-	ix = (pw[0] & 0x007fffff) | 0x00800000;
-	n = m / 2;
-	if ((n + n) != m) {
-		ix = ix + ix;
-		m -= 1;
-		n = m / 2;
-	}
-
-	/* generate sqrt(x) bit by bit */
-	ix <<= 1;
-	q = s = 0;
-	r = 0x01000000;
-	for (j = 1; j <= 25; j++) {
-		t = s + r;
-		if (t <= ix) {
-			s = t + r;
-			ix -= t;
-			q += r;
-		}
-		ix <<= 1;
-		r >>= 1;
-	}
-	if (ix == 0)
-		goto done;
-
-	/* raise inexact and determine the ambient rounding mode */
-	dz = huge - tiny;
-	if (dz < huge)
-		goto done;
-	dz = huge + tiny;
-	if (dz > huge)
-		q += 1;
-	q += (q & 1);
-
-done:
-	pw[0] = (q >> 1) + 0x3f000000;
-	return (r_scalbn_(&w, (int *)&n));
-}
-
-#endif	/* defined(__INLINE) */
--- old/usr/src/lib/libm/common/R/tanf.c	2014-11-25 12:58:01.436783477 -0500
+++ new/usr/src/lib/libm/common/R/tanf.c	2014-11-25 12:58:01.448721712 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak tanf = __tanf
+#pragma weak __tanf = tanf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/tanhf.c	2014-11-25 12:58:01.849257143 -0500
+++ new/usr/src/lib/libm/common/R/tanhf.c	2014-11-25 12:58:01.860627415 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak tanhf = __tanhf
+#pragma weak __tanhf = tanhf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/complex/cabs.c	2014-11-25 12:58:02.267399886 -0500
+++ new/usr/src/lib/libm/common/complex/cabs.c	2014-11-25 12:58:02.278967603 -0500
@@ -26,9 +26,8 @@
  * Use is subject to license terms.
  */
 
-#pragma weak cabs = __cabs
+#pragma weak __cabs = cabs
 
-#include "libm_synonyms.h"
 #include <math.h>
 #include "complex_wrapper.h"
 
--- old/usr/src/lib/libm/common/complex/cabsf.c	2014-11-25 12:58:02.702611409 -0500
+++ new/usr/src/lib/libm/common/complex/cabsf.c	2014-11-25 12:58:02.714031313 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak cabsf = __cabsf
+#pragma weak __cabsf = cabsf
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/cabsl.c	2014-11-25 12:58:03.112399480 -0500
+++ new/usr/src/lib/libm/common/complex/cabsl.c	2014-11-25 12:58:03.123741537 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak cabsl = __cabsl
+#pragma weak __cabsl = cabsl
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/cacos.c	2014-11-25 12:58:03.522173232 -0500
+++ new/usr/src/lib/libm/common/complex/cacos.c	2014-11-25 12:58:03.533885867 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak cacos = __cacos
+#pragma weak __cacos = cacos
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/complex/cacosf.c	2014-11-25 12:58:03.995908768 -0500
+++ new/usr/src/lib/libm/common/complex/cacosf.c	2014-11-25 12:58:04.010824019 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak cacosf = __cacosf
+#pragma weak __cacosf = cacosf
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/cacosh.c	2014-11-25 12:58:04.595252156 -0500
+++ new/usr/src/lib/libm/common/complex/cacosh.c	2014-11-25 12:58:04.612208295 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak cacosh = __cacosh
+#pragma weak __cacosh = cacosh
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/complex/cacoshf.c	2014-11-25 12:58:04.999993764 -0500
+++ new/usr/src/lib/libm/common/complex/cacoshf.c	2014-11-25 12:58:05.015004596 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak cacoshf = __cacoshf
+#pragma weak __cacoshf = cacoshf
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/cacoshl.c	2014-11-25 12:58:05.399972996 -0500
+++ new/usr/src/lib/libm/common/complex/cacoshl.c	2014-11-25 12:58:05.411644709 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak cacoshl = __cacoshl
+#pragma weak __cacoshl = cacoshl
 
 #include "libm.h"	/* fabsl/isnanl/isinfl/signbitl */
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/cacosl.c	2014-11-25 12:58:05.807354440 -0500
+++ new/usr/src/lib/libm/common/complex/cacosl.c	2014-11-25 12:58:05.818996196 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak cacosl = __cacosl
+#pragma weak __cacosl = cacosl
 
 #include "libm.h"		/* acosl/atanl/fabsl/isinfl/log1pl/logl/sqrtl */
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/carg.c	2014-11-25 12:58:06.255794870 -0500
+++ new/usr/src/lib/libm/common/complex/carg.c	2014-11-25 12:58:06.267221083 -0500
@@ -26,9 +26,8 @@
  * Use is subject to license terms.
  */
 
-#pragma weak carg = __carg
+#pragma weak __carg = carg
 
-#include "libm_synonyms.h"
 #include <math.h>		/* atan2 */
 #include "complex_wrapper.h"
 
--- old/usr/src/lib/libm/common/complex/cargf.c	2014-11-25 12:58:06.654941879 -0500
+++ new/usr/src/lib/libm/common/complex/cargf.c	2014-11-25 12:58:06.666426080 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak cargf = __cargf
+#pragma weak __cargf = cargf
 
 #include "libm.h"			/* atan2f */
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/cargl.c	2014-11-25 12:58:07.110882522 -0500
+++ new/usr/src/lib/libm/common/complex/cargl.c	2014-11-25 12:58:07.122491403 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak cargl = __cargl
+#pragma weak __cargl = cargl
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/casin.c	2014-11-25 12:58:07.508752780 -0500
+++ new/usr/src/lib/libm/common/complex/casin.c	2014-11-25 12:58:07.520313724 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak casin = __casin
+#pragma weak __casin = casin
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/complex/casinf.c	2014-11-25 12:58:07.942469742 -0500
+++ new/usr/src/lib/libm/common/complex/casinf.c	2014-11-25 12:58:07.954075310 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak casinf = __casinf
+#pragma weak __casinf = casinf
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/casinh.c	2014-11-25 12:58:08.342822807 -0500
+++ new/usr/src/lib/libm/common/complex/casinh.c	2014-11-25 12:58:08.354345679 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak casinh = __casinh
+#pragma weak __casinh = casinh
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/complex/casinhf.c	2014-11-25 12:58:08.740390306 -0500
+++ new/usr/src/lib/libm/common/complex/casinhf.c	2014-11-25 12:58:08.753208008 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak casinhf = __casinhf
+#pragma weak __casinhf = casinhf
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/casinhl.c	2014-11-25 12:58:09.142208067 -0500
+++ new/usr/src/lib/libm/common/complex/casinhl.c	2014-11-25 12:58:09.153609259 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak casinhl = __casinhl
+#pragma weak __casinhl = casinhl
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/casinl.c	2014-11-25 12:58:10.000355801 -0500
+++ new/usr/src/lib/libm/common/complex/casinl.c	2014-11-25 12:58:10.109745654 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak casinl = __casinl
+#pragma weak __casinl = casinl
 
 #include "libm.h"		/* asinl/atanl/fabsl/isinfl/log1pl/logl/sqrtl */
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/catan.c	2014-11-25 12:58:10.516986214 -0500
+++ new/usr/src/lib/libm/common/complex/catan.c	2014-11-25 12:58:10.528544237 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak catan = __catan
+#pragma weak __catan = catan
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/complex/catanf.c	2014-11-25 12:58:10.934903215 -0500
+++ new/usr/src/lib/libm/common/complex/catanf.c	2014-11-25 12:58:10.946537944 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak catanf = __catanf
+#pragma weak __catanf = catanf
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/catanh.c	2014-11-25 12:58:11.346778616 -0500
+++ new/usr/src/lib/libm/common/complex/catanh.c	2014-11-25 12:58:11.358188456 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak catanh = __catanh
+#pragma weak __catanh = catanh
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/complex/catanhf.c	2014-11-25 12:58:11.744310600 -0500
+++ new/usr/src/lib/libm/common/complex/catanhf.c	2014-11-25 12:58:11.757309886 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak catanhf = __catanhf
+#pragma weak __catanhf = catanhf
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/catanhl.c	2014-11-25 12:58:12.219505907 -0500
+++ new/usr/src/lib/libm/common/complex/catanhl.c	2014-11-25 12:58:12.231554707 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak catanhl = __catanhl
+#pragma weak __catanhl = catanhl
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/catanl.c	2014-11-25 12:58:12.622933015 -0500
+++ new/usr/src/lib/libm/common/complex/catanl.c	2014-11-25 12:58:12.634451456 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak catanl = __catanl
+#pragma weak __catanl = catanl
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/complex/ccos.c	2014-11-25 12:58:13.067367088 -0500
+++ new/usr/src/lib/libm/common/complex/ccos.c	2014-11-25 12:58:13.078982278 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak ccos = __ccos
+#pragma weak __ccos = ccos
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/complex/ccosf.c	2014-11-25 12:58:13.474604957 -0500
+++ new/usr/src/lib/libm/common/complex/ccosf.c	2014-11-25 12:58:13.486103764 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak ccosf = __ccosf
+#pragma weak __ccosf = ccosf
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/ccosh.c	2014-11-25 12:58:13.872753504 -0500
+++ new/usr/src/lib/libm/common/complex/ccosh.c	2014-11-25 12:58:13.884445536 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak ccosh = __ccosh
+#pragma weak __ccosh = ccosh
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/complex/ccoshf.c	2014-11-25 12:58:14.764409747 -0500
+++ new/usr/src/lib/libm/common/complex/ccoshf.c	2014-11-25 12:58:15.030532459 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak ccoshf = __ccoshf
+#pragma weak __ccoshf = ccoshf
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/ccoshl.c	2014-11-25 12:58:15.457767116 -0500
+++ new/usr/src/lib/libm/common/complex/ccoshl.c	2014-11-25 12:58:15.469049634 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak ccoshl = __ccoshl
+#pragma weak __ccoshl = ccoshl
 
 #include "libm.h"	/* coshl/expl/fabsl/scalbnl/sincosl/sinhl/__k_cexpl */
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/ccosl.c	2014-11-25 12:58:15.872548331 -0500
+++ new/usr/src/lib/libm/common/complex/ccosl.c	2014-11-25 12:58:15.884495675 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak ccosl = __ccosl
+#pragma weak __ccosl = ccosl
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/cexp.c	2014-11-25 12:58:16.304435564 -0500
+++ new/usr/src/lib/libm/common/complex/cexp.c	2014-11-25 12:58:16.315857872 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak cexp = __cexp
+#pragma weak __cexp = cexp
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/complex/cexpf.c	2014-11-25 12:58:16.709091392 -0500
+++ new/usr/src/lib/libm/common/complex/cexpf.c	2014-11-25 12:58:16.720615345 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak cexpf = __cexpf
+#pragma weak __cexpf = cexpf
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/cexpl.c	2014-11-25 12:58:17.132473256 -0500
+++ new/usr/src/lib/libm/common/complex/cexpl.c	2014-11-25 12:58:17.144142188 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak cexpl = __cexpl
+#pragma weak __cexpl = cexpl
 
 #include "libm.h"		/* expl/isinfl/iszerol/scalbnl/sincosl */
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/cimag.c	2014-11-25 12:58:17.546298066 -0500
+++ new/usr/src/lib/libm/common/complex/cimag.c	2014-11-25 12:58:17.557899864 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak cimag = __cimag
+#pragma weak __cimag = cimag
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/cimagf.c	2014-11-25 12:58:17.952057679 -0500
+++ new/usr/src/lib/libm/common/complex/cimagf.c	2014-11-25 12:58:17.963650244 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak cimagf = __cimagf
+#pragma weak __cimagf = cimagf
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/cimagl.c	2014-11-25 12:58:18.372094032 -0500
+++ new/usr/src/lib/libm/common/complex/cimagl.c	2014-11-25 12:58:18.383519128 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak cimagl = __cimagl
+#pragma weak __cimagl = cimagl
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/clog.c	2014-11-25 12:58:18.819036346 -0500
+++ new/usr/src/lib/libm/common/complex/clog.c	2014-11-25 12:58:18.830992746 -0500
@@ -60,7 +60,6 @@
  */
 /* INDENT ON */
 
-#include "libm_synonyms.h"
 #include <math.h>		/* atan2/fabs/log/log1p */
 #include "complex_wrapper.h"
 #include "libm_protos.h"	/* __k_clog_r */
@@ -69,7 +68,7 @@
 static const double half = 0.5, one = 1.0;
 
 dcomplex
-clog(dcomplex z) {
+__clog(dcomplex z) {
 	dcomplex	ans;
 	double		x, y, t, ax, ay, w;
 	int		n, ix, iy, hx, hy;
--- old/usr/src/lib/libm/common/complex/clogf.c	2014-11-25 12:58:19.323396583 -0500
+++ new/usr/src/lib/libm/common/complex/clogf.c	2014-11-25 12:58:19.336129834 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak clogf = __clogf
+#pragma weak __clogf = clogf
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/clogl.c	2014-11-25 12:58:19.934499900 -0500
+++ new/usr/src/lib/libm/common/complex/clogl.c	2014-11-25 12:58:19.966648798 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak clogl = __clogl
+#pragma weak __clogl = clogl
 
 #include "libm.h"	/* atan2l/fabsl/isinfl/log1pl/logl/__k_clog_rl */
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/conj.c	2014-11-25 12:58:20.607768398 -0500
+++ new/usr/src/lib/libm/common/complex/conj.c	2014-11-25 12:58:20.619509039 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak conj = __conj
+#pragma weak __conj = conj
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/conjf.c	2014-11-25 12:58:21.174307066 -0500
+++ new/usr/src/lib/libm/common/complex/conjf.c	2014-11-25 12:58:21.198440372 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak conjf = __conjf
+#pragma weak __conjf = conjf
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/conjl.c	2014-11-25 12:58:21.585827006 -0500
+++ new/usr/src/lib/libm/common/complex/conjl.c	2014-11-25 12:58:21.597319854 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak conjl = __conjl
+#pragma weak __conjl = conjl
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/cpow.c	2014-11-25 12:58:22.240727743 -0500
+++ new/usr/src/lib/libm/common/complex/cpow.c	2014-11-25 12:58:22.253716808 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak cpow = __cpow
+#pragma weak __cpow = cpow
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/complex/cpowf.c	2014-11-25 12:58:22.757408595 -0500
+++ new/usr/src/lib/libm/common/complex/cpowf.c	2014-11-25 12:58:22.768656520 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak cpowf = __cpowf
+#pragma weak __cpowf = cpowf
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/cpowl.c	2014-11-25 12:58:23.182360663 -0500
+++ new/usr/src/lib/libm/common/complex/cpowl.c	2014-11-25 12:58:23.194011811 -0500
@@ -27,12 +27,12 @@
  * Use is subject to license terms.
  */
 
-#pragma weak cpowl = __cpowl
+#pragma weak __cpowl = cpowl
 
 #include "libm.h"				/* __k_clog_rl/__k_atan2l */
 /* atan2l/atan2pil/exp2l/expl/fabsl/hypotl/isinfl/logl/powl/sincosl/sincospil */
 #include "complex_wrapper.h"
-#include "longdouble.h" 
+#include "longdouble.h"
 
 #if defined(__sparc)
 #define	HALF(x)  ((int *) &x)[3] = 0; ((int *) &x)[2] &= 0xfe000000
--- old/usr/src/lib/libm/common/complex/cproj.c	2014-11-25 12:58:23.599978088 -0500
+++ new/usr/src/lib/libm/common/complex/cproj.c	2014-11-25 12:58:23.611509703 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak cproj = __cproj
+#pragma weak __cproj = cproj
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/complex/cprojf.c	2014-11-25 12:58:24.015402650 -0500
+++ new/usr/src/lib/libm/common/complex/cprojf.c	2014-11-25 12:58:24.027097029 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak cprojf = __cprojf
+#pragma weak __cprojf = cprojf
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/cprojl.c	2014-11-25 12:58:24.826253811 -0500
+++ new/usr/src/lib/libm/common/complex/cprojl.c	2014-11-25 12:58:24.837758131 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak cprojl = __cprojl
+#pragma weak __cprojl = cprojl
 
 #include "libm.h"		/* fabsl */
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/creal.c	2014-11-25 12:58:25.256411699 -0500
+++ new/usr/src/lib/libm/common/complex/creal.c	2014-11-25 12:58:25.268021037 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak creal = __creal
+#pragma weak __creal = creal
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/crealf.c	2014-11-25 12:58:25.668747988 -0500
+++ new/usr/src/lib/libm/common/complex/crealf.c	2014-11-25 12:58:25.680151203 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak crealf = __crealf
+#pragma weak __crealf = crealf
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/creall.c	2014-11-25 12:58:26.082148770 -0500
+++ new/usr/src/lib/libm/common/complex/creall.c	2014-11-25 12:58:26.093601342 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak creall = __creall
+#pragma weak __creall = creall
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/csin.c	2014-11-25 12:58:26.479693414 -0500
+++ new/usr/src/lib/libm/common/complex/csin.c	2014-11-25 12:58:26.491111404 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak csin = __csin
+#pragma weak __csin = csin
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/complex/csinf.c	2014-11-25 12:58:26.886867538 -0500
+++ new/usr/src/lib/libm/common/complex/csinf.c	2014-11-25 12:58:26.898288986 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak csinf = __csinf
+#pragma weak __csinf = csinf
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/csinh.c	2014-11-25 12:58:27.288852733 -0500
+++ new/usr/src/lib/libm/common/complex/csinh.c	2014-11-25 12:58:27.300299773 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak csinh = __csinh
+#pragma weak __csinh = csinh
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/complex/csinhf.c	2014-11-25 12:58:27.715721855 -0500
+++ new/usr/src/lib/libm/common/complex/csinhf.c	2014-11-25 12:58:27.727094338 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak csinhf = __csinhf
+#pragma weak __csinhf = csinhf
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/csinhl.c	2014-11-25 12:58:28.129862764 -0500
+++ new/usr/src/lib/libm/common/complex/csinhl.c	2014-11-25 12:58:28.149122177 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak csinhl = __csinhl
+#pragma weak __csinhl = csinhl
 
 #include "libm.h"	/* coshl/expl/fabsl/scalbnl/sincosl/sinhl/__k_cexpl */
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/csinl.c	2014-11-25 12:58:28.581694417 -0500
+++ new/usr/src/lib/libm/common/complex/csinl.c	2014-11-25 12:58:28.593261075 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak csinl = __csinl
+#pragma weak __csinl = csinl
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/csqrt.c	2014-11-25 12:58:28.977046250 -0500
+++ new/usr/src/lib/libm/common/complex/csqrt.c	2014-11-25 12:58:28.988669181 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak csqrt = __csqrt
+#pragma weak __csqrt = csqrt
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/complex/csqrtf.c	2014-11-25 12:58:29.537972216 -0500
+++ new/usr/src/lib/libm/common/complex/csqrtf.c	2014-11-25 12:58:29.637617397 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak csqrtf = __csqrtf
+#pragma weak __csqrtf = csqrtf
 
 #include "libm.h"		/* sqrt/fabsf/sqrtf */
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/csqrtl.c	2014-11-25 12:58:30.107287048 -0500
+++ new/usr/src/lib/libm/common/complex/csqrtl.c	2014-11-25 12:58:30.118688606 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak csqrtl = __csqrtl
+#pragma weak __csqrtl = csqrtl
 
 #include "libm.h"		/* fabsl/isinfl/sqrtl */
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/ctan.c	2014-11-25 12:58:30.554698465 -0500
+++ new/usr/src/lib/libm/common/complex/ctan.c	2014-11-25 12:58:30.566295841 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak ctan = __ctan
+#pragma weak __ctan = ctan
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/complex/ctanf.c	2014-11-25 12:58:30.967012165 -0500
+++ new/usr/src/lib/libm/common/complex/ctanf.c	2014-11-25 12:58:30.978595699 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak ctanf = __ctanf
+#pragma weak __ctanf = ctanf
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/ctanh.c	2014-11-25 12:58:31.387692080 -0500
+++ new/usr/src/lib/libm/common/complex/ctanh.c	2014-11-25 12:58:31.399215968 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak ctanh = __ctanh
+#pragma weak __ctanh = ctanh
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/complex/ctanhf.c	2014-11-25 12:58:31.795537641 -0500
+++ new/usr/src/lib/libm/common/complex/ctanhf.c	2014-11-25 12:58:31.807351360 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak ctanhf = __ctanhf
+#pragma weak __ctanhf = ctanhf
 
 #include "libm.h"		/* expf/expm1f/fabsf/sincosf/sinf/tanhf */
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/ctanhl.c	2014-11-25 12:58:32.203764957 -0500
+++ new/usr/src/lib/libm/common/complex/ctanhl.c	2014-11-25 12:58:32.215181462 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak ctanhl = __ctanhl
+#pragma weak __ctanhl = ctanhl
 
 #include "libm.h"	/* expl/expm1l/fabsl/isinfl/isnanl/sincosl/sinl/tanhl */
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/complex/ctanl.c	2014-11-25 12:58:32.608947093 -0500
+++ new/usr/src/lib/libm/common/complex/ctanl.c	2014-11-25 12:58:32.620372310 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak ctanl = __ctanl
+#pragma weak __ctanl = ctanl
 
 #include "libm.h"
 #include "complex_wrapper.h"
--- old/usr/src/lib/libm/common/m9x/__fex_hdlr.c	2014-11-25 12:58:33.027795733 -0500
+++ new/usr/src/lib/libm/common/m9x/__fex_hdlr.c	2014-11-25 12:58:33.039772428 -0500
@@ -27,7 +27,6 @@
  * Use is subject to license terms.
  */
 
-#include "fenv_synonyms.h"
 #undef lint
 #include <signal.h>
 #include <siginfo.h>
@@ -57,10 +56,8 @@
 void (*__mt_fex_sync)() = NULL; /* for synchronization with libmtsk */
 #pragma weak __mt_fex_sync
 
-#ifdef LIBM_MT_FEX_SYNC
 void (*__libm_mt_fex_sync)() = NULL; /* new, improved version of above */
 #pragma weak __libm_mt_fex_sync
-#endif
 
 /* private variables */
 static fex_handler_t main_handlers;
@@ -145,7 +142,6 @@
 		__fex_update_te();
 }
 
-#ifdef LIBM_MT_FEX_SYNC
 /*
 *  The following function may be used for synchronization with any
 *  internal project that manages multiple threads
@@ -204,7 +200,6 @@
 		break;
 	}
 }
-#endif
 
 #if defined(__sparc)
 
@@ -842,8 +837,6 @@
 	/* synchronize with libmtsk */
 	__mt_fex_sync = __fex_sync_with_libmtsk;
 
-#ifdef LIBM_MT_FEX_SYNC
 	/* synchronize with other projects */
 	__libm_mt_fex_sync = __fex_sync_with_threads;
-#endif
 }
--- old/usr/src/lib/libm/common/m9x/__fex_i386.c	2014-11-25 12:58:33.544899359 -0500
+++ new/usr/src/lib/libm/common/m9x/__fex_i386.c	2014-11-25 12:58:33.556632575 -0500
@@ -27,7 +27,6 @@
  * Use is subject to license terms.
  */
 
-#include "fenv_synonyms.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
--- old/usr/src/lib/libm/common/m9x/__fex_sparc.c	2014-11-25 12:58:34.091875040 -0500
+++ new/usr/src/lib/libm/common/m9x/__fex_sparc.c	2014-11-25 12:58:34.103577109 -0500
@@ -28,7 +28,6 @@
  */
 
 #if defined(__sparc)
-#include "fenv_synonyms.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
--- old/usr/src/lib/libm/common/m9x/__fex_sse.c	2014-11-25 12:58:34.898486431 -0500
+++ new/usr/src/lib/libm/common/m9x/__fex_sse.c	2014-11-25 12:58:34.910328143 -0500
@@ -27,7 +27,6 @@
  * Use is subject to license terms.
  */
 
-#include "fenv_synonyms.h"
 #include <ucontext.h>
 #include <fenv.h>
 #if defined(__SUNPRO_C)
--- old/usr/src/lib/libm/common/m9x/__fex_sym.c	2014-11-25 12:58:35.493079760 -0500
+++ new/usr/src/lib/libm/common/m9x/__fex_sym.c	2014-11-25 12:58:35.505668632 -0500
@@ -27,7 +27,6 @@
  * Use is subject to license terms.
  */
 
-#include "fenv_synonyms.h"
 #include <elf.h>
 #include <stdio.h>
 #include <stdlib.h>
--- old/usr/src/lib/libm/common/m9x/fdim.c	2014-11-25 12:58:35.910674696 -0500
+++ new/usr/src/lib/libm/common/m9x/fdim.c	2014-11-25 12:58:35.922548815 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
 #pragma weak fdim = __fdim
-#endif
 
 /*
  * fdim(x,y) returns x - y if x > y, +0 if x <= y, and NaN if x and
--- old/usr/src/lib/libm/common/m9x/fdimf.c	2014-11-25 12:58:36.462037497 -0500
+++ new/usr/src/lib/libm/common/m9x/fdimf.c	2014-11-25 12:58:36.473463619 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
 #pragma weak fdimf = __fdimf
-#endif
 
 #include "libm.h"	/* for islessequal macro */
 
--- old/usr/src/lib/libm/common/m9x/fdiml.c	2014-11-25 12:58:37.024259624 -0500
+++ new/usr/src/lib/libm/common/m9x/fdiml.c	2014-11-25 12:58:37.046308143 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
 #pragma weak fdiml = __fdiml
-#endif
 
 #include "libm.h"	/* for islessequal macro */
 
--- old/usr/src/lib/libm/common/m9x/feexcept.c	2014-11-25 12:58:37.496282681 -0500
+++ new/usr/src/lib/libm/common/m9x/feexcept.c	2014-11-25 12:58:37.509092127 -0500
@@ -27,19 +27,18 @@
  * Use is subject to license terms.
  */
 
-#pragma weak feclearexcept = __feclearexcept
-#pragma weak feraiseexcept = __feraiseexcept
-#pragma weak fetestexcept = __fetestexcept
-#pragma weak fegetexceptflag = __fegetexceptflag
-#pragma weak fesetexceptflag = __fesetexceptflag
-
-#pragma weak feclearexcept96 = __feclearexcept
-#pragma weak feraiseexcept96 = __feraiseexcept
-#pragma weak fetestexcept96 = __fetestexcept
-#pragma weak fegetexceptflag96 = __fegetexceptflag
-#pragma weak fesetexceptflag96 = __fesetexceptflag
+#pragma weak __feclearexcept = feclearexcept
+#pragma weak __feraiseexcept = feraiseexcept
+#pragma weak __fetestexcept = fetestexcept
+#pragma weak __fegetexceptflag = fegetexceptflag
+#pragma weak __fesetexceptflag = fesetexceptflag
+
+#pragma weak feclearexcept96 = feclearexcept
+#pragma weak feraiseexcept96 = feraiseexcept
+#pragma weak fetestexcept96 = fetestexcept
+#pragma weak fegetexceptflag96 = fegetexceptflag
+#pragma weak fesetexceptflag96 = fesetexceptflag
 
-#include "fenv_synonyms.h"
 #include <fenv.h>
 #include <sys/ieeefp.h>
 #include <ucontext.h>
--- old/usr/src/lib/libm/common/m9x/fenv.c	2014-11-25 12:58:37.902079581 -0500
+++ new/usr/src/lib/libm/common/m9x/fenv.c	2014-11-25 12:58:37.913432068 -0500
@@ -27,19 +27,17 @@
  * Use is subject to license terms.
  */
 
-#pragma weak fex_merge_flags = __fex_merge_flags
+#pragma weak __fex_merge_flags = fex_merge_flags
 
-#pragma weak feholdexcept = __feholdexcept
-#pragma weak feupdateenv = __feupdateenv
-#pragma weak fegetenv = __fegetenv
-#pragma weak fesetenv = __fesetenv
-
-#pragma weak feholdexcept96 = __feholdexcept96
-#pragma weak feupdateenv96 = __feupdateenv
-#pragma weak fegetenv96 = __fegetenv
-#pragma weak fesetenv96 = __fesetenv
+#pragma weak __feholdexcept = feholdexcept
+#pragma weak __feupdateenv = feupdateenv
+#pragma weak __fegetenv = fegetenv
+#pragma weak __fesetenv = fesetenv
+
+#pragma weak feupdateenv96 = feupdateenv
+#pragma weak fegetenv96 = fegetenv
+#pragma weak fesetenv96 = fesetenv
 
-#include "fenv_synonyms.h"
 #include <fenv.h>
 #include <ucontext.h>
 #include <thread.h>
--- old/usr/src/lib/libm/common/m9x/fenv_synonyms.h	2014-11-25 12:58:38.309838485 -0500
+++ /dev/null	2014-11-25 12:58:38.000000000 -0500
@@ -1,108 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * 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.
- * 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 2011 Nexenta Systems, Inc.  All rights reserved.
- */
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#ifndef	_M9X_FENV_SYNONYMS_H
-#define	_M9X_FENV_SYNONYMS_H
-
-#include <sys/isa_defs.h>
-
-/* feexcept.c */
-#define feclearexcept	__feclearexcept
-#define feraiseexcept	__feraiseexcept
-#define fetestexcept	__fetestexcept
-#define fegetexceptflag	__fegetexceptflag
-#define fesetexceptflag	__fesetexceptflag
-
-/* fenv.c */
-#define feholdexcept	__feholdexcept
-#define feholdexcept96	__feholdexcept96
-#define feupdateenv		__feupdateenv
-#define fegetenv		__fegetenv
-#define fesetenv		__fesetenv
-#define fex_merge_flags	__fex_merge_flags
-
-#if defined(__x86)
-/* feprec.c */
-#define fegetprec		__fegetprec
-#define fesetprec		__fesetprec
-#endif
-
-/* feround.c */
-#define fegetround		__fegetround
-#define fesetround		__fesetround
-#define fesetround96	__fesetround96
-
-/* fex_handler.c */
-#define fex_get_handling		__fex_get_handling
-#define fex_set_handling		__fex_set_handling
-#define fex_getexcepthandler	__fex_getexcepthandler
-#define fex_setexcepthandler	__fex_setexcepthandler
-
-/* fex_log.c */
-#define fex_get_log			__fex_get_log
-#define fex_set_log			__fex_set_log
-#define fex_get_log_depth	__fex_get_log_depth
-#define fex_set_log_depth	__fex_set_log_depth
-#define fex_log_entry		__fex_log_entry
-
-/* libc, libthread */
-#define close			_close
-#define getcontext		_getcontext
-#define getpid			_getpid
-#define kill			_kill
-#define lseek			_lseek
-#define mutex_lock		_mutex_lock
-#define mutex_unlock	_mutex_unlock
-#define open			_open
-#define read			_read
-#define sigaction		_sigaction
-#define sigemptyset		_sigemptyset
-#define sigismember		_sigismember
-#define sigprocmask		_sigprocmask
-#define stat			_stat
-#define thr_getspecific	_thr_getspecific
-#define thr_keycreate	_thr_keycreate
-#define thr_main		_thr_main
-#define thr_setspecific	_thr_setspecific
-#define write			_write
-
-/* ??? see V9 /usr/include/stdio.h */
-#ifdef __sparcv9
-#define fileno			_fileno
-#endif
-
-#ifdef __sparc
-/* libm, libsunmath */
-#define fp_class		__fp_class
-#define fp_classf		__fp_classf
-#define sqrt			__sqrt
-#define sqrtf			__sqrtf
-#endif
-
-#endif	/* _M9X_FENV_SYNONYMS_H */
--- old/usr/src/lib/libm/common/m9x/feprec.c	2014-11-25 12:58:38.478082553 -0500
+++ new/usr/src/lib/libm/common/m9x/feprec.c	2014-11-25 12:58:38.489658882 -0500
@@ -27,10 +27,9 @@
  * Use is subject to license terms.
  */
 
-#pragma weak fegetprec = __fegetprec
-#pragma weak fesetprec = __fesetprec
+#pragma weak __fegetprec = fegetprec
+#pragma weak __fesetprec = fesetprec
 
-#include "fenv_synonyms.h"
 #include <fenv.h>
 #include <ucontext.h>
 #include <thread.h>
--- old/usr/src/lib/libm/common/m9x/feround.c	2014-11-25 12:58:38.879692404 -0500
+++ new/usr/src/lib/libm/common/m9x/feround.c	2014-11-25 12:58:38.891575837 -0500
@@ -27,13 +27,11 @@
  * Use is subject to license terms.
  */
 
-#pragma weak fegetround = __fegetround
-#pragma weak fesetround = __fesetround
+#pragma weak __fegetround = fegetround
+#pragma weak __fesetround = fesetround
 
 #pragma weak fegetround96 = __fegetround
-#pragma weak fesetround96 = __fesetround96
 
-#include "fenv_synonyms.h"
 #include <fenv.h>
 #include <ucontext.h>
 #include <thread.h>
--- old/usr/src/lib/libm/common/m9x/fex_handler.c	2014-11-25 12:58:39.314654124 -0500
+++ new/usr/src/lib/libm/common/m9x/fex_handler.c	2014-11-25 12:58:39.439043738 -0500
@@ -27,12 +27,11 @@
  * Use is subject to license terms.
  */
 
-#pragma weak fex_get_handling = __fex_get_handling
-#pragma weak fex_set_handling = __fex_set_handling
-#pragma weak fex_getexcepthandler = __fex_getexcepthandler
-#pragma weak fex_setexcepthandler = __fex_setexcepthandler
+#pragma weak __fex_get_handling = fex_get_handling
+#pragma weak __fex_set_handling = fex_set_handling
+#pragma weak __fex_getexcepthandler = fex_getexcepthandler
+#pragma weak __fex_setexcepthandler = fex_setexcepthandler
 
-#include "fenv_synonyms.h"
 #include <fenv.h>
 #include <ucontext.h>
 #include <thread.h>
--- old/usr/src/lib/libm/common/m9x/fex_log.c	2014-11-25 12:58:40.182968593 -0500
+++ new/usr/src/lib/libm/common/m9x/fex_log.c	2014-11-25 12:58:40.194405097 -0500
@@ -27,13 +27,12 @@
  * Use is subject to license terms.
  */
 
-#pragma weak fex_get_log = __fex_get_log
-#pragma weak fex_set_log = __fex_set_log
-#pragma weak fex_get_log_depth = __fex_get_log_depth
-#pragma weak fex_set_log_depth = __fex_set_log_depth
-#pragma weak fex_log_entry = __fex_log_entry
+#pragma weak __fex_get_log = fex_get_log
+#pragma weak __fex_set_log = fex_set_log
+#pragma weak __fex_get_log_depth = fex_get_log_depth
+#pragma weak __fex_set_log_depth = fex_set_log_depth
+#pragma weak __fex_log_entry = fex_log_entry
 
-#include "fenv_synonyms.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
--- old/usr/src/lib/libm/common/m9x/fma.c	2014-11-25 12:58:40.615053996 -0500
+++ new/usr/src/lib/libm/common/m9x/fma.c	2014-11-25 12:58:40.626714800 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
 #pragma weak fma = __fma
-#endif
 
 #include "libm.h"
 #include "fma.h"
--- old/usr/src/lib/libm/common/m9x/fmaf.c	2014-11-25 12:58:41.048039809 -0500
+++ new/usr/src/lib/libm/common/m9x/fmaf.c	2014-11-25 12:58:41.059507443 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
 #pragma weak fmaf = __fmaf
-#endif
 
 #include "libm.h"
 #include "fma.h"
--- old/usr/src/lib/libm/common/m9x/fmal.c	2014-11-25 12:58:41.461217520 -0500
+++ new/usr/src/lib/libm/common/m9x/fmal.c	2014-11-25 12:58:41.472826677 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
 #pragma weak fmal = __fmal
-#endif
 
 #include "libm.h"
 #include "fma.h"
--- old/usr/src/lib/libm/common/m9x/fmax.c	2014-11-25 12:58:41.967030567 -0500
+++ new/usr/src/lib/libm/common/m9x/fmax.c	2014-11-25 12:58:41.978475336 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
 #pragma weak fmax = __fmax
-#endif
 
 /*
  * fmax(x,y) returns the larger of x and y.  If just one of the
--- old/usr/src/lib/libm/common/m9x/fmaxf.c	2014-11-25 12:58:42.370926209 -0500
+++ new/usr/src/lib/libm/common/m9x/fmaxf.c	2014-11-25 12:58:42.382373821 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
 #pragma weak fmaxf = __fmaxf
-#endif
 
 /*
  * fmax(x,y) returns the larger of x and y.  If just one of the
--- old/usr/src/lib/libm/common/m9x/fmaxl.c	2014-11-25 12:58:42.787720261 -0500
+++ new/usr/src/lib/libm/common/m9x/fmaxl.c	2014-11-25 12:58:42.799116420 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
 #pragma weak fmaxl = __fmaxl
-#endif
 
 #include "libm.h"	/* for isgreaterequal macro */
 
--- old/usr/src/lib/libm/common/m9x/fmin.c	2014-11-25 12:58:43.207095002 -0500
+++ new/usr/src/lib/libm/common/m9x/fmin.c	2014-11-25 12:58:43.219022388 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
 #pragma weak fmin = __fmin
-#endif
 
 /*
  * fmin(x,y) returns the smaller of x and y.  If just one of the
--- old/usr/src/lib/libm/common/m9x/fminf.c	2014-11-25 12:58:43.614371277 -0500
+++ new/usr/src/lib/libm/common/m9x/fminf.c	2014-11-25 12:58:43.625730527 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
 #pragma weak fminf = __fminf
-#endif
 
 #include "libm.h"	/* for islessequal macro */
 
--- old/usr/src/lib/libm/common/m9x/fminl.c	2014-11-25 12:58:44.019511329 -0500
+++ new/usr/src/lib/libm/common/m9x/fminl.c	2014-11-25 12:58:44.031016781 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
 #pragma weak fminl = __fminl
-#endif
 
 #include "libm.h"	/* for islessequal macro */
 
--- old/usr/src/lib/libm/common/m9x/frexp.c	2014-11-25 12:58:44.831065688 -0500
+++ new/usr/src/lib/libm/common/m9x/frexp.c	2014-11-25 12:58:44.842600086 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
 #pragma weak frexp = __frexp
-#endif
 
 /*
  * frexp(x, exp) returns the normalized significand of x and sets
--- old/usr/src/lib/libm/common/m9x/frexpf.c	2014-11-25 12:58:45.238079706 -0500
+++ new/usr/src/lib/libm/common/m9x/frexpf.c	2014-11-25 12:58:45.250779464 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
 #pragma weak frexpf = __frexpf
-#endif
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/m9x/frexpl.c	2014-11-25 12:58:45.640092732 -0500
+++ new/usr/src/lib/libm/common/m9x/frexpl.c	2014-11-25 12:58:45.651519834 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
 #pragma weak frexpl = __frexpl
-#endif
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/m9x/ldexp.c	2014-11-25 12:58:46.069877190 -0500
+++ new/usr/src/lib/libm/common/m9x/ldexp.c	2014-11-25 12:58:46.081401660 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak ldexp = __ldexp
-#endif
+#pragma weak __ldexp = ldexp
 
 #include "libm.h"
 #include <errno.h>
--- old/usr/src/lib/libm/common/m9x/ldexpf.c	2014-11-25 12:58:46.480031523 -0500
+++ new/usr/src/lib/libm/common/m9x/ldexpf.c	2014-11-25 12:58:46.491496745 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak ldexpf = __ldexpf
-#endif
+#pragma weak __ldexpf = ldexpf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/m9x/ldexpl.c	2014-11-25 12:58:46.879155181 -0500
+++ new/usr/src/lib/libm/common/m9x/ldexpl.c	2014-11-25 12:58:46.890773805 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak ldexpl = __ldexpl
-#endif
+#pragma weak __ldexpl = ldexpl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/m9x/llrint.c	2014-11-25 12:58:47.283472468 -0500
+++ new/usr/src/lib/libm/common/m9x/llrint.c	2014-11-25 12:58:47.294986784 -0500
@@ -27,12 +27,10 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak llrint = __llrint
+#pragma weak __llrint = llrint
 #if defined(__sparcv9) || defined(__amd64)
-#pragma weak lrint = __llrint
-#pragma weak __lrint = __llrint
-#endif
+#pragma weak lrint = llrint
+#pragma weak __lrint = llrint
 #endif
 
 /*
--- old/usr/src/lib/libm/common/m9x/llrintf.c	2014-11-25 12:58:47.684793662 -0500
+++ new/usr/src/lib/libm/common/m9x/llrintf.c	2014-11-25 12:58:47.696237291 -0500
@@ -27,12 +27,10 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak llrintf = __llrintf
+#pragma weak __llrintf = llrintf
 #if defined(__sparcv9) || defined(__amd64)
-#pragma weak lrintf = __llrintf
-#pragma weak __lrintf = __llrintf
-#endif
+#pragma weak lrintf = llrintf
+#pragma weak __lrintf = llrintf
 #endif
 
 #include "libm.h"
--- old/usr/src/lib/libm/common/m9x/llrintl.c	2014-11-25 12:58:48.159613567 -0500
+++ new/usr/src/lib/libm/common/m9x/llrintl.c	2014-11-25 12:58:48.171202911 -0500
@@ -27,12 +27,10 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak llrintl = __llrintl
+#pragma weak __llrintl = llrintl
 #if defined(__sparcv9) || defined(__amd64)
-#pragma weak lrintl = __llrintl
-#pragma weak __lrintl = __llrintl
-#endif
+#pragma weak lrintl = llrintl
+#pragma weak __lrintl = llrintl
 #endif
 
 #include "libm.h"
--- old/usr/src/lib/libm/common/m9x/llround.c	2014-11-25 12:58:48.571415388 -0500
+++ new/usr/src/lib/libm/common/m9x/llround.c	2014-11-25 12:58:48.583414459 -0500
@@ -27,12 +27,10 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak llround = __llround
+#pragma weak __llround = llround
 #if defined(__sparcv9) || defined(__amd64)
-#pragma weak lround = __llround
-#pragma weak __lround = __llround
-#endif
+#pragma weak lround = llround
+#pragma weak __lround = llround
 #endif
 
 /*
--- old/usr/src/lib/libm/common/m9x/llroundf.c	2014-11-25 12:58:48.988304382 -0500
+++ new/usr/src/lib/libm/common/m9x/llroundf.c	2014-11-25 12:58:49.001017562 -0500
@@ -27,12 +27,10 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak llroundf = __llroundf
+#pragma weak __llroundf = llroundf
 #if defined(__sparcv9) || defined(__amd64)
-#pragma weak lroundf = __llroundf
-#pragma weak __lroundf = __llroundf
-#endif
+#pragma weak lroundf = llroundf
+#pragma weak __lroundf = llroundf
 #endif
 
 #include "libm.h"
--- old/usr/src/lib/libm/common/m9x/llroundl.c	2014-11-25 12:58:49.676124976 -0500
+++ new/usr/src/lib/libm/common/m9x/llroundl.c	2014-11-25 12:58:49.687965916 -0500
@@ -27,12 +27,10 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak llroundl = __llroundl
+#pragma weak __llroundl = llroundl
 #if defined(__sparcv9) || defined(__amd64)
-#pragma weak lroundl = __llroundl
-#pragma weak __lroundl = __llroundl
-#endif
+#pragma weak lroundl = llroundl
+#pragma weak __lroundl = llroundl
 #endif
 
 #include "libm.h"
--- old/usr/src/lib/libm/common/m9x/lrint.c	2014-11-25 12:58:50.173899097 -0500
+++ new/usr/src/lib/libm/common/m9x/lrint.c	2014-11-25 12:58:50.185390290 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak lrint = __lrint
-#endif
+#pragma weak __lrint = lrint
 
 /*
  * lrint(x) rounds its argument to the nearest integer according
--- old/usr/src/lib/libm/common/m9x/lrintf.c	2014-11-25 12:58:50.580758353 -0500
+++ new/usr/src/lib/libm/common/m9x/lrintf.c	2014-11-25 12:58:50.592240523 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak lrintf = __lrintf
-#endif
+#pragma weak __lrintf = lrintf
 
 #include <sys/isa_defs.h>	/* _ILP32 */
 #include "libm.h"
--- old/usr/src/lib/libm/common/m9x/lrintl.c	2014-11-25 12:58:50.984112045 -0500
+++ new/usr/src/lib/libm/common/m9x/lrintl.c	2014-11-25 12:58:50.996936114 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak lrintl = __lrintl
-#endif
+#pragma weak __lrintl = lrintl
 
 #include <sys/isa_defs.h>	/* _ILP32 */
 #include "libm.h"
--- old/usr/src/lib/libm/common/m9x/lround.c	2014-11-25 12:58:51.395522623 -0500
+++ new/usr/src/lib/libm/common/m9x/lround.c	2014-11-25 12:58:51.407120809 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak lround = __lround
-#endif
+#pragma weak __lround = lround
 
 /*
  * lround(x) rounds its argument to the nearest integer, rounding ties
--- old/usr/src/lib/libm/common/m9x/lroundf.c	2014-11-25 12:58:51.811908028 -0500
+++ new/usr/src/lib/libm/common/m9x/lroundf.c	2014-11-25 12:58:51.823896565 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak lroundf = __lroundf
-#endif
+#pragma weak __lroundf = lroundf
 
 #include <sys/isa_defs.h>	/* _ILP32 */
 #include "libm.h"
--- old/usr/src/lib/libm/common/m9x/lroundl.c	2014-11-25 12:58:52.238739285 -0500
+++ new/usr/src/lib/libm/common/m9x/lroundl.c	2014-11-25 12:58:52.251846545 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak lroundl = __lroundl
-#endif
+#pragma weak __lroundl = lroundl
 
 #include <sys/isa_defs.h>	/* _ILP32 */
 #include "libm.h"
--- old/usr/src/lib/libm/common/m9x/modf.c	2014-11-25 12:58:52.683310550 -0500
+++ new/usr/src/lib/libm/common/m9x/modf.c	2014-11-25 12:58:52.694768301 -0500
@@ -27,10 +27,8 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
 #pragma weak modf = __modf
 #pragma weak _modf = __modf
-#endif
 
 /*
  * modf(x, iptr) decomposes x into an integral part and a fractional
--- old/usr/src/lib/libm/common/m9x/modff.c	2014-11-25 12:58:53.090750616 -0500
+++ new/usr/src/lib/libm/common/m9x/modff.c	2014-11-25 12:58:53.103067967 -0500
@@ -27,10 +27,8 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
 #pragma weak modff = __modff
 #pragma weak _modff = __modff
-#endif
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/m9x/modfl.c	2014-11-25 12:58:53.492117984 -0500
+++ new/usr/src/lib/libm/common/m9x/modfl.c	2014-11-25 12:58:53.508388467 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
 #pragma weak modfl = __modfl
-#endif
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/m9x/nan.c	2014-11-25 12:58:53.966799938 -0500
+++ new/usr/src/lib/libm/common/m9x/nan.c	2014-11-25 12:58:53.978538918 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
 #pragma weak nan = __nan
-#endif
 
 /*
  *  nan(c) returns a NaN.  This implementation ignores c.
--- old/usr/src/lib/libm/common/m9x/nanf.c	2014-11-25 12:58:54.611863161 -0500
+++ new/usr/src/lib/libm/common/m9x/nanf.c	2014-11-25 12:58:54.632912400 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
 #pragma weak nanf = __nanf
-#endif
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/m9x/nanl.c	2014-11-25 12:58:55.408900041 -0500
+++ new/usr/src/lib/libm/common/m9x/nanl.c	2014-11-25 12:58:55.426270252 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
 #pragma weak nanl = __nanl
-#endif
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/m9x/nearbyint.c	2014-11-25 12:58:55.890125224 -0500
+++ new/usr/src/lib/libm/common/m9x/nearbyint.c	2014-11-25 12:58:55.901822969 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
 #pragma weak nearbyint = __nearbyint
-#endif
 
 /*
  * nearbyint(x) returns the nearest fp integer to x in the direction
@@ -41,7 +39,6 @@
  */
 
 #include "libm.h"
-#include "fenv_synonyms.h"
 #include <fenv.h>
 
 double
--- old/usr/src/lib/libm/common/m9x/nearbyintf.c	2014-11-25 12:58:56.301765063 -0500
+++ new/usr/src/lib/libm/common/m9x/nearbyintf.c	2014-11-25 12:58:56.313421806 -0500
@@ -27,12 +27,9 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
 #pragma weak nearbyintf = __nearbyintf
-#endif
 
 #include "libm.h"
-#include "fenv_synonyms.h"
 #include <fenv.h>
 
 float
--- old/usr/src/lib/libm/common/m9x/nearbyintl.c	2014-11-25 12:58:56.723409996 -0500
+++ new/usr/src/lib/libm/common/m9x/nearbyintl.c	2014-11-25 12:58:56.734963313 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
 #pragma weak nearbyintl = __nearbyintl
-#endif
 
 #include "libm.h"
 #include "fma.h"
--- old/usr/src/lib/libm/common/m9x/nexttoward.c	2014-11-25 12:58:57.223540004 -0500
+++ new/usr/src/lib/libm/common/m9x/nexttoward.c	2014-11-25 12:58:57.234889516 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
 #pragma weak nexttoward = __nexttoward
-#endif
 
 /*
  * nexttoward(x, y) delivers the next representable number after x
--- old/usr/src/lib/libm/common/m9x/nexttowardf.c	2014-11-25 12:58:57.715135540 -0500
+++ new/usr/src/lib/libm/common/m9x/nexttowardf.c	2014-11-25 12:58:57.738381870 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
 #pragma weak nexttowardf = __nexttowardf
-#endif
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/m9x/nexttowardl.c	2014-11-25 12:58:58.149857965 -0500
+++ new/usr/src/lib/libm/common/m9x/nexttowardl.c	2014-11-25 12:58:58.161300272 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak nexttowardl = __nexttowardl
-#endif
+#pragma weak __nexttowardl = nexttowardl
 
 #include "libm.h"
 #include <float.h>		/* LDBL_MAX, LDBL_MIN */
--- old/usr/src/lib/libm/common/m9x/remquo.c	2014-11-25 12:58:58.616887274 -0500
+++ new/usr/src/lib/libm/common/m9x/remquo.c	2014-11-25 12:58:58.628564647 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak remquo = __remquo
+#pragma weak __remquo = remquo
 
 /* INDENT OFF */
 /*
@@ -40,7 +40,6 @@
 /* INDENT ON */
 
 #include "libm.h"
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 #include <math.h>		/* fabs() */
 #include <sys/isa_defs.h>
--- old/usr/src/lib/libm/common/m9x/remquof.c	2014-11-25 12:58:59.131441436 -0500
+++ new/usr/src/lib/libm/common/m9x/remquof.c	2014-11-25 12:58:59.142962905 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak remquof = __remquof
+#pragma weak __remquof = remquof
 
 /* INDENT OFF */
 /*
@@ -39,7 +39,6 @@
  */
 
 #include "libm.h"
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 #include <math.h>
 extern float fabsf(float);
--- old/usr/src/lib/libm/common/m9x/remquol.c	2014-11-25 12:58:59.685108203 -0500
+++ new/usr/src/lib/libm/common/m9x/remquol.c	2014-11-25 12:58:59.696796657 -0500
@@ -27,10 +27,9 @@
  * Use is subject to license terms.
  */
 
-#pragma weak remquol = __remquol
+#pragma weak __remquol = remquol
 
 #include "libm.h"
-#include "libm_synonyms.h"
 #if defined(__SUNPRO_C)
 #include <sunmath.h>			/* fabsl */
 #endif
--- old/usr/src/lib/libm/common/m9x/round.c	2014-11-25 12:59:00.111207894 -0500
+++ new/usr/src/lib/libm/common/m9x/round.c	2014-11-25 12:59:00.122727508 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak round = __round
-#endif
+#pragma weak __round = round
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/m9x/roundf.c	2014-11-25 12:59:00.515674747 -0500
+++ new/usr/src/lib/libm/common/m9x/roundf.c	2014-11-25 12:59:00.527137728 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak roundf = __roundf
-#endif
+#pragma weak __roundf = roundf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/m9x/roundl.c	2014-11-25 12:59:00.933231683 -0500
+++ new/usr/src/lib/libm/common/m9x/roundl.c	2014-11-25 12:59:00.944742065 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak roundl = __roundl
-#endif
+#pragma weak __roundl = roundl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/m9x/scalbln.c	2014-11-25 12:59:01.365871621 -0500
+++ new/usr/src/lib/libm/common/m9x/scalbln.c	2014-11-25 12:59:01.377209887 -0500
@@ -27,15 +27,13 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak scalbln = __scalbln
-#endif
+#pragma weak __scalbln = scalbln
 
 #include "libm.h"
 #include <float.h>		/* DBL_MAX, DBL_MIN */
 
 static const double twom54 = 5.5511151231257827021181583404541015625e-17;
-#if defined(USE_FPSCALE) || defined(__x86)
+#if defined(__x86)
 static const double two52 = 4503599627370496.0;
 #else
 /*
@@ -69,7 +67,7 @@
 	px[LOWORD] = w;
 	return (1 - s);
 }
-#endif	/* defined(USE_FPSCALE) */
+#endif	/* defined(__x86) */
 
 double
 scalbln(double x, long n) {
@@ -87,7 +85,7 @@
 	if ((px[LOWORD] | ix) == 0 || n == 0)
 		return (x);
 	if (k == 0) {
-#if defined(USE_FPSCALE) || defined(__x86)
+#if defined(__x86)
 		x *= two52;
 		k = ((px[HIWORD] & ~0x80000000) >> 20) - 52;
 #else
--- old/usr/src/lib/libm/common/m9x/scalblnf.c	2014-11-25 12:59:01.775428995 -0500
+++ new/usr/src/lib/libm/common/m9x/scalblnf.c	2014-11-25 12:59:01.786951427 -0500
@@ -27,15 +27,13 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak scalblnf = __scalblnf
-#endif
+#pragma weak __scalblnf = scalblnf
 
 #include "libm.h"
 #include <float.h>		/* FLT_MAX, FLT_MIN */
 
 static const float twom25f = 2.98023223876953125e-8F;
-#if defined(USE_FPSCALE) || defined(__x86)
+#if defined(__x86)
 static const float two23f = 8388608.0F;
 #else
 /*
@@ -54,7 +52,7 @@
 	v <<= 1;
 	return (r + ((0xffffaa50 >> v) & 0x3));
 }
-#endif	/* defined(USE_FPSCALE) */
+#endif	/* defined(__x86) */
 
 float
 scalblnf(float x, long n) {
@@ -71,7 +69,7 @@
 	if (ix == 0 || n == 0)
 		return (x);
 	if (k == 0) {
-#if defined(USE_FPSCALE) || defined(__x86)
+#if defined(__x86)
 		x *= two23f;
 		k = ((*px & ~0x80000000) >> 23) - 23;
 #else
--- old/usr/src/lib/libm/common/m9x/scalblnl.c	2014-11-25 12:59:02.184911521 -0500
+++ new/usr/src/lib/libm/common/m9x/scalblnl.c	2014-11-25 12:59:02.196107519 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak scalblnl = __scalblnl
-#endif
+#pragma weak __scalblnl = scalblnl
 
 #include "libm.h"
 #include <float.h>		/* LDBL_MAX, LDBL_MIN */
--- old/usr/src/lib/libm/common/m9x/tgamma.c	2014-11-25 12:59:02.589812942 -0500
+++ new/usr/src/lib/libm/common/m9x/tgamma.c	2014-11-25 12:59:02.601796205 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak tgamma = __tgamma
-#endif
+#pragma weak __tgamma = tgamma
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/m9x/tgammaf.c	2014-11-25 12:59:03.124561762 -0500
+++ new/usr/src/lib/libm/common/m9x/tgammaf.c	2014-11-25 12:59:03.136324518 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak tgammaf = __tgammaf
+#pragma weak __tgammaf = tgammaf
 
 /*
  * True gamma function
@@ -40,7 +40,6 @@
  */
 
 #include "libm.h"
-#include "libm_synonyms.h"
 #include <math.h>
 #if defined(__SUNPRO_C)
 #include <sunmath.h>
--- old/usr/src/lib/libm/common/m9x/tgammal.c	2014-11-25 12:59:03.587828089 -0500
+++ new/usr/src/lib/libm/common/m9x/tgammal.c	2014-11-25 12:59:03.599458721 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak tgammal = __tgammal
-#endif
+#pragma weak __tgammal = tgammal
 
 #include "libm.h"
 #include <sys/isa_defs.h>
--- old/usr/src/lib/libm/common/m9x/trunc.c	2014-11-25 12:59:04.090048159 -0500
+++ new/usr/src/lib/libm/common/m9x/trunc.c	2014-11-25 12:59:04.101469916 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak trunc = __trunc
-#endif
+#pragma weak __trunc = trunc
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/m9x/truncf.c	2014-11-25 12:59:05.209713134 -0500
+++ new/usr/src/lib/libm/common/m9x/truncf.c	2014-11-25 12:59:05.221762097 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak truncf = __truncf
-#endif
+#pragma weak __truncf = truncf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/m9x/truncl.c	2014-11-25 12:59:05.613115621 -0500
+++ new/usr/src/lib/libm/common/m9x/truncl.c	2014-11-25 12:59:05.624724509 -0500
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
-#pragma weak truncl = __truncl
-#endif
+#pragma weak __truncl = truncl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/mapfile-vers	2014-11-25 12:59:06.036925341 -0500
+++ new/usr/src/lib/libm/common/mapfile-vers	2014-11-25 12:59:06.048730052 -0500
@@ -234,12 +234,21 @@
 		__lgammaf_r;			#LSARC/2003/279
 		__lgammal;
 		__lgammal_r;			#LSARC/2003/279
+$if amd64 || sparcv9
+		__llrint	{ FLAGS = NODYNSORT };
+		__llrintf	{ FLAGS = NODYNSORT };
+		__llrintl	{ FLAGS = NODYNSORT };
+		__llround	{ FLAGS = NODYNSORT };
+		__llroundf	{ FLAGS = NODYNSORT };
+		__llroundl	{ FLAGS = NODYNSORT };
+$else
 		__llrint;
 		__llrintf;
 		__llrintl;
 		__llround;
 		__llroundf;
 		__llroundl;
+$endif
 		__log1pf;
 		__log1pl;
 		__log2;
@@ -709,7 +718,7 @@
 		log10;
 		log1p;
 		logb;
-		matherr;
+		matherr { FLAGS = NODIRECT };
 		nextafter;
 		pow;
 		remainder;
--- old/usr/src/lib/libm/i386/src/__reduction.s	2014-11-25 12:59:06.570762503 -0500
+++ new/usr/src/lib/libm/i386/src/__reduction.s	2014-11-25 12:59:06.582511179 -0500
@@ -39,9 +39,7 @@
 /     ----------------------------------------------------------
 
 #include "libm.h"
-#include "libm_synonyms.h"
 #include "libm_protos.h"
-#undef fabs
 
 	ENTRY(__reduction)
 #ifndef PIC
--- old/usr/src/lib/libm/i386/src/acos.s	2014-11-25 12:59:06.985716490 -0500
+++ new/usr/src/lib/libm/i386/src/acos.s	2014-11-25 12:59:06.998396973 -0500
@@ -30,11 +30,8 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(acos,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
-#undef fabs
-
 	ENTRY(acos)
 	fldl	4(%esp)			/ push x
 	fld1				/ push 1
--- old/usr/src/lib/libm/i386/src/acosf.s	2014-11-25 12:59:07.393961359 -0500
+++ new/usr/src/lib/libm/i386/src/acosf.s	2014-11-25 12:59:07.405373223 -0500
@@ -30,11 +30,8 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(acosf,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
-#undef fabs
-
 	ENTRY(acosf)
 	flds	4(%esp)			/ push x
 	fld1				/ push 1
--- old/usr/src/lib/libm/i386/src/acosl.s	2014-11-25 12:59:07.797343610 -0500
+++ new/usr/src/lib/libm/i386/src/acosl.s	2014-11-25 12:59:07.808750326 -0500
@@ -30,9 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(acosl,function)
-#include "libm_synonyms.h"
-
-#undef fabs
 
 	ENTRY(acosl)
 	fldt	4(%esp)			/ push x
--- old/usr/src/lib/libm/i386/src/asin.s	2014-11-25 12:59:08.203327918 -0500
+++ new/usr/src/lib/libm/i386/src/asin.s	2014-11-25 12:59:08.215125156 -0500
@@ -30,11 +30,8 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(asin,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
-#undef fabs
-
 	ENTRY(asin)
 	fldl	4(%esp)			/ push x
 	fld1				/ push 1
--- old/usr/src/lib/libm/i386/src/asinf.s	2014-11-25 12:59:08.606312445 -0500
+++ new/usr/src/lib/libm/i386/src/asinf.s	2014-11-25 12:59:08.617631832 -0500
@@ -30,11 +30,8 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(asinf,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
-#undef fabs
-
 	ENTRY(asinf)
 	flds	4(%esp)			/ push x
 	fld1				/ push 1
--- old/usr/src/lib/libm/i386/src/asinl.s	2014-11-25 12:59:09.011700997 -0500
+++ new/usr/src/lib/libm/i386/src/asinl.s	2014-11-25 12:59:09.023287335 -0500
@@ -30,9 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(asinl,function)
-#include "libm_synonyms.h"
-
-#undef fabs
 
 	ENTRY(asinl)
 	fldt	4(%esp)			/ push x
--- old/usr/src/lib/libm/i386/src/atan.s	2014-11-25 12:59:09.572271794 -0500
+++ new/usr/src/lib/libm/i386/src/atan.s	2014-11-25 12:59:09.591744720 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(atan,function)
-#include "libm_synonyms.h"
 
 	ENTRY(atan)
 	fldl	4(%esp)			/ push arg
--- old/usr/src/lib/libm/i386/src/atan2.s	2014-11-25 12:59:10.018938125 -0500
+++ new/usr/src/lib/libm/i386/src/atan2.s	2014-11-25 12:59:10.030376890 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(atan2,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
 	ENTRY(atan2)
--- old/usr/src/lib/libm/i386/src/atan2f.s	2014-11-25 12:59:10.421015525 -0500
+++ new/usr/src/lib/libm/i386/src/atan2f.s	2014-11-25 12:59:10.432694935 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(atan2f,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
 	ENTRY(atan2f)
--- old/usr/src/lib/libm/i386/src/atan2l.s	2014-11-25 12:59:10.821655835 -0500
+++ new/usr/src/lib/libm/i386/src/atan2l.s	2014-11-25 12:59:10.833184708 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(atan2l,function)
-#include "libm_synonyms.h"
 
 	ENTRY(atan2l)
 	fldt	4(%esp)			/ push y
--- old/usr/src/lib/libm/i386/src/atanl.s	2014-11-25 12:59:11.223396958 -0500
+++ new/usr/src/lib/libm/i386/src/atanl.s	2014-11-25 12:59:11.234902412 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(atanl,function)
-#include "libm_synonyms.h"
 
 	ENTRY(atanl)
 	fldt	4(%esp)			/ push arg
--- old/usr/src/lib/libm/i386/src/ceil.s	2014-11-25 12:59:11.624526240 -0500
+++ new/usr/src/lib/libm/i386/src/ceil.s	2014-11-25 12:59:11.636152628 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(ceil,function)
-#include "libm_synonyms.h"
 
 	ENTRY(ceil)
 	subl	$8,%esp
--- old/usr/src/lib/libm/i386/src/copysign.s	2014-11-25 12:59:12.028527860 -0500
+++ new/usr/src/lib/libm/i386/src/copysign.s	2014-11-25 12:59:12.039876607 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(copysign,function)
-#include "libm_synonyms.h"
 
 	ENTRY(copysign)
 	movl    8(%esp),%eax		/ eax <-- hi_32(x)
--- old/usr/src/lib/libm/i386/src/copysignf.s	2014-11-25 12:59:12.430639165 -0500
+++ new/usr/src/lib/libm/i386/src/copysignf.s	2014-11-25 12:59:12.442119864 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(copysignf,function)
-#include "libm_synonyms.h"
 
 	ENTRY(copysignf)
 	movl    4(%esp),%eax		/ eax <-- x
--- old/usr/src/lib/libm/i386/src/copysignl.s	2014-11-25 12:59:12.863279998 -0500
+++ new/usr/src/lib/libm/i386/src/copysignl.s	2014-11-25 12:59:12.874621112 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(copysignl,function)
-#include "libm_synonyms.h"
 
 	ENTRY(copysignl)
 	movl    12(%esp),%eax		/ sign and bexp of x
--- old/usr/src/lib/libm/i386/src/cos.s	2014-11-25 12:59:13.270021668 -0500
+++ new/usr/src/lib/libm/i386/src/cos.s	2014-11-25 12:59:13.281744053 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(cos,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
 	ENTRY(cos)
--- old/usr/src/lib/libm/i386/src/exp.s	2014-11-25 12:59:13.669664183 -0500
+++ new/usr/src/lib/libm/i386/src/exp.s	2014-11-25 12:59:13.681130632 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(exp,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
 	ENTRY(exp)
--- old/usr/src/lib/libm/i386/src/exp10.s	2014-11-25 12:59:14.085996416 -0500
+++ new/usr/src/lib/libm/i386/src/exp10.s	2014-11-25 12:59:14.097449436 -0500
@@ -29,8 +29,6 @@
         .file "exp10.s"
 
 #include "libm.h"
-LIBM_ANSI_PRAGMA_WEAK(exp10,function)
-#include "libm_synonyms.h"
 
 	ENTRY(exp10)
 	movl	8(%esp),%ecx		/ ecx <-- hi_32(x)
--- old/usr/src/lib/libm/i386/src/exp10f.s	2014-11-25 12:59:14.898376690 -0500
+++ new/usr/src/lib/libm/i386/src/exp10f.s	2014-11-25 12:59:14.910056636 -0500
@@ -29,8 +29,6 @@
         .file "exp10f.s"
 
 #include "libm.h"
-LIBM_ANSI_PRAGMA_WEAK(exp10f,function)
-#include "libm_synonyms.h"
 
 	ENTRY(exp10f)
 	movl	4(%esp),%ecx		/ ecx <-- x
--- old/usr/src/lib/libm/i386/src/exp10l.s	2014-11-25 12:59:15.307114682 -0500
+++ new/usr/src/lib/libm/i386/src/exp10l.s	2014-11-25 12:59:15.319175291 -0500
@@ -29,8 +29,6 @@
         .file "exp10l.s"
 
 #include "libm.h"
-LIBM_ANSI_PRAGMA_WEAK(exp10l,function)
-#include "libm_synonyms.h"
 
 	.data
 	.align	4
--- old/usr/src/lib/libm/i386/src/exp2.s	2014-11-25 12:59:15.730288763 -0500
+++ new/usr/src/lib/libm/i386/src/exp2.s	2014-11-25 12:59:15.755060411 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(exp2,function)
-#include "libm_synonyms.h"
 
 	ENTRY(exp2)
 	movl	8(%esp),%ecx		/ ecx <-- hi_32(x)
--- old/usr/src/lib/libm/i386/src/exp2f.s	2014-11-25 12:59:16.150519514 -0500
+++ new/usr/src/lib/libm/i386/src/exp2f.s	2014-11-25 12:59:16.162071516 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(exp2f,function)
-#include "libm_synonyms.h"
 
 	ENTRY(exp2f)
 	movl	4(%esp),%ecx		/ ecx <-- x
--- old/usr/src/lib/libm/i386/src/exp2l.s	2014-11-25 12:59:16.556344436 -0500
+++ new/usr/src/lib/libm/i386/src/exp2l.s	2014-11-25 12:59:16.567817614 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(exp2l,function)
-#include "libm_synonyms.h"
 
 	ENTRY(exp2l)
 	movl	12(%esp),%ecx		/ cx <--sign&bexp(x)
--- old/usr/src/lib/libm/i386/src/expl.s	2014-11-25 12:59:16.962190270 -0500
+++ new/usr/src/lib/libm/i386/src/expl.s	2014-11-25 12:59:16.973668648 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(expl,function)
-#include "libm_synonyms.h"
 
 	.data
 	.align	4
--- old/usr/src/lib/libm/i386/src/expm1.s	2014-11-25 12:59:17.371978379 -0500
+++ new/usr/src/lib/libm/i386/src/expm1.s	2014-11-25 12:59:17.383519678 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(expm1,function)
-#include "libm_synonyms.h"
 
 	.data
 	.align	4
--- old/usr/src/lib/libm/i386/src/expm1f.s	2014-11-25 12:59:17.779114386 -0500
+++ new/usr/src/lib/libm/i386/src/expm1f.s	2014-11-25 12:59:17.790979840 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(expm1f,function)
-#include "libm_synonyms.h"
 
 	.data
 	.align	4
--- old/usr/src/lib/libm/i386/src/expm1l.s	2014-11-25 12:59:18.190545593 -0500
+++ new/usr/src/lib/libm/i386/src/expm1l.s	2014-11-25 12:59:18.201984029 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(expm1l,function)
-#include "libm_synonyms.h"
 
 	.data
 	.align	4
--- old/usr/src/lib/libm/i386/src/fabs.s	2014-11-25 12:59:18.617791881 -0500
+++ new/usr/src/lib/libm/i386/src/fabs.s	2014-11-25 12:59:18.629140301 -0500
@@ -30,11 +30,9 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(fabs,function)
-#include "libm_synonyms.h"
 
 	ENTRY(fabs)
 	fldl    4(%esp)
-#undef	fabs
 	fabs
 	ret
 	.align	4
--- old/usr/src/lib/libm/i386/src/fabsf.s	2014-11-25 12:59:19.034103466 -0500
+++ new/usr/src/lib/libm/i386/src/fabsf.s	2014-11-25 12:59:19.045628698 -0500
@@ -30,11 +30,9 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(fabsf,function)
-#include "libm_synonyms.h"
 
 	ENTRY(fabsf)
 	flds    4(%esp)
-#undef	fabs
 	fabs
 	ret
 	.align	4
--- old/usr/src/lib/libm/i386/src/fabsl.s	2014-11-25 12:59:19.704218266 -0500
+++ new/usr/src/lib/libm/i386/src/fabsl.s	2014-11-25 12:59:19.715960958 -0500
@@ -30,11 +30,9 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(fabsl,function)
-#include "libm_synonyms.h"
 
 	ENTRY(fabsl)
 	fldt    4(%esp)
-#undef	fabs
 	fabs
 	ret
 	.align	4
--- old/usr/src/lib/libm/i386/src/finitef.s	2014-11-25 12:59:20.116988541 -0500
+++ new/usr/src/lib/libm/i386/src/finitef.s	2014-11-25 12:59:20.128444379 -0500
@@ -29,8 +29,6 @@
         .file "finitef.s"
 
 #include "libm.h"
-LIBM_ANSI_PRAGMA_WEAK(finitef,function)
-#include "libm_synonyms.h"
 
 	ENTRY(finitef)
         movl    4(%esp),%eax		/ eax <-- x
--- old/usr/src/lib/libm/i386/src/finitel.s	2014-11-25 12:59:20.518106918 -0500
+++ new/usr/src/lib/libm/i386/src/finitel.s	2014-11-25 12:59:20.529615173 -0500
@@ -29,8 +29,6 @@
         .file "finitel.s"
 
 #include "libm.h"
-LIBM_ANSI_PRAGMA_WEAK(finitel,function)
-#include "libm_synonyms.h"
 
 	ENTRY(finitel)
 	movl    12(%esp),%eax		/ %ax <-- sign&bexp(x)
--- old/usr/src/lib/libm/i386/src/floor.s	2014-11-25 12:59:20.921955302 -0500
+++ new/usr/src/lib/libm/i386/src/floor.s	2014-11-25 12:59:20.933400614 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(floor,function)
-#include "libm_synonyms.h"
 
 	ENTRY(floor)
 	subl	$8,%esp
--- old/usr/src/lib/libm/i386/src/floorl.s	2014-11-25 12:59:21.328007660 -0500
+++ new/usr/src/lib/libm/i386/src/floorl.s	2014-11-25 12:59:21.339546324 -0500
@@ -31,7 +31,6 @@
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(ceill,function)
 LIBM_ANSI_PRAGMA_WEAK(floorl,function)
-#include "libm_synonyms.h"
 
 	ENTRY(ceill)
 	subl	$8,%esp
--- old/usr/src/lib/libm/i386/src/fmod.s	2014-11-25 12:59:21.763403619 -0500
+++ new/usr/src/lib/libm/i386/src/fmod.s	2014-11-25 12:59:21.775219543 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(fmod,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
 	ENTRY(fmod)
--- old/usr/src/lib/libm/i386/src/fmodf.s	2014-11-25 12:59:22.168555979 -0500
+++ new/usr/src/lib/libm/i386/src/fmodf.s	2014-11-25 12:59:22.181348981 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(fmodf,function)
-#include "libm_synonyms.h"
 
 	ENTRY(fmodf)
 	flds	8(%esp)			/ load arg y
--- old/usr/src/lib/libm/i386/src/fmodl.s	2014-11-25 12:59:22.594045194 -0500
+++ new/usr/src/lib/libm/i386/src/fmodl.s	2014-11-25 12:59:22.605639062 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(fmodl,function)
-#include "libm_synonyms.h"
 
 	ENTRY(fmodl)
 	fldt	16(%esp)		/ load arg y
--- old/usr/src/lib/libm/i386/src/hypot.s	2014-11-25 12:59:23.116239180 -0500
+++ new/usr/src/lib/libm/i386/src/hypot.s	2014-11-25 12:59:23.127708666 -0500
@@ -30,11 +30,8 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(hypot,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
-#undef fabs
-
 	.data
 	.align	4
 inf:
--- old/usr/src/lib/libm/i386/src/hypotf.s	2014-11-25 12:59:23.524966717 -0500
+++ new/usr/src/lib/libm/i386/src/hypotf.s	2014-11-25 12:59:23.536487236 -0500
@@ -30,11 +30,8 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(hypotf,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
-#undef fabs
-
 	ENTRY(hypotf)
 	movl	4(%esp),%eax		/ eax <-- x
 	andl	$0x7fffffff,%eax	/ eax <-- |x|
--- old/usr/src/lib/libm/i386/src/ieee_funcl.s	2014-11-25 12:59:23.935483164 -0500
+++ new/usr/src/lib/libm/i386/src/ieee_funcl.s	2014-11-25 12:59:23.958056254 -0500
@@ -29,12 +29,6 @@
         .file "ieee_funcl.s"
 
 #include "libm.h"
-LIBM_ANSI_PRAGMA_WEAK(isinfl,function)
-LIBM_ANSI_PRAGMA_WEAK(isnormall,function)
-LIBM_ANSI_PRAGMA_WEAK(issubnormall,function)
-LIBM_ANSI_PRAGMA_WEAK(iszerol,function)
-LIBM_ANSI_PRAGMA_WEAK(signbitl,function)
-#include "libm_synonyms.h"
 
 	ENTRY(isinfl)
 	movl	12(%esp),%eax		/ ax <-- sign and bexp of x 
--- old/usr/src/lib/libm/i386/src/ilogb.s	2014-11-25 12:59:24.698943003 -0500
+++ new/usr/src/lib/libm/i386/src/ilogb.s	2014-11-25 12:59:24.710644836 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(ilogb,function)
-#include "libm_synonyms.h"
 #include "xpg6.h"
 
 	.data
--- old/usr/src/lib/libm/i386/src/ilogbf.s	2014-11-25 12:59:25.120494762 -0500
+++ new/usr/src/lib/libm/i386/src/ilogbf.s	2014-11-25 12:59:25.131866138 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(ilogbf,function)
-#include "libm_synonyms.h"
 #include "xpg6.h"
 
 	.data
--- old/usr/src/lib/libm/i386/src/ilogbl.s	2014-11-25 12:59:25.645612909 -0500
+++ new/usr/src/lib/libm/i386/src/ilogbl.s	2014-11-25 12:59:25.657389844 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(ilogbl,function)
-#include "libm_synonyms.h"
 #include "xpg6.h"
 
 	.data
--- old/usr/src/lib/libm/i386/src/isnan.s	2014-11-25 12:59:26.254631612 -0500
+++ new/usr/src/lib/libm/i386/src/isnan.s	2014-11-25 12:59:26.266250824 -0500
@@ -39,7 +39,6 @@
 	.weak isnand
 	.type isnand,@function
 isnand	= __isnan
-#include "libm_synonyms.h"
 
 	ENTRY(isnan)
 	movl    8(%esp),%eax		/ eax <-- hi_32(x)
--- old/usr/src/lib/libm/i386/src/isnanf.s	2014-11-25 12:59:26.839240096 -0500
+++ new/usr/src/lib/libm/i386/src/isnanf.s	2014-11-25 12:59:26.850760909 -0500
@@ -33,7 +33,6 @@
 	.weak _isnanf
 	.type _isnanf,@function
 _isnanf	= __isnanf
-#include "libm_synonyms.h"
 
 	ENTRY(isnanf)
 	movl    4(%esp),%eax		/ eax <-- x
--- old/usr/src/lib/libm/i386/src/isnanl.s	2014-11-25 12:59:27.257511566 -0500
+++ new/usr/src/lib/libm/i386/src/isnanl.s	2014-11-25 12:59:27.268914009 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(isnanl,function)
-#include "libm_synonyms.h"
 
 	ENTRY(isnanl)
 	movl    12(%esp),%eax		/ ax <-- sign bit and exp
--- old/usr/src/lib/libm/i386/src/llrint.s	2014-11-25 12:59:27.696203465 -0500
+++ new/usr/src/lib/libm/i386/src/llrint.s	2014-11-25 12:59:27.708029015 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(llrint,function)
-#include "libm_synonyms.h"
 
 	ENTRY(llrint)
 	movl	%esp,%ecx
--- old/usr/src/lib/libm/i386/src/llrintf.s	2014-11-25 12:59:28.118290167 -0500
+++ new/usr/src/lib/libm/i386/src/llrintf.s	2014-11-25 12:59:28.129675417 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(llrintf,function)
-#include "libm_synonyms.h"
 
 	ENTRY(llrintf)
 	movl	%esp,%ecx
--- old/usr/src/lib/libm/i386/src/llrintl.s	2014-11-25 12:59:28.538709475 -0500
+++ new/usr/src/lib/libm/i386/src/llrintl.s	2014-11-25 12:59:28.550462295 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(llrintl,function)
-#include "libm_synonyms.h"
 
 	ENTRY(llrintl)
 	movl	%esp,%ecx
--- old/usr/src/lib/libm/i386/src/log.s	2014-11-25 12:59:28.940494585 -0500
+++ new/usr/src/lib/libm/i386/src/log.s	2014-11-25 12:59:28.952196549 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(log,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
 	ENTRY(log)
--- old/usr/src/lib/libm/i386/src/log10.s	2014-11-25 12:59:29.426123001 -0500
+++ new/usr/src/lib/libm/i386/src/log10.s	2014-11-25 12:59:29.438127014 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(log10,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
 	ENTRY(log10)
--- old/usr/src/lib/libm/i386/src/log10f.s	2014-11-25 12:59:29.956418858 -0500
+++ new/usr/src/lib/libm/i386/src/log10f.s	2014-11-25 12:59:29.975059425 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(log10f,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
 	ENTRY(log10f)
--- old/usr/src/lib/libm/i386/src/log10l.s	2014-11-25 12:59:30.464676341 -0500
+++ new/usr/src/lib/libm/i386/src/log10l.s	2014-11-25 12:59:30.476253989 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(log10l,function)
-#include "libm_synonyms.h"
 
 	ENTRY(log10l)
 	fldlg2	
--- old/usr/src/lib/libm/i386/src/log2.s	2014-11-25 12:59:30.950897535 -0500
+++ new/usr/src/lib/libm/i386/src/log2.s	2014-11-25 12:59:30.962349536 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(log2,function)
-#include "libm_synonyms.h"
 
 	ENTRY(log2)
 	fld1			/ push 1.0
--- old/usr/src/lib/libm/i386/src/log2f.s	2014-11-25 12:59:31.356028532 -0500
+++ new/usr/src/lib/libm/i386/src/log2f.s	2014-11-25 12:59:31.367584783 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(log2f,function)
-#include "libm_synonyms.h"
 
 	ENTRY(log2f)
 	fld1			/ push 1.0
--- old/usr/src/lib/libm/i386/src/log2l.s	2014-11-25 12:59:31.764480183 -0500
+++ new/usr/src/lib/libm/i386/src/log2l.s	2014-11-25 12:59:31.776134105 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(log2l,function)
-#include "libm_synonyms.h"
 
 	ENTRY(log2l)
 	fld1			/ push 1.0
--- old/usr/src/lib/libm/i386/src/logl.s	2014-11-25 12:59:32.169010047 -0500
+++ new/usr/src/lib/libm/i386/src/logl.s	2014-11-25 12:59:32.180521053 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(logl,function)
-#include "libm_synonyms.h"
 
 	ENTRY(logl)
 	fldln2	
--- old/usr/src/lib/libm/i386/src/lrint.s	2014-11-25 12:59:32.656222483 -0500
+++ new/usr/src/lib/libm/i386/src/lrint.s	2014-11-25 12:59:32.667687987 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(lrint,function)
-#include "libm_synonyms.h"
 
 	ENTRY(lrint)
 	movl	%esp,%ecx
--- old/usr/src/lib/libm/i386/src/lrintf.s	2014-11-25 12:59:33.156302203 -0500
+++ new/usr/src/lib/libm/i386/src/lrintf.s	2014-11-25 12:59:33.167936224 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(lrintf,function)
-#include "libm_synonyms.h"
 
 	ENTRY(lrintf)
 	movl	%esp,%ecx
--- old/usr/src/lib/libm/i386/src/lrintl.s	2014-11-25 12:59:33.570936538 -0500
+++ new/usr/src/lib/libm/i386/src/lrintl.s	2014-11-25 12:59:33.582481808 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(lrintl,function)
-#include "libm_synonyms.h"
 
 	ENTRY(lrintl)
 	movl	%esp,%ecx
--- old/usr/src/lib/libm/i386/src/lround.s	2014-11-25 12:59:33.992688194 -0500
+++ new/usr/src/lib/libm/i386/src/lround.s	2014-11-25 12:59:34.004175850 -0500
@@ -30,8 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(lround,function)
-#include "libm_synonyms.h"
-#undef fabs
 
 	.section .rodata
 	.align	4
--- old/usr/src/lib/libm/i386/src/lroundl.s	2014-11-25 12:59:34.644607142 -0500
+++ new/usr/src/lib/libm/i386/src/lroundl.s	2014-11-25 12:59:34.656430718 -0500
@@ -30,8 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(lroundl,function)
-#include "libm_synonyms.h"
-#undef fabs
 
 	.section .rodata
 	.align	4
--- old/usr/src/lib/libm/i386/src/nextafter.s	2014-11-25 12:59:35.050631158 -0500
+++ new/usr/src/lib/libm/i386/src/nextafter.s	2014-11-25 12:59:35.062082538 -0500
@@ -33,7 +33,6 @@
 	.weak _nextafter
 	.type _nextafter,@function
 _nextafter	= __nextafter
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
 	.data
--- old/usr/src/lib/libm/i386/src/nextafterf.s	2014-11-25 12:59:35.465101683 -0500
+++ new/usr/src/lib/libm/i386/src/nextafterf.s	2014-11-25 12:59:35.476501256 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(nextafterf,function)
-#include "libm_synonyms.h"
 
 	.data
 	.align	4
--- old/usr/src/lib/libm/i386/src/nextafterl.s	2014-11-25 12:59:35.872907316 -0500
+++ new/usr/src/lib/libm/i386/src/nextafterl.s	2014-11-25 12:59:35.884360908 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(nextafterl,function)
-#include "libm_synonyms.h"
 
 	.section .rodata
 	.align	4
--- old/usr/src/lib/libm/i386/src/nexttowardl.s	2014-11-25 12:59:36.287097716 -0500
+++ new/usr/src/lib/libm/i386/src/nexttowardl.s	2014-11-25 12:59:36.298678362 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(nexttowardl,function)
-#include "libm_synonyms.h"
 
 	.section .rodata
 	.align	4
--- old/usr/src/lib/libm/i386/src/pow.s	2014-11-25 12:59:36.872743411 -0500
+++ new/usr/src/lib/libm/i386/src/pow.s	2014-11-25 12:59:36.884300267 -0500
@@ -59,12 +59,9 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(pow,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 #include "xpg6.h"
 
-#undef fabs
-
 	.data
 	.align	4
 negzero:
--- old/usr/src/lib/libm/i386/src/powf.s	2014-11-25 12:59:37.308503130 -0500
+++ new/usr/src/lib/libm/i386/src/powf.s	2014-11-25 12:59:37.320143179 -0500
@@ -58,12 +58,9 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(powf,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 #include "xpg6.h"
 
-#undef fabs
-
 	.data
 	.align	4
 negzero:
--- old/usr/src/lib/libm/i386/src/powl.s	2014-11-25 12:59:37.737993328 -0500
+++ new/usr/src/lib/libm/i386/src/powl.s	2014-11-25 12:59:37.751104092 -0500
@@ -55,11 +55,8 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(powl,function)
-#include "libm_synonyms.h"
 #include "xpg6.h"
 
-#undef fabs
-
 	.data
 	.align	4
 negzero:
--- old/usr/src/lib/libm/i386/src/remainder.s	2014-11-25 12:59:38.171361778 -0500
+++ new/usr/src/lib/libm/i386/src/remainder.s	2014-11-25 12:59:38.182771334 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(remainder,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
 	ENTRY(remainder)
--- old/usr/src/lib/libm/i386/src/remainderf.s	2014-11-25 12:59:38.578308119 -0500
+++ new/usr/src/lib/libm/i386/src/remainderf.s	2014-11-25 12:59:38.589730296 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(remainderf,function)
-#include "libm_synonyms.h"
 
 	ENTRY(remainderf)
 	flds	8(%esp)			/ load arg y
--- old/usr/src/lib/libm/i386/src/remainderl.s	2014-11-25 12:59:38.980005381 -0500
+++ new/usr/src/lib/libm/i386/src/remainderl.s	2014-11-25 12:59:38.992696117 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(remainderl,function)
-#include "libm_synonyms.h"
 
 	ENTRY(remainderl)
 	fldt	16(%esp)		/ load arg y
--- old/usr/src/lib/libm/i386/src/remquo.s	2014-11-25 12:59:39.654953156 -0500
+++ new/usr/src/lib/libm/i386/src/remquo.s	2014-11-25 12:59:39.977457782 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(remquo,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
 	ENTRY(remquo)
--- old/usr/src/lib/libm/i386/src/remquof.s	2014-11-25 12:59:40.378660703 -0500
+++ new/usr/src/lib/libm/i386/src/remquof.s	2014-11-25 12:59:40.390268658 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(remquof,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
 	ENTRY(remquof)
--- old/usr/src/lib/libm/i386/src/remquol.s	2014-11-25 12:59:40.783765315 -0500
+++ new/usr/src/lib/libm/i386/src/remquol.s	2014-11-25 12:59:40.795358854 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(remquol,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
 	ENTRY(remquol)
--- old/usr/src/lib/libm/i386/src/rint.s	2014-11-25 12:59:41.191283260 -0500
+++ new/usr/src/lib/libm/i386/src/rint.s	2014-11-25 12:59:41.202708293 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(rint,function)
-#include "libm_synonyms.h"
 
 	ENTRY(rint)
 	fldl	4(%esp)			/ load x
--- old/usr/src/lib/libm/i386/src/rintf.s	2014-11-25 12:59:41.594928687 -0500
+++ new/usr/src/lib/libm/i386/src/rintf.s	2014-11-25 12:59:41.606344365 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(rintf,function)
-#include "libm_synonyms.h"
 
 	ENTRY(rintf)
 	flds	4(%esp)			/ load x
--- old/usr/src/lib/libm/i386/src/rintl.s	2014-11-25 12:59:42.000000057 -0500
+++ new/usr/src/lib/libm/i386/src/rintl.s	2014-11-25 12:59:42.013162242 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(rintl,function)
-#include "libm_synonyms.h"
 
 	ENTRY(rintl)
 	fldt	4(%esp)			/ load x
--- old/usr/src/lib/libm/i386/src/rndintl.s	2014-11-25 12:59:42.402870225 -0500
+++ new/usr/src/lib/libm/i386/src/rndintl.s	2014-11-25 12:59:42.414184794 -0500
@@ -29,12 +29,6 @@
         .file "rndintl.s"
 
 #include "libm.h"
-LIBM_ANSI_PRAGMA_WEAK(aintl,function)
-LIBM_ANSI_PRAGMA_WEAK(irintl,function)
-LIBM_ANSI_PRAGMA_WEAK(anintl,function)
-LIBM_ANSI_PRAGMA_WEAK(nintl,function)
-#include "libm_synonyms.h"
-#undef fabs
 
 	ENTRY(aintl)
 	movl	%esp,%eax
--- old/usr/src/lib/libm/i386/src/round.s	2014-11-25 12:59:42.842567481 -0500
+++ new/usr/src/lib/libm/i386/src/round.s	2014-11-25 12:59:42.853939338 -0500
@@ -30,8 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(round,function)
-#include "libm_synonyms.h"
-#undef fabs
 
 	.section .rodata
 	.align	4
--- old/usr/src/lib/libm/i386/src/roundl.s	2014-11-25 12:59:43.252331701 -0500
+++ new/usr/src/lib/libm/i386/src/roundl.s	2014-11-25 12:59:43.263785012 -0500
@@ -30,8 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(roundl,function)
-#include "libm_synonyms.h"
-#undef fabs
 
 	.section .rodata
 	.align	4
--- old/usr/src/lib/libm/i386/src/scalbln.s	2014-11-25 12:59:43.655631805 -0500
+++ new/usr/src/lib/libm/i386/src/scalbln.s	2014-11-25 12:59:43.666972483 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(scalbln,function)
-#include "libm_synonyms.h"
 
 	ENTRY(scalbln)
 	fildl	12(%esp)		/ convert N to extended
--- old/usr/src/lib/libm/i386/src/scalblnf.s	2014-11-25 12:59:44.062431359 -0500
+++ new/usr/src/lib/libm/i386/src/scalblnf.s	2014-11-25 12:59:44.073766122 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(scalblnf,function)
-#include "libm_synonyms.h"
 
 	ENTRY(scalblnf)
 	fildl	8(%esp)			/ convert N to extended
--- old/usr/src/lib/libm/i386/src/scalblnl.s	2014-11-25 12:59:44.991406868 -0500
+++ new/usr/src/lib/libm/i386/src/scalblnl.s	2014-11-25 12:59:45.003364393 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(scalblnl,function)
-#include "libm_synonyms.h"
 
 	ENTRY(scalblnl)
 	fildl	16(%esp)		/ convert 32-bit integer N
--- old/usr/src/lib/libm/i386/src/scalbn.s	2014-11-25 12:59:45.394881718 -0500
+++ new/usr/src/lib/libm/i386/src/scalbn.s	2014-11-25 12:59:45.406471966 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(scalbn,function)
-#include "libm_synonyms.h"
 
 	ENTRY(scalbn)
 	fildl	12(%esp)		/ convert N to extended
--- old/usr/src/lib/libm/i386/src/scalbnf.s	2014-11-25 12:59:45.826118246 -0500
+++ new/usr/src/lib/libm/i386/src/scalbnf.s	2014-11-25 12:59:45.837527576 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(scalbnf,function)
-#include "libm_synonyms.h"
 
 	ENTRY(scalbnf)
 	fildl	8(%esp)			/ convert N to extended
--- old/usr/src/lib/libm/i386/src/scalbnl.s	2014-11-25 12:59:46.228536324 -0500
+++ new/usr/src/lib/libm/i386/src/scalbnl.s	2014-11-25 12:59:46.241304787 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(scalbnl,function)
-#include "libm_synonyms.h"
 
 	ENTRY(scalbnl)
 	fildl	16(%esp)		/ convert 32-bit integer N
--- old/usr/src/lib/libm/i386/src/sin.s	2014-11-25 12:59:46.634983062 -0500
+++ new/usr/src/lib/libm/i386/src/sin.s	2014-11-25 12:59:46.646599729 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(sin,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
 	ENTRY(sin)
--- old/usr/src/lib/libm/i386/src/sincos.s	2014-11-25 12:59:47.039138576 -0500
+++ new/usr/src/lib/libm/i386/src/sincos.s	2014-11-25 12:59:47.050775090 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(sincos,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
 	ENTRY(sincos)
--- old/usr/src/lib/libm/i386/src/sqrtl.s	2014-11-25 12:59:47.442356112 -0500
+++ new/usr/src/lib/libm/i386/src/sqrtl.s	2014-11-25 12:59:47.454054822 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(sqrtl,function)
-#include "libm_synonyms.h"
 
 	ENTRY(sqrtl)
 	fldt	4(%esp)
--- old/usr/src/lib/libm/i386/src/tan.s	2014-11-25 12:59:47.847857074 -0500
+++ new/usr/src/lib/libm/i386/src/tan.s	2014-11-25 12:59:47.859448215 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(tan,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
 	ENTRY(tan)
--- old/usr/src/lib/libm/i386/src/trunc.s	2014-11-25 12:59:48.252731136 -0500
+++ new/usr/src/lib/libm/i386/src/trunc.s	2014-11-25 12:59:48.264275009 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(trunc,function)
-#include "libm_synonyms.h"
 
 	ENTRY(trunc)
 	movl	%esp,%eax
--- old/usr/src/lib/libm/i386/src/truncl.s	2014-11-25 12:59:48.674808837 -0500
+++ new/usr/src/lib/libm/i386/src/truncl.s	2014-11-25 12:59:48.686263697 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(truncl,function)
-#include "libm_synonyms.h"
 
 	ENTRY(truncl)
 	movl	%esp,%eax
--- old/usr/src/lib/libm/sparc/src/copysign.S	2014-11-25 12:59:49.106587570 -0500
+++ new/usr/src/lib/libm/sparc/src/copysign.S	2014-11-25 12:59:49.131954496 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(copysign,function)
-#include "libm_synonyms.h"
 
 	ENTRY(copysign)
 	sethi	%hi(0x80000000),%o3
--- old/usr/src/lib/libm/sparc/src/fabs.S	2014-11-25 12:59:50.097295490 -0500
+++ new/usr/src/lib/libm/sparc/src/fabs.S	2014-11-25 12:59:50.108940963 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(fabs,function)
-#include "libm_synonyms.h"
 
 	ENTRY(fabs)
 	sethi	%hi(0x80000000),%o2
--- old/usr/src/lib/libm/sparc/src/nextafter.S	2014-11-25 12:59:50.504698556 -0500
+++ new/usr/src/lib/libm/sparc/src/nextafter.S	2014-11-25 12:59:50.516319456 -0500
@@ -33,17 +33,8 @@
 	.weak _nextafter
 	.type _nextafter,#function
 _nextafter	= __nextafter
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
-#if defined(LIBM_BUILD)	&& !defined(ELFOBJ)
-#define	mENTRY(x)	ENTRY(__libm/**/x)
-#define	mNAME(x)	NAME(__libm/**/x)
-#else
-#define	mENTRY(x)	ENTRY(x)
-#define	mNAME(x)	NAME(x)
-#endif
-
 	RO_DATA
 	.align	8
 .Lconstant:
@@ -110,7 +101,7 @@
 	cmp	%i2,%l3
 	bne,a	9f			! next_return
 	ldd	[%fp+x],%f0
-	call	mNAME(_SVID_libm_err)	! overflow
+	call	NAME(_SVID_libm_err)	! overflow
 	or	%g0,46,%o4
 	ba	9f
 	nop
--- old/usr/src/lib/libmvec/Makefile.com	2014-11-25 12:59:50.946802143 -0500
+++ new/usr/src/lib/libmvec/Makefile.com	2014-11-25 12:59:50.958582778 -0500
@@ -92,8 +92,7 @@
 		vz_abs_.o \
 		vz_exp_.o \
 		vz_log_.o \
-		vz_pow_.o \
-		#end
+		vz_pow_.o
 
 mvecvisCOBJS	= \
 		__vTBL_atan1.o \
@@ -108,8 +107,7 @@
 		__vsinbig.o \
 		__vsinbigf.o \
 		__vsincosbig.o \
-		__vsincosbigf.o \
-		#end
+		__vsincosbigf.o
 
 mvecvisSOBJS	= \
 		__vatan.o \
@@ -135,8 +133,7 @@
 		__vsincosf.o \
 		__vsinf.o \
 		__vsqrt.o \
-		__vsqrtf.o \
-		#end
+		__vsqrtf.o
 
 mvecvis2COBJS	= \
 		__vTBL_sincos.o \
@@ -146,15 +143,13 @@
 		__vcosbig_ultra3.o \
 		__vrem_pio2m.o \
 		__vsinbig.o \
-		__vsinbig_ultra3.o \
-		#end
+		__vsinbig_ultra3.o
 
 mvecvis2SOBJS	= \
 		__vcos_ultra3.o \
 		__vlog_ultra3.o \
 		__vsin_ultra3.o \
-		__vsqrtf_ultra3.o \
-		#end
+		__vsqrtf_ultra3.o
 
 include		$(SRC)/lib/Makefile.lib
 include		$(SRC)/lib/Makefile.rootfs
@@ -162,7 +157,7 @@
 
 LIBS		= $(DYNLIB)
 SRCDIR		= ../common/
-DYNFLAGS	+= -zignore
+DYNFLAGS	+= $(ZIGNORE)
 
 LINTERROFF	= -erroff=E_FP_DIVISION_BY_ZERO 
 LINTERROFF	+= -erroff=E_FP_INVALID
@@ -177,8 +172,6 @@
 CLAGS		+= $(LINTERROFF)
 CFLAGS64	+= $(LINTERROFF)
 
-ASDEF		+= -DLIBMVEC_SO_BUILD
-
 FLTRPATH_sparc		= $$ORIGIN/cpu/$$ISALIST/libmvec_isa.so.1
 FLTRPATH_sparcv9	= $$ORIGIN/../cpu/$$ISALIST/sparcv9/libmvec_isa.so.1
 FLTRPATH_i386		= $$ORIGIN/libmvec/$$HWCAP
@@ -188,18 +181,12 @@
 sparcv9_CFLAGS += -_cc=-W0,-xintrinsic
 CPPFLAGS_i386	+= -Dfabs=__fabs
 
-CPPFLAGS	+= -DLIBMVEC_SO_BUILD
+SRCS_mvec_i386 = ../common/__vsqrtf.c
+
+SRCS_mvec_sparc = $(SRCS_mvec_i386)
+
+SRCS_mvec_sparcv9 = $(SRCS_mvec_i386)
 
-SRCS_mvec_i386 = \
-	../common/__vsqrtf.c \
-	#end
-
-SRCS_mvec_sparc = \
-	$(SRCS_mvec_i386) \
-	#end
-SRCS_mvec_sparcv9 = \
-	$(SRCS_mvec_i386) \
-	#end
 
 SRCS_mvec = \
 	$(SRCS_mvec_$(TARGETMACH)) \
@@ -278,8 +265,7 @@
 	../common/vz_abs_.c \
 	../common/vz_exp_.c \
 	../common/vz_log_.c \
-	../common/vz_pow_.c \
-	#end
+	../common/vz_pow_.c
 
 .KEEP_STATE:
 
--- old/usr/src/lib/libmvec/common/__vhypot.c	2014-11-25 12:59:51.684766947 -0500
+++ new/usr/src/lib/libmvec/common/__vhypot.c	2014-11-25 12:59:51.696101763 -0500
@@ -28,7 +28,6 @@
  */
 
 #include <sys/isa_defs.h>
-#include "libm_synonyms.h"
 #include "libm_inlines.h"
 
 #ifdef _LITTLE_ENDIAN
@@ -66,8 +65,6 @@
  *	results.
  */
 
-#define sqrt __sqrt
-
 extern double sqrt(double);
 extern double fabs(double);
 
@@ -394,4 +391,3 @@
 		pz += stridez;
 	}
 }
-
--- old/usr/src/lib/libmvec/common/__vhypotf.c	2014-11-25 12:59:52.127675251 -0500
+++ new/usr/src/lib/libmvec/common/__vhypotf.c	2014-11-25 12:59:52.139161822 -0500
@@ -27,7 +27,6 @@
  * Use is subject to license terms.
  */
 
-#include "libm_synonyms.h"
 #include "libm_inlines.h"
 
 #ifdef __RESTRICT
@@ -36,8 +35,6 @@
 #define restrict
 #endif
 
-#define sqrt __sqrt
-
 extern double sqrt(double);
 
 void
--- old/usr/src/lib/libmvec/common/__vrhypot.c	2014-11-25 12:59:52.542548651 -0500
+++ new/usr/src/lib/libmvec/common/__vrhypot.c	2014-11-25 12:59:52.554132893 -0500
@@ -28,7 +28,6 @@
  */
 
 #include <sys/isa_defs.h>
-#include "libm_synonyms.h"
 #include "libm_inlines.h"
 
 #ifdef _LITTLE_ENDIAN
@@ -67,10 +66,7 @@
  *	results.
  */
 
-#define sqrt __sqrt
-
 extern double sqrt(double);
-
 extern double fabs(double);
 
 static const int __vlibm_TBL_rhypot[] = {
@@ -428,4 +424,3 @@
 		}
 	}
 }
-
--- old/usr/src/lib/libmvec/common/__vrhypotf.c	2014-11-25 12:59:52.974640971 -0500
+++ new/usr/src/lib/libmvec/common/__vrhypotf.c	2014-11-25 12:59:52.986235411 -0500
@@ -28,7 +28,6 @@
  */
 
 #include <sys/isa_defs.h>
-#include "libm_synonyms.h"
 #include "libm_inlines.h"
 
 #ifdef _LITTLE_ENDIAN
@@ -219,8 +218,6 @@
  5.0393700787401574104e-01, 1.7747130188322274291e-01,
 };
 
-#define	fabsf	__fabsf
-
 extern float fabsf(float);
 
 static const double
@@ -462,4 +459,3 @@
 		pz += stridez;
 	}
 }
-
--- old/usr/src/lib/libmvec/common/__vrsqrt.c	2014-11-25 12:59:53.412972025 -0500
+++ new/usr/src/lib/libmvec/common/__vrsqrt.c	2014-11-25 12:59:53.424566057 -0500
@@ -28,7 +28,6 @@
  */
 
 #include <sys/isa_defs.h>
-#include "libm_synonyms.h"
 #include "libm_inlines.h"
 
 #ifdef _LITTLE_ENDIAN
@@ -83,8 +82,6 @@
  *	results.
  */
 
-#define sqrt __sqrt
-
 extern double sqrt (double);
 extern const double __vlibm_TBL_rsqrt[];
 
@@ -412,4 +409,3 @@
 		py += stridey;
 	}
 }
-
--- old/usr/src/lib/libmvec/common/__vrsqrtf.c	2014-11-25 12:59:53.845823938 -0500
+++ new/usr/src/lib/libmvec/common/__vrsqrtf.c	2014-11-25 12:59:53.857574908 -0500
@@ -27,7 +27,6 @@
  * Use is subject to license terms.
  */
 
-#include "libm_synonyms.h"
 #include "libm_inlines.h"
 
 #ifdef __RESTRICT
@@ -71,8 +70,6 @@
  *	whole float type range.
  */
 
-#define sqrtf __sqrtf
-
 extern float sqrtf(float);
 
 static const double __TBL_rsqrtf[] = {
@@ -503,4 +500,3 @@
 		py += stridey;
 	}
 }
-
--- old/usr/src/lib/libmvec/common/__vsqrt.c	2014-11-25 12:59:54.461463116 -0500
+++ new/usr/src/lib/libmvec/common/__vsqrt.c	2014-11-25 12:59:54.485477136 -0500
@@ -27,7 +27,6 @@
  * Use is subject to license terms.
  */
 
-#include "libm_synonyms.h"
 #include "libm_inlines.h"
 
 #ifdef __RESTRICT
@@ -36,8 +35,6 @@
 #define restrict
 #endif
 
-#define sqrt __sqrt
-
 extern double sqrt(double);
 
 void
@@ -50,4 +47,3 @@
 		y += stridey;
 	}
 }
-
--- old/usr/src/lib/libmvec/common/__vsqrtf.c	2014-11-25 12:59:54.917170908 -0500
+++ new/usr/src/lib/libmvec/common/__vsqrtf.c	2014-11-25 12:59:54.928627098 -0500
@@ -33,11 +33,8 @@
 #define restrict
 #endif
 
-#include "libm_synonyms.h"
 #include "libm_inlines.h"
 
-#define sqrtf __sqrtf
-
 extern float sqrtf(float);
 
 void
@@ -50,4 +47,3 @@
 		y += stridey;
 	}
 }
-
--- old/usr/src/lib/libmvec/common/vcos_.c	2014-11-25 12:59:55.327311235 -0500
+++ new/usr/src/lib/libmvec/common/vcos_.c	2014-11-25 12:59:55.338963721 -0500
@@ -29,46 +29,11 @@
 
 extern void __vcos(int, double *, int, double *, int);
 
-#if !defined(LIBMVEC_SO_BUILD)
-#if defined(ARCH_v8plusa) || defined(ARCH_v8plusb) || defined(ARCH_v9a) || defined(ARCH_v9b)
-#define CHECK_ULTRA3
-#endif
-#endif	/* !defined(LIBMVEC_SO_BUILD) */
-
-#ifdef CHECK_ULTRA3
-#include <strings.h>
-#define sysinfo _sysinfo
-#include <sys/systeminfo.h>
-
-#define BUFLEN	257
-
-static int use_ultra3 = 0;
-
-extern void __vcos_ultra3(int, double *, int, double *, int);
-#endif
-
 #pragma weak vcos_ = __vcos_
 
 /* just invoke the serial function */
 void
 __vcos_(int *n, double *x, int *stridex, double *y, int *stridey)
 {
-#ifdef CHECK_ULTRA3
-	int		u;
-	char	buf[BUFLEN];
-
-	u = use_ultra3;
-	if (!u) {
-		/* use __vcos_ultra3 on Cheetah (and ???) */
-		if (sysinfo(SI_ISALIST, buf, BUFLEN) > 0 && !strncmp(buf, "sparcv9+vis2", 12))
-			u = 3;
-		else
-			u = 1;
-		use_ultra3 = u;
-	}
-	if (u & 2)
-		__vcos_ultra3(*n, x, *stridex, y, *stridey);
-	else
-#endif
 	__vcos(*n, x, *stridex, y, *stridey);
 }
--- old/usr/src/lib/libmvec/common/vis/__vcos_ultra3.S	2014-11-25 12:59:55.734002338 -0500
+++ new/usr/src/lib/libmvec/common/vis/__vcos_ultra3.S	2014-11-25 12:59:55.747042972 -0500
@@ -29,11 +29,9 @@
 	.file	"__vcos_ultra3.S"
 
 #include "libm.h"
-#if defined(LIBMVEC_SO_BUILD)
 	.weak	__vcos
 	.type	__vcos,#function
 	__vcos = __vcos_ultra3
-#endif
 
 	RO_DATA
 	.align	64
--- old/usr/src/lib/libmvec/common/vis/__vlog_ultra3.S	2014-11-25 12:59:56.337160418 -0500
+++ new/usr/src/lib/libmvec/common/vis/__vlog_ultra3.S	2014-11-25 12:59:56.349106863 -0500
@@ -29,11 +29,9 @@
 	.file	"__vlog_ultra3.S"
 
 #include "libm.h"
-#if defined(LIBMVEC_SO_BUILD)
 	.weak	__vlog
 	.type	__vlog,#function
 	__vlog = __vlog_ultra3
-#endif
 
 /*
  * ELEVENBIT table and order 5 POLYNOMIAL no explicit correction t
--- old/usr/src/lib/libmvec/common/vis/__vsin_ultra3.S	2014-11-25 12:59:56.977216996 -0500
+++ new/usr/src/lib/libmvec/common/vis/__vsin_ultra3.S	2014-11-25 12:59:56.990171848 -0500
@@ -29,11 +29,9 @@
 	.file	"__vsin_ultra3.S"
 
 #include "libm.h"
-#if defined(LIBMVEC_SO_BUILD)
 	.weak	__vsin
 	.type	__vsin,#function
 	__vsin = __vsin_ultra3
-#endif
 
 	RO_DATA
 	.align	64
--- old/usr/src/lib/libmvec/common/vis/__vsqrtf_ultra3.S	2014-11-25 12:59:57.593001631 -0500
+++ new/usr/src/lib/libmvec/common/vis/__vsqrtf_ultra3.S	2014-11-25 12:59:57.604448831 -0500
@@ -29,11 +29,9 @@
 	.file	"__vsqrtf_ultra3.S"
 
 #include "libm.h"
-#if defined(LIBMVEC_SO_BUILD)
 	.weak	__vsqrtf
 	.type	__vsqrtf,#function
 	__vsqrtf = __vsqrtf_ultra3
-#endif
 
 	RO_DATA
 	.align	64
--- old/usr/src/lib/libmvec/common/vlog_.c	2014-11-25 12:59:58.088284092 -0500
+++ new/usr/src/lib/libmvec/common/vlog_.c	2014-11-25 12:59:58.099581037 -0500
@@ -29,46 +29,11 @@
 
 extern void __vlog(int, double *, int, double *, int);
 
-#if !defined(LIBMVEC_SO_BUILD)
-#if defined(ARCH_v8plusa) || defined(ARCH_v8plusb) || defined(ARCH_v9a) || defined(ARCH_v9b)
-#define CHECK_ULTRA3
-#endif
-#endif	/* !defined(LIBMVEC_SO_BUILD) */
-
-#ifdef CHECK_ULTRA3
-#include <strings.h>
-#define sysinfo _sysinfo
-#include <sys/systeminfo.h>
-
-#define BUFLEN	257
-
-static int use_ultra3 = 0;
-
-extern void __vlog_ultra3(int, double *, int, double *, int);
-#endif
-
 #pragma weak vlog_ = __vlog_
 
 /* just invoke the serial function */
 void
 __vlog_(int *n, double *x, int *stridex, double *y, int *stridey)
 {
-#ifdef CHECK_ULTRA3
-	int		u;
-	char	buf[BUFLEN];
-
-	u = use_ultra3;
-	if (!u) {
-		/* use __vlog_ultra3 on Cheetah (and ???) */
-		if (sysinfo(SI_ISALIST, buf, BUFLEN) > 0 && !strncmp(buf, "sparcv9+vis2", 12))
-			u = 3;
-		else
-			u = 1;
-		use_ultra3 = u;
-	}
-	if (u & 2)
-		__vlog_ultra3(*n, x, *stridex, y, *stridey);
-	else
-#endif
 	__vlog(*n, x, *stridex, y, *stridey);
 }
--- old/usr/src/lib/libmvec/common/vsin_.c	2014-11-25 12:59:58.496420636 -0500
+++ new/usr/src/lib/libmvec/common/vsin_.c	2014-11-25 12:59:58.507743360 -0500
@@ -29,46 +29,11 @@
 
 extern void __vsin(int, double *, int, double *, int);
 
-#if !defined(LIBMVEC_SO_BUILD)
-#if defined(ARCH_v8plusa) || defined(ARCH_v8plusb) || defined(ARCH_v9a) || defined(ARCH_v9b)
-#define CHECK_ULTRA3
-#endif
-#endif	/* !defined(LIBMVEC_SO_BUILD) */
-
-#ifdef CHECK_ULTRA3
-#include <strings.h>
-#define sysinfo _sysinfo
-#include <sys/systeminfo.h>
-
-#define BUFLEN	257
-
-static int use_ultra3 = 0;
-
-extern void __vsin_ultra3(int, double *, int, double *, int);
-#endif
-
 #pragma weak vsin_ = __vsin_
 
 /* just invoke the serial function */
 void
 __vsin_(int *n, double *x, int *stridex, double *y, int *stridey)
 {
-#ifdef CHECK_ULTRA3
-	int		u;
-	char	buf[BUFLEN];
-
-	u = use_ultra3;
-	if (!u) {
-		/* use __vsin_ultra3 on Cheetah (and ???) */
-		if (sysinfo(SI_ISALIST, buf, BUFLEN) > 0 && !strncmp(buf, "sparcv9+vis2", 12))
-			u = 3;
-		else
-			u = 1;
-		use_ultra3 = u;
-	}
-	if (u & 2)
-		__vsin_ultra3(*n, x, *stridex, y, *stridey);
-	else
-#endif
 	__vsin(*n, x, *stridex, y, *stridey);
 }
--- old/usr/src/lib/libmvec/common/vsqrtf_.c	2014-11-25 12:59:58.901733890 -0500
+++ new/usr/src/lib/libmvec/common/vsqrtf_.c	2014-11-25 12:59:58.920064706 -0500
@@ -29,46 +29,11 @@
 
 extern void __vsqrtf(int, float *, int, float *, int);
 
-#if !defined(LIBMVEC_SO_BUILD)
-#if defined(ARCH_v8plusa) || defined(ARCH_v8plusb) || defined(ARCH_v9a) || defined(ARCH_v9b)
-#define CHECK_ULTRA3
-#endif
-#endif	/* !defined(LIBMVEC_SO_BUILD) */
-
-#ifdef CHECK_ULTRA3
-#include <strings.h>
-#define sysinfo _sysinfo
-#include <sys/systeminfo.h>
-
-#define BUFLEN	257
-
-static int use_ultra3 = 0;
-
-extern void __vsqrtf_ultra3(int, float *, int, float *, int);
-#endif
-
 #pragma weak vsqrtf_ = __vsqrtf_
 
 /* just invoke the serial function */
 void
 __vsqrtf_(int *n, float *x, int *stridex, float *y, int *stridey)
 {
-#ifdef CHECK_ULTRA3
-	int		u;
-	char	buf[BUFLEN];
-
-	u = use_ultra3;
-	if (!u) {
-		/* use __vsqrtf_ultra3 on Cheetah (and ???) */
-		if (sysinfo(SI_ISALIST, buf, BUFLEN) > 0 && !strncmp(buf, "sparcv9+vis2", 12))
-			u = 3;
-		else
-			u = 1;
-		use_ultra3 = u;
-	}
-	if (u & 2)
-		__vsqrtf_ultra3(*n, x, *stridex, y, *stridey);
-	else
-#endif
 	__vsqrtf(*n, x, *stridex, y, *stridey);
 }
