--- old/usr/src/lib/libm/amd64/src/__swapFLAGS.s	2014-11-04 18:59:18.684097440 -0500
+++ new/usr/src/lib/libm/amd64/src/__swapFLAGS.s	2014-11-04 18:59:18.805436285 -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-04 18:59:19.458950892 -0500
+++ new/usr/src/lib/libm/amd64/src/acosl.s	2014-11-04 18:59:19.470108671 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(acosl,function)
-#include "libm_synonyms.h"
 
 #undef fabs
 
--- old/usr/src/lib/libm/amd64/src/asinl.s	2014-11-04 18:59:19.846528978 -0500
+++ new/usr/src/lib/libm/amd64/src/asinl.s	2014-11-04 18:59:19.857936932 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(asinl,function)
-#include "libm_synonyms.h"
 
 #undef fabs
 
--- old/usr/src/lib/libm/amd64/src/atan2l.s	2014-11-04 18:59:20.241306364 -0500
+++ new/usr/src/lib/libm/amd64/src/atan2l.s	2014-11-04 18:59:20.252447528 -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-04 18:59:20.648059652 -0500
+++ new/usr/src/lib/libm/amd64/src/atanl.s	2014-11-04 18:59:20.659326946 -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-04 18:59:21.036757745 -0500
+++ new/usr/src/lib/libm/amd64/src/copysignl.s	2014-11-04 18:59:21.048341476 -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-04 18:59:21.424504437 -0500
+++ new/usr/src/lib/libm/amd64/src/exp10l.s	2014-11-04 18:59:21.437184274 -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-04 18:59:21.817683277 -0500
+++ new/usr/src/lib/libm/amd64/src/exp2l.s	2014-11-04 18:59:21.829262539 -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-04 18:59:22.212943832 -0500
+++ new/usr/src/lib/libm/amd64/src/expl.s	2014-11-04 18:59:22.224340774 -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-04 18:59:22.608834405 -0500
+++ new/usr/src/lib/libm/amd64/src/expm1l.s	2014-11-04 18:59:22.620194359 -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-04 18:59:23.013956865 -0500
+++ new/usr/src/lib/libm/amd64/src/fabsl.s	2014-11-04 18:59:23.025357123 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(fabsl,function)
-#include "libm_synonyms.h"
 
 	ENTRY(fabsl)
 	fldt    8(%rsp)
--- old/usr/src/lib/libm/amd64/src/floorl.s	2014-11-04 18:59:23.464415055 -0500
+++ new/usr/src/lib/libm/amd64/src/floorl.s	2014-11-04 18:59:23.475837378 -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-04 18:59:24.930456433 -0500
+++ new/usr/src/lib/libm/amd64/src/fmod.s	2014-11-04 18:59:24.952256811 -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-04 18:59:25.346849956 -0500
+++ new/usr/src/lib/libm/amd64/src/fmodf.s	2014-11-04 18:59:25.358142496 -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-04 18:59:25.732425518 -0500
+++ new/usr/src/lib/libm/amd64/src/fmodl.s	2014-11-04 18:59:25.743979997 -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-04 18:59:26.120656097 -0500
+++ new/usr/src/lib/libm/amd64/src/ieee_funcl.s	2014-11-04 18:59:26.131930778 -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-04 18:59:26.534134087 -0500
+++ new/usr/src/lib/libm/amd64/src/ilogbl.s	2014-11-04 18:59:26.545637794 -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-04 18:59:26.921955708 -0500
+++ new/usr/src/lib/libm/amd64/src/log10l.s	2014-11-04 18:59:26.933238396 -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-04 18:59:27.310623433 -0500
+++ new/usr/src/lib/libm/amd64/src/log2l.s	2014-11-04 18:59:27.321821796 -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-04 18:59:27.695779267 -0500
+++ new/usr/src/lib/libm/amd64/src/logl.s	2014-11-04 18:59:27.707189635 -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-04 18:59:28.131817815 -0500
+++ new/usr/src/lib/libm/amd64/src/powl.s	2014-11-04 18:59:28.143323523 -0500
@@ -55,7 +55,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(powl,function)
-#include "libm_synonyms.h"
 #include "xpg6.h"
 
 #undef fabs
--- old/usr/src/lib/libm/amd64/src/remainder.s	2014-11-04 18:59:28.545048441 -0500
+++ new/usr/src/lib/libm/amd64/src/remainder.s	2014-11-04 18:59:28.556521175 -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-04 18:59:29.174556328 -0500
+++ new/usr/src/lib/libm/amd64/src/remainderf.s	2014-11-04 18:59:29.185853639 -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-04 18:59:29.584454814 -0500
+++ new/usr/src/lib/libm/amd64/src/remainderl.s	2014-11-04 18:59:29.595840518 -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-04 18:59:29.970587909 -0500
+++ new/usr/src/lib/libm/amd64/src/remquol.s	2014-11-04 18:59:29.982116873 -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-04 18:59:30.363698985 -0500
+++ new/usr/src/lib/libm/amd64/src/rintl.s	2014-11-04 18:59:30.375902449 -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-04 18:59:30.752141027 -0500
+++ new/usr/src/lib/libm/amd64/src/rndintl.s	2014-11-04 18:59:30.763333865 -0500
@@ -29,11 +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
 
--- old/usr/src/lib/libm/amd64/src/scalbnl.s	2014-11-04 18:59:31.149459760 -0500
+++ new/usr/src/lib/libm/amd64/src/scalbnl.s	2014-11-04 18:59:31.160830500 -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-04 18:59:31.540253058 -0500
+++ new/usr/src/lib/libm/amd64/src/sqrtl.s	2014-11-04 18:59:31.551555909 -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-04 18:59:31.941462831 -0500
+++ new/usr/src/lib/libm/common/C/acos.c	2014-11-04 18:59:31.952925553 -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-04 18:59:32.421026277 -0500
+++ new/usr/src/lib/libm/common/C/acosh.c	2014-11-04 18:59:32.436937510 -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-04 18:59:32.819382059 -0500
+++ new/usr/src/lib/libm/common/C/asin.c	2014-11-04 18:59:32.830642025 -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-04 18:59:33.265527922 -0500
+++ new/usr/src/lib/libm/common/C/asinh.c	2014-11-04 18:59:33.277978892 -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-04 18:59:34.009724643 -0500
+++ new/usr/src/lib/libm/common/C/atan.c	2014-11-04 18:59:34.042784775 -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-04 18:59:34.713543221 -0500
+++ new/usr/src/lib/libm/common/C/atan2.c	2014-11-04 18:59:34.725059353 -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-04 18:59:35.156361080 -0500
+++ new/usr/src/lib/libm/common/C/atan2pi.c	2014-11-04 18:59:35.167691178 -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-04 18:59:35.581397214 -0500
+++ new/usr/src/lib/libm/common/C/atanh.c	2014-11-04 18:59:35.593151302 -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-04 18:59:35.973159079 -0500
+++ new/usr/src/lib/libm/common/C/ceil.c	2014-11-04 18:59:35.984339480 -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-04 18:59:36.410349725 -0500
+++ new/usr/src/lib/libm/common/C/copysign.c	2014-11-04 18:59:36.421866943 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak copysign = __copysign
+#pragma weak __copysign = copysign
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/C/cos.c	2014-11-04 18:59:36.801608466 -0500
+++ new/usr/src/lib/libm/common/C/cos.c	2014-11-04 18:59:36.813231341 -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-04 18:59:37.217316453 -0500
+++ new/usr/src/lib/libm/common/C/cosh.c	2014-11-04 18:59:37.228837362 -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-04 18:59:37.649463776 -0500
+++ new/usr/src/lib/libm/common/C/erf.c	2014-11-04 18:59:37.660962388 -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-04 18:59:38.071069836 -0500
+++ new/usr/src/lib/libm/common/C/exp.c	2014-11-04 18:59:38.082557373 -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-04 18:59:38.506236551 -0500
+++ new/usr/src/lib/libm/common/C/exp10.c	2014-11-04 18:59:38.517728182 -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-04 18:59:39.314417441 -0500
+++ new/usr/src/lib/libm/common/C/exp2.c	2014-11-04 18:59:39.346776809 -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-04 18:59:39.779297834 -0500
+++ new/usr/src/lib/libm/common/C/expm1.c	2014-11-04 18:59:39.790694483 -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-04 18:59:40.204219522 -0500
+++ new/usr/src/lib/libm/common/C/fabs.c	2014-11-04 18:59:40.215674213 -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-04 18:59:40.629493938 -0500
+++ new/usr/src/lib/libm/common/C/floor.c	2014-11-04 18:59:40.641107510 -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-04 18:59:41.035977523 -0500
+++ new/usr/src/lib/libm/common/C/fmod.c	2014-11-04 18:59:41.047313517 -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-04 18:59:41.477337385 -0500
+++ new/usr/src/lib/libm/common/C/gamma.c	2014-11-04 18:59:41.488554716 -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-04 18:59:41.901047085 -0500
+++ new/usr/src/lib/libm/common/C/gamma_r.c	2014-11-04 18:59:41.912464015 -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-04 18:59:42.316040459 -0500
+++ new/usr/src/lib/libm/common/C/hypot.c	2014-11-04 18:59:42.327619043 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak hypot = __hypot
+#pragma weak __hypot = hypot
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/C/ilogb.c	2014-11-04 18:59:42.758114412 -0500
+++ new/usr/src/lib/libm/common/C/ilogb.c	2014-11-04 18:59:42.769567979 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak ilogb = __ilogb
+#pragma weak __ilogb = ilogb
 
 #include "libm.h"
 #include "xpg6.h"	/* __xpg6 */
--- old/usr/src/lib/libm/common/C/j0.c	2014-11-04 18:59:43.180108111 -0500
+++ new/usr/src/lib/libm/common/C/j0.c	2014-11-04 18:59:43.191283853 -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-04 18:59:43.667144072 -0500
+++ new/usr/src/lib/libm/common/C/j1.c	2014-11-04 18:59:43.682582796 -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-04 18:59:45.214612605 -0500
+++ new/usr/src/lib/libm/common/C/jn.c	2014-11-04 18:59:45.225957584 -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-04 18:59:45.677749580 -0500
+++ new/usr/src/lib/libm/common/C/lgamma.c	2014-11-04 18:59:45.688949431 -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-04 18:59:46.069404966 -0500
+++ new/usr/src/lib/libm/common/C/lgamma_r.c	2014-11-04 18:59:46.081005334 -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-04 18:59:46.474492042 -0500
+++ new/usr/src/lib/libm/common/C/libm.h	2014-11-04 18:59:46.485728912 -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_synonyms.h	2014-11-04 18:59:46.893807387 -0500
+++ /dev/null	2014-11-04 18:59:46.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(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(lint) */
-
-#endif	/* _LIBM_SYNONYMS_H */
--- old/usr/src/lib/libm/common/C/libm_thread.h	2014-11-04 18:59:47.175859658 -0500
+++ /dev/null	2014-11-04 18:59:47.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-04 18:59:47.359513582 -0500
+++ new/usr/src/lib/libm/common/C/log.c	2014-11-04 18:59:47.371100657 -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-04 18:59:47.788641103 -0500
+++ new/usr/src/lib/libm/common/C/log10.c	2014-11-04 18:59:47.801280661 -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-04 18:59:48.215659386 -0500
+++ new/usr/src/lib/libm/common/C/log1p.c	2014-11-04 18:59:48.227202490 -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-04 18:59:48.975237247 -0500
+++ new/usr/src/lib/libm/common/C/log2.c	2014-11-04 18:59:48.996702666 -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-04 18:59:49.481585903 -0500
+++ new/usr/src/lib/libm/common/C/logb.c	2014-11-04 18:59:49.493550339 -0500
@@ -27,8 +27,8 @@
  * Use is subject to license terms.
  */
 
-#pragma weak logb = __logb
-#pragma weak _logb = __logb
+#pragma weak __logb = logb
+#pragma weak _logb = logb
 
 #include "libm.h"
 #include "xpg6.h"	/* __xpg6 */
--- old/usr/src/lib/libm/common/C/nextafter.c	2014-11-04 18:59:49.876056072 -0500
+++ new/usr/src/lib/libm/common/C/nextafter.c	2014-11-04 18:59:49.887529188 -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-04 18:59:50.272615574 -0500
+++ new/usr/src/lib/libm/common/C/pow.c	2014-11-04 18:59:50.284019828 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak pow = __pow
+#pragma weak __pow = pow
 
 /*
  * pow(x,y) return x**y
--- old/usr/src/lib/libm/common/C/remainder.c	2014-11-04 18:59:50.710648899 -0500
+++ new/usr/src/lib/libm/common/C/remainder.c	2014-11-04 18:59:50.723717202 -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-04 18:59:51.110381260 -0500
+++ new/usr/src/lib/libm/common/C/rint.c	2014-11-04 18:59:51.121762612 -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-04 18:59:51.504651799 -0500
+++ new/usr/src/lib/libm/common/C/scalb.c	2014-11-04 18:59:51.516102310 -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-04 18:59:51.900592187 -0500
+++ new/usr/src/lib/libm/common/C/scalbn.c	2014-11-04 18:59:51.912034292 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak scalbn = __scalbn
+#pragma weak __scalbn = scalbn
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/C/signgam.c	2014-11-04 18:59:52.305288644 -0500
+++ new/usr/src/lib/libm/common/C/signgam.c	2014-11-04 18:59:52.316760525 -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-04 18:59:52.698011222 -0500
+++ new/usr/src/lib/libm/common/C/significand.c	2014-11-04 18:59:52.709671347 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak significand = __significand
+#pragma weak __significand = significand
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/C/sin.c	2014-11-04 18:59:53.093849477 -0500
+++ new/usr/src/lib/libm/common/C/sin.c	2014-11-04 18:59:53.105240966 -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-04 18:59:53.518235764 -0500
+++ new/usr/src/lib/libm/common/C/sincos.c	2014-11-04 18:59:53.529530935 -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-04 18:59:54.189716416 -0500
+++ new/usr/src/lib/libm/common/C/sincospi.c	2014-11-04 18:59:54.201520248 -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-04 18:59:54.630234485 -0500
+++ new/usr/src/lib/libm/common/C/sinh.c	2014-11-04 18:59:54.641815604 -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-04 18:59:55.046418474 -0500
+++ new/usr/src/lib/libm/common/C/sqrt.c	2014-11-04 18:59:55.057910512 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak sqrt = __sqrt
+#pragma weak __sqrt = sqrt
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/C/tan.c	2014-11-04 18:59:55.459012800 -0500
+++ new/usr/src/lib/libm/common/C/tan.c	2014-11-04 18:59:55.470634359 -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-04 18:59:55.878561810 -0500
+++ new/usr/src/lib/libm/common/C/tanh.c	2014-11-04 18:59:55.890056064 -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-04 18:59:56.319099394 -0500
+++ new/usr/src/lib/libm/common/LD/__lgammal.c	2014-11-04 18:59:56.334074371 -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-04 18:59:56.785459556 -0500
+++ new/usr/src/lib/libm/common/LD/__poly_libmq.c	2014-11-04 18:59:56.797925076 -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-04 18:59:57.209617565 -0500
+++ new/usr/src/lib/libm/common/LD/acoshl.c	2014-11-04 18:59:57.221296268 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak acoshl = __acoshl
+#pragma weak __acoshl = acoshl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/LD/asinhl.c	2014-11-04 18:59:57.631354775 -0500
+++ new/usr/src/lib/libm/common/LD/asinhl.c	2014-11-04 18:59:57.642952640 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak asinhl = __asinhl
+#pragma weak __asinhl = asinhl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/LD/atan2pil.c	2014-11-04 18:59:58.042953771 -0500
+++ new/usr/src/lib/libm/common/LD/atan2pil.c	2014-11-04 18:59:58.054229427 -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-04 18:59:58.491722848 -0500
+++ new/usr/src/lib/libm/common/LD/atanhl.c	2014-11-04 18:59:58.502968982 -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-04 18:59:59.146991237 -0500
+++ new/usr/src/lib/libm/common/LD/cbrtl.c	2014-11-04 18:59:59.236906661 -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/LD/coshl.c	2014-11-04 18:59:59.647270041 -0500
+++ new/usr/src/lib/libm/common/LD/coshl.c	2014-11-04 18:59:59.658821455 -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/LD/cosl.c	2014-11-04 19:00:00.044923701 -0500
+++ new/usr/src/lib/libm/common/LD/cosl.c	2014-11-04 19:00:00.056308104 -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-04 19:00:00.441445128 -0500
+++ new/usr/src/lib/libm/common/LD/erfl.c	2014-11-04 19:00:00.453037538 -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-04 19:00:00.856613852 -0500
+++ new/usr/src/lib/libm/common/LD/finitel.c	2014-11-04 19:00:00.868151882 -0500
@@ -27,8 +27,6 @@
  * Use is subject to license terms.
  */
 
-#pragma weak finitel = __finitel
-
 #include "libm.h"
 
 #if defined(__sparc)
--- old/usr/src/lib/libm/common/LD/gammal.c	2014-11-04 19:00:01.248940764 -0500
+++ new/usr/src/lib/libm/common/LD/gammal.c	2014-11-04 19:00:01.260354348 -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-04 19:00:01.643168611 -0500
+++ new/usr/src/lib/libm/common/LD/gammal_r.c	2014-11-04 19:00:01.654739823 -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-04 19:00:02.037011156 -0500
+++ new/usr/src/lib/libm/common/LD/hypotl.c	2014-11-04 19:00:02.049895402 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak hypotl = __hypotl
+#pragma weak __hypotl = hypotl
 
 /*
  * hypotl(x,y)
--- old/usr/src/lib/libm/common/LD/isnanl.c	2014-11-04 19:00:02.448195413 -0500
+++ new/usr/src/lib/libm/common/LD/isnanl.c	2014-11-04 19:00:02.470192867 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak isnanl = __isnanl
+#pragma weak __isnanl = isnanl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/LD/j0l.c	2014-11-04 19:00:02.851819003 -0500
+++ new/usr/src/lib/libm/common/LD/j0l.c	2014-11-04 19:00:02.863242972 -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-04 19:00:03.314072767 -0500
+++ new/usr/src/lib/libm/common/LD/j1l.c	2014-11-04 19:00:03.325660952 -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-04 19:00:04.239705899 -0500
+++ new/usr/src/lib/libm/common/LD/jnl.c	2014-11-04 19:00:04.251345224 -0500
@@ -27,8 +27,8 @@
  * Use is subject to license terms.
  */
 
-#pragma weak jnl = __jnl
-#pragma weak ynl = __ynl
+#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-04 19:00:04.666185689 -0500
+++ new/usr/src/lib/libm/common/LD/lgammal.c	2014-11-04 19:00:04.677513980 -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-04 19:00:05.060197444 -0500
+++ new/usr/src/lib/libm/common/LD/lgammal_r.c	2014-11-04 19:00:05.071597366 -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-04 19:00:05.478142663 -0500
+++ new/usr/src/lib/libm/common/LD/log1pl.c	2014-11-04 19:00:05.489931903 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak log1pl = __log1pl
+#pragma weak __log1pl = log1pl
 
 /*
  * log1pl(x)
--- old/usr/src/lib/libm/common/LD/logbl.c	2014-11-04 19:00:05.873555540 -0500
+++ new/usr/src/lib/libm/common/LD/logbl.c	2014-11-04 19:00:05.885113243 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak logbl = __logbl
+#pragma weak __logbl = logbl
 
 #include "libm.h"
 #include "xpg6.h"	/* __xpg6 */
--- old/usr/src/lib/libm/common/LD/nextafterl.c	2014-11-04 19:00:06.311444982 -0500
+++ new/usr/src/lib/libm/common/LD/nextafterl.c	2014-11-04 19:00:06.323142240 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak nextafterl = __nextafterl
+#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-04 19:00:06.726241601 -0500
+++ new/usr/src/lib/libm/common/LD/scalbl.c	2014-11-04 19:00:06.737720746 -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-04 19:00:07.159591120 -0500
+++ new/usr/src/lib/libm/common/LD/signgaml.c	2014-11-04 19:00:07.171213172 -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-04 19:00:07.566998183 -0500
+++ new/usr/src/lib/libm/common/LD/significandl.c	2014-11-04 19:00:07.578450458 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak significandl = __significandl
+#pragma weak __significandl = significandl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/LD/sincosl.c	2014-11-04 19:00:07.988099768 -0500
+++ new/usr/src/lib/libm/common/LD/sincosl.c	2014-11-04 19:00:07.999464925 -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-04 19:00:08.407862141 -0500
+++ new/usr/src/lib/libm/common/LD/sincospil.c	2014-11-04 19:00:08.419286796 -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-04 19:00:09.663928287 -0500
+++ new/usr/src/lib/libm/common/LD/sinhl.c	2014-11-04 19:00:09.675480505 -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-04 19:00:10.071339920 -0500
+++ new/usr/src/lib/libm/common/LD/sinl.c	2014-11-04 19:00:10.082829123 -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-04 19:00:10.511700864 -0500
+++ new/usr/src/lib/libm/common/LD/sinpil.c	2014-11-04 19:00:10.523196936 -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-04 19:00:10.914189348 -0500
+++ new/usr/src/lib/libm/common/LD/tanhl.c	2014-11-04 19:00:10.925823790 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak tanhl = __tanhl
+#pragma weak __tanhl = tanhl
 
 /*
  * tanhl(x) returns the hyperbolic tangent of x
--- old/usr/src/lib/libm/common/LD/tanl.c	2014-11-04 19:00:11.336252890 -0500
+++ new/usr/src/lib/libm/common/LD/tanl.c	2014-11-04 19:00:11.347609056 -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-04 19:00:11.783382419 -0500
+++ new/usr/src/lib/libm/common/Q/acoshl.c	2014-11-04 19:00:11.796123525 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak acoshl = __acoshl
+#pragma weak __acoshl = acoshl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/Q/acosl.c	2014-11-04 19:00:12.193462919 -0500
+++ new/usr/src/lib/libm/common/Q/acosl.c	2014-11-04 19:00:12.204836541 -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-04 19:00:12.609236705 -0500
+++ new/usr/src/lib/libm/common/Q/asinhl.c	2014-11-04 19:00:12.620774287 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak asinhl = __asinhl
+#pragma weak __asinhl = asinhl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/Q/asinl.c	2014-11-04 19:00:13.030796139 -0500
+++ new/usr/src/lib/libm/common/Q/asinl.c	2014-11-04 19:00:13.043600455 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak asinl = __asinl
+#pragma weak __asinl = asinl
 
 /*
  *	asinl(x) = atan2l(x,sqrt(1-x*x));
--- old/usr/src/lib/libm/common/Q/atan2l.c	2014-11-04 19:00:13.432986213 -0500
+++ new/usr/src/lib/libm/common/Q/atan2l.c	2014-11-04 19:00:13.444671160 -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-04 19:00:14.397539822 -0500
+++ new/usr/src/lib/libm/common/Q/atan2pil.c	2014-11-04 19:00:14.409369303 -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-04 19:00:14.810442498 -0500
+++ new/usr/src/lib/libm/common/Q/atanhl.c	2014-11-04 19:00:14.821801492 -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-04 19:00:15.238479337 -0500
+++ new/usr/src/lib/libm/common/Q/atanl.c	2014-11-04 19:00:15.249766168 -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-04 19:00:15.662192595 -0500
+++ new/usr/src/lib/libm/common/Q/cbrtl.c	2014-11-04 19:00:15.673552375 -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-04 19:00:16.092024005 -0500
+++ new/usr/src/lib/libm/common/Q/copysignl.c	2014-11-04 19:00:16.103584873 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak copysignl = __copysignl
+#pragma weak __copysignl = copysignl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/Q/coshl.c	2014-11-04 19:00:16.519064315 -0500
+++ new/usr/src/lib/libm/common/Q/coshl.c	2014-11-04 19:00:16.530287678 -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-04 19:00:16.968980566 -0500
+++ new/usr/src/lib/libm/common/Q/cosl.c	2014-11-04 19:00:16.980311115 -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-04 19:00:17.392536062 -0500
+++ new/usr/src/lib/libm/common/Q/erfl.c	2014-11-04 19:00:17.404266862 -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-04 19:00:17.847189988 -0500
+++ new/usr/src/lib/libm/common/Q/exp10l.c	2014-11-04 19:00:17.858494956 -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-04 19:00:18.258331368 -0500
+++ new/usr/src/lib/libm/common/Q/exp2l.c	2014-11-04 19:00:18.269510180 -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-04 19:00:18.925522226 -0500
+++ new/usr/src/lib/libm/common/Q/expl.c	2014-11-04 19:00:18.938259676 -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-04 19:00:19.689323498 -0500
+++ new/usr/src/lib/libm/common/Q/expm1l.c	2014-11-04 19:00:19.701095739 -0500
@@ -27,7 +27,8 @@
  * Use is subject to license terms.
  */
 
-#pragma weak expm1l = __expm1l
+#pragma weak __expm1l = expm1l
+
 #if !defined(__sparc)
 #error Unsupported architecture
 #endif
--- old/usr/src/lib/libm/common/Q/fabsl.c	2014-11-04 19:00:20.129361980 -0500
+++ new/usr/src/lib/libm/common/Q/fabsl.c	2014-11-04 19:00:20.140700679 -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-04 19:00:20.541702147 -0500
+++ new/usr/src/lib/libm/common/Q/finitel.c	2014-11-04 19:00:20.553331938 -0500
@@ -27,8 +27,6 @@
  * Use is subject to license terms.
  */
 
-#pragma weak finitel = __finitel
-
 #include "libm.h"
 
 #if defined(__sparc)
--- old/usr/src/lib/libm/common/Q/floorl.c	2014-11-04 19:00:20.978819599 -0500
+++ new/usr/src/lib/libm/common/Q/floorl.c	2014-11-04 19:00:20.990333077 -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-04 19:00:21.394231289 -0500
+++ new/usr/src/lib/libm/common/Q/fmodl.c	2014-11-04 19:00:21.405706308 -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-04 19:00:21.841143201 -0500
+++ new/usr/src/lib/libm/common/Q/gammal.c	2014-11-04 19:00:21.852484208 -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-04 19:00:22.243554598 -0500
+++ new/usr/src/lib/libm/common/Q/gammal_r.c	2014-11-04 19:00:22.255177322 -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-04 19:00:22.675429137 -0500
+++ new/usr/src/lib/libm/common/Q/hypotl.c	2014-11-04 19:00:22.687208889 -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-04 19:00:23.089829639 -0500
+++ new/usr/src/lib/libm/common/Q/ieee_funcl.c	2014-11-04 19:00:23.101219677 -0500
@@ -27,12 +27,6 @@
  * Use is subject to license terms.
  */
 
-#pragma weak isinfl = __isinfl
-#pragma weak isnormall = __isnormall
-#pragma weak issubnormall = __issubnormall
-#pragma weak iszerol = __iszerol
-#pragma weak signbitl = __signbitl
-
 #include "libm.h"
 
 #if defined(__sparc)
--- old/usr/src/lib/libm/common/Q/ilogbl.c	2014-11-04 19:00:23.524995632 -0500
+++ new/usr/src/lib/libm/common/Q/ilogbl.c	2014-11-04 19:00:23.536444852 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak ilogbl = __ilogbl
+#pragma weak __ilogbl = ilogbl
 
 #include "libm.h"
 #include "xpg6.h"	/* __xpg6 */
--- old/usr/src/lib/libm/common/Q/isnanl.c	2014-11-04 19:00:24.572433354 -0500
+++ new/usr/src/lib/libm/common/Q/isnanl.c	2014-11-04 19:00:24.584044808 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak isnanl = __isnanl
+#pragma weak __isnanl = isnanl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/Q/j0l.c	2014-11-04 19:00:24.997164991 -0500
+++ new/usr/src/lib/libm/common/Q/j0l.c	2014-11-04 19:00:25.010750451 -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-04 19:00:25.443710820 -0500
+++ new/usr/src/lib/libm/common/Q/j1l.c	2014-11-04 19:00:25.455466396 -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-04 19:00:25.900690809 -0500
+++ new/usr/src/lib/libm/common/Q/jnl.c	2014-11-04 19:00:25.912262035 -0500
@@ -27,8 +27,8 @@
  * Use is subject to license terms.
  */
 
-#pragma weak jnl = __jnl
-#pragma weak ynl = __ynl
+#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-04 19:00:26.346072908 -0500
+++ new/usr/src/lib/libm/common/Q/lgammal.c	2014-11-04 19:00:26.357606215 -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-04 19:00:26.742332768 -0500
+++ new/usr/src/lib/libm/common/Q/lgammal_r.c	2014-11-04 19:00:26.753807717 -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-04 19:00:27.148427788 -0500
+++ new/usr/src/lib/libm/common/Q/log10l.c	2014-11-04 19:00:27.159814164 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak log10l = __log10l
+#pragma weak __log10l = log10l
 
 /*
  * log10l(X)
--- old/usr/src/lib/libm/common/Q/log1pl.c	2014-11-04 19:00:27.546816538 -0500
+++ new/usr/src/lib/libm/common/Q/log1pl.c	2014-11-04 19:00:27.558224462 -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-04 19:00:27.952525398 -0500
+++ new/usr/src/lib/libm/common/Q/log2l.c	2014-11-04 19:00:27.963910045 -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-04 19:00:28.348970440 -0500
+++ new/usr/src/lib/libm/common/Q/logbl.c	2014-11-04 19:00:28.360439419 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak logbl = __logbl
+#pragma weak __logbl = logbl
 
 #include "libm.h"
 #include "xpg6.h"	/* __xpg6 */
--- old/usr/src/lib/libm/common/Q/logl.c	2014-11-04 19:00:29.361505295 -0500
+++ new/usr/src/lib/libm/common/Q/logl.c	2014-11-04 19:00:29.373706607 -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-04 19:00:29.847258612 -0500
+++ new/usr/src/lib/libm/common/Q/nextafterl.c	2014-11-04 19:00:29.858565670 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak nextafterl = __nextafterl
+#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-04 19:00:30.251813054 -0500
+++ new/usr/src/lib/libm/common/Q/powl.c	2014-11-04 19:00:30.263376075 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak powl = __powl
+#pragma weak __powl = powl
 
 #include "libm.h"
 #include "xpg6.h"	/* __xpg6 */
--- old/usr/src/lib/libm/common/Q/remainderl.c	2014-11-04 19:00:30.670481566 -0500
+++ new/usr/src/lib/libm/common/Q/remainderl.c	2014-11-04 19:00:30.681816686 -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-04 19:00:31.069444933 -0500
+++ new/usr/src/lib/libm/common/Q/rintl.c	2014-11-04 19:00:31.080785614 -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-04 19:00:31.465833384 -0500
+++ new/usr/src/lib/libm/common/Q/rndintl.c	2014-11-04 19:00:31.477149324 -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-04 19:00:31.863631404 -0500
+++ new/usr/src/lib/libm/common/Q/scalbl.c	2014-11-04 19:00:31.874989407 -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-04 19:00:32.259651073 -0500
+++ new/usr/src/lib/libm/common/Q/scalbnl.c	2014-11-04 19:00:32.271283472 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak scalbnl = __scalbnl
+#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-04 19:00:32.668793990 -0500
+++ new/usr/src/lib/libm/common/Q/signgaml.c	2014-11-04 19:00:32.679968989 -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-04 19:00:33.072821904 -0500
+++ new/usr/src/lib/libm/common/Q/significandl.c	2014-11-04 19:00:33.084138633 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak significandl = __significandl
+#pragma weak __significandl = significandl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/Q/sincosl.c	2014-11-04 19:00:33.467685737 -0500
+++ new/usr/src/lib/libm/common/Q/sincosl.c	2014-11-04 19:00:33.479037383 -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-04 19:00:34.505652961 -0500
+++ new/usr/src/lib/libm/common/Q/sincospil.c	2014-11-04 19:00:34.517225436 -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-04 19:00:34.938600041 -0500
+++ new/usr/src/lib/libm/common/Q/sinhl.c	2014-11-04 19:00:34.950021670 -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-04 19:00:35.358969787 -0500
+++ new/usr/src/lib/libm/common/Q/sinl.c	2014-11-04 19:00:35.371241323 -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-04 19:00:35.758305730 -0500
+++ new/usr/src/lib/libm/common/Q/sinpil.c	2014-11-04 19:00:35.769787212 -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-04 19:00:36.185982927 -0500
+++ new/usr/src/lib/libm/common/Q/sqrtl.c	2014-11-04 19:00:36.197469457 -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-04 19:00:36.644556081 -0500
+++ new/usr/src/lib/libm/common/Q/tanhl.c	2014-11-04 19:00:36.656162154 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak tanhl = __tanhl
+#pragma weak __tanhl = tanhl
 
 /*
  * tanhl(x) returns the hyperbolic tangent of x
--- old/usr/src/lib/libm/common/Q/tanl.c	2014-11-04 19:00:37.061085420 -0500
+++ new/usr/src/lib/libm/common/Q/tanl.c	2014-11-04 19:00:37.072454356 -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-04 19:00:37.467892066 -0500
+++ new/usr/src/lib/libm/common/R/acosf.c	2014-11-04 19:00:37.479455655 -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-04 19:00:37.860455511 -0500
+++ new/usr/src/lib/libm/common/R/acoshf.c	2014-11-04 19:00:37.871936337 -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-04 19:00:38.253416201 -0500
+++ new/usr/src/lib/libm/common/R/asinf.c	2014-11-04 19:00:38.264968731 -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-04 19:00:38.798219728 -0500
+++ new/usr/src/lib/libm/common/R/asinhf.c	2014-11-04 19:00:38.829278397 -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-04 19:00:39.528834088 -0500
+++ new/usr/src/lib/libm/common/R/atan2f.c	2014-11-04 19:00:39.541543615 -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-04 19:00:39.944662555 -0500
+++ new/usr/src/lib/libm/common/R/atan2pif.c	2014-11-04 19:00:39.955933233 -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-04 19:00:40.341107111 -0500
+++ new/usr/src/lib/libm/common/R/atanf.c	2014-11-04 19:00:40.352614370 -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-04 19:00:40.748787309 -0500
+++ new/usr/src/lib/libm/common/R/atanhf.c	2014-11-04 19:00:40.760116192 -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-04 19:00:41.143735480 -0500
+++ new/usr/src/lib/libm/common/R/besself.c	2014-11-04 19:00:41.155491538 -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-04 19:00:41.604158779 -0500
+++ new/usr/src/lib/libm/common/R/cbrtf.c	2014-11-04 19:00:41.615555520 -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-04 19:00:42.010223318 -0500
+++ new/usr/src/lib/libm/common/R/copysignf.c	2014-11-04 19:00:42.021510025 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak copysignf = __copysignf
+#pragma weak __copysignf = copysignf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/cosf.c	2014-11-04 19:00:42.405440223 -0500
+++ new/usr/src/lib/libm/common/R/cosf.c	2014-11-04 19:00:42.416781654 -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-04 19:00:42.805487819 -0500
+++ new/usr/src/lib/libm/common/R/coshf.c	2014-11-04 19:00:42.816987437 -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-04 19:00:43.198835666 -0500
+++ new/usr/src/lib/libm/common/R/erff.c	2014-11-04 19:00:43.210186677 -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-04 19:00:43.899733202 -0500
+++ new/usr/src/lib/libm/common/R/exp10f.c	2014-11-04 19:00:43.911739254 -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-04 19:00:44.912933772 -0500
+++ new/usr/src/lib/libm/common/R/exp2f.c	2014-11-04 19:00:44.924366091 -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-04 19:00:45.327313691 -0500
+++ new/usr/src/lib/libm/common/R/expf.c	2014-11-04 19:00:45.338955513 -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-04 19:00:45.747433225 -0500
+++ new/usr/src/lib/libm/common/R/expm1f.c	2014-11-04 19:00:45.759121896 -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-04 19:00:46.169817508 -0500
+++ new/usr/src/lib/libm/common/R/fabsf.c	2014-11-04 19:00:46.181154846 -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-04 19:00:46.576878957 -0500
+++ new/usr/src/lib/libm/common/R/floorf.c	2014-11-04 19:00:46.588096524 -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-04 19:00:46.992545704 -0500
+++ new/usr/src/lib/libm/common/R/fmodf.c	2014-11-04 19:00:47.006109085 -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-04 19:00:47.403627753 -0500
+++ new/usr/src/lib/libm/common/R/gammaf.c	2014-11-04 19:00:47.415025460 -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-04 19:00:47.818204303 -0500
+++ new/usr/src/lib/libm/common/R/gammaf_r.c	2014-11-04 19:00:47.829584317 -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-04 19:00:48.241154563 -0500
+++ new/usr/src/lib/libm/common/R/hypotf.c	2014-11-04 19:00:48.252381786 -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-04 19:00:48.818330217 -0500
+++ new/usr/src/lib/libm/common/R/ilogbf.c	2014-11-04 19:00:48.840956355 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak ilogbf = __ilogbf
+#pragma weak __ilogbf = ilogbf
 
 #include "libm.h"
 #include "xpg6.h"	/* __xpg6 */
--- old/usr/src/lib/libm/common/R/isnanf.c	2014-11-04 19:00:49.382133384 -0500
+++ new/usr/src/lib/libm/common/R/isnanf.c	2014-11-04 19:00:49.393725505 -0500
@@ -27,8 +27,8 @@
  * Use is subject to license terms.
  */
 
-#pragma weak isnanf = __isnanf
-#pragma weak _isnanf = __isnanf
+#pragma weak __isnanf = isnanf
+#pragma weak _isnanf = isnanf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/lgammaf.c	2014-11-04 19:00:49.773640863 -0500
+++ new/usr/src/lib/libm/common/R/lgammaf.c	2014-11-04 19:00:49.786374363 -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-04 19:00:50.168612643 -0500
+++ new/usr/src/lib/libm/common/R/lgammaf_r.c	2014-11-04 19:00:50.179952084 -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-04 19:00:50.573999144 -0500
+++ new/usr/src/lib/libm/common/R/log10f.c	2014-11-04 19:00:50.585209443 -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-04 19:00:51.055412894 -0500
+++ new/usr/src/lib/libm/common/R/log1pf.c	2014-11-04 19:00:51.066689194 -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-04 19:00:51.448821138 -0500
+++ new/usr/src/lib/libm/common/R/log2f.c	2014-11-04 19:00:51.460418271 -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-04 19:00:51.843097398 -0500
+++ new/usr/src/lib/libm/common/R/logbf.c	2014-11-04 19:00:51.854729379 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak logbf = __logbf
+#pragma weak __logbf = logbf
 
 #include "libm.h"
 #include "xpg6.h"	/* __xpg6 */
--- old/usr/src/lib/libm/common/R/logf.c	2014-11-04 19:00:52.241451567 -0500
+++ new/usr/src/lib/libm/common/R/logf.c	2014-11-04 19:00:52.253004904 -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-04 19:00:52.647380183 -0500
+++ new/usr/src/lib/libm/common/R/nextafterf.c	2014-11-04 19:00:52.658952109 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak nextafterf = __nextafterf
+#pragma weak __nextafterf = nextafterf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/powf.c	2014-11-04 19:00:53.046479275 -0500
+++ new/usr/src/lib/libm/common/R/powf.c	2014-11-04 19:00:53.058046838 -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-04 19:00:53.469857561 -0500
+++ new/usr/src/lib/libm/common/R/remainderf.c	2014-11-04 19:00:53.481278476 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak remainderf = __remainderf
+#pragma weak __remainderf = remainderf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/rintf.c	2014-11-04 19:00:54.606021239 -0500
+++ new/usr/src/lib/libm/common/R/rintf.c	2014-11-04 19:00:54.617901419 -0500
@@ -27,11 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak aintf = __aintf
-#pragma weak anintf = __anintf
-#pragma weak irintf = __irintf
-#pragma weak nintf = __nintf
-#pragma weak rintf = __rintf
+#pragma weak __rintf = rintf
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/R/scalbf.c	2014-11-04 19:00:55.008853579 -0500
+++ new/usr/src/lib/libm/common/R/scalbf.c	2014-11-04 19:00:55.020394620 -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-04 19:00:55.407239051 -0500
+++ new/usr/src/lib/libm/common/R/scalbnf.c	2014-11-04 19:00:55.419110520 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak scalbnf = __scalbnf
+#pragma weak __scalbnf = scalbnf
 
 #include "libm.h"
 #include <float.h>		/* FLT_MAX, FLT_MIN */
--- old/usr/src/lib/libm/common/R/signgamf.c	2014-11-04 19:00:55.808137965 -0500
+++ new/usr/src/lib/libm/common/R/signgamf.c	2014-11-04 19:00:55.819919957 -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-04 19:00:56.204701969 -0500
+++ new/usr/src/lib/libm/common/R/significandf.c	2014-11-04 19:00:56.216452624 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak significandf = __significandf
+#pragma weak __significandf = significandf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/sincosf.c	2014-11-04 19:00:56.612439714 -0500
+++ new/usr/src/lib/libm/common/R/sincosf.c	2014-11-04 19:00:56.623831135 -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-04 19:00:57.027025429 -0500
+++ new/usr/src/lib/libm/common/R/sincospif.c	2014-11-04 19:00:57.039556236 -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-04 19:00:57.424564846 -0500
+++ new/usr/src/lib/libm/common/R/sinf.c	2014-11-04 19:00:57.436031474 -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-04 19:00:57.826060440 -0500
+++ new/usr/src/lib/libm/common/R/sinhf.c	2014-11-04 19:00:57.837673571 -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-04 19:00:58.222696000 -0500
+++ new/usr/src/lib/libm/common/R/sqrtf.c	2014-11-04 19:00:58.234290642 -0500
@@ -26,7 +26,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak sqrtf = __sqrtf
+#pragma weak __sqrtf = sqrtf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/R/tanf.c	2014-11-04 19:00:59.007189246 -0500
+++ new/usr/src/lib/libm/common/R/tanf.c	2014-11-04 19:00:59.028358949 -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-04 19:00:59.613708948 -0500
+++ new/usr/src/lib/libm/common/R/tanhf.c	2014-11-04 19:00:59.625116349 -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-04 19:01:00.080483179 -0500
+++ new/usr/src/lib/libm/common/complex/cabs.c	2014-11-04 19:01:00.092077472 -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-04 19:01:00.504140420 -0500
+++ new/usr/src/lib/libm/common/complex/cabsf.c	2014-11-04 19:01:00.515567773 -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-04 19:01:00.933906721 -0500
+++ new/usr/src/lib/libm/common/complex/cabsl.c	2014-11-04 19:01:00.945285360 -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-04 19:01:01.344887941 -0500
+++ new/usr/src/lib/libm/common/complex/cacos.c	2014-11-04 19:01:01.356243964 -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-04 19:01:01.776621443 -0500
+++ new/usr/src/lib/libm/common/complex/cacosf.c	2014-11-04 19:01:01.789534683 -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-04 19:01:02.206905319 -0500
+++ new/usr/src/lib/libm/common/complex/cacosh.c	2014-11-04 19:01:02.218440648 -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-04 19:01:02.626252887 -0500
+++ new/usr/src/lib/libm/common/complex/cacoshf.c	2014-11-04 19:01:02.637751879 -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-04 19:01:03.091628105 -0500
+++ new/usr/src/lib/libm/common/complex/cacoshl.c	2014-11-04 19:01:03.103132545 -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-04 19:01:03.499858693 -0500
+++ new/usr/src/lib/libm/common/complex/cacosl.c	2014-11-04 19:01:03.511370288 -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-04 19:01:04.216627693 -0500
+++ new/usr/src/lib/libm/common/complex/carg.c	2014-11-04 19:01:04.228485736 -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-04 19:01:04.871708908 -0500
+++ new/usr/src/lib/libm/common/complex/cargf.c	2014-11-04 19:01:04.882957718 -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-04 19:01:05.264201348 -0500
+++ new/usr/src/lib/libm/common/complex/cargl.c	2014-11-04 19:01:05.275554980 -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-04 19:01:05.669141443 -0500
+++ new/usr/src/lib/libm/common/complex/casin.c	2014-11-04 19:01:05.680713606 -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-04 19:01:06.098786366 -0500
+++ new/usr/src/lib/libm/common/complex/casinf.c	2014-11-04 19:01:06.110136912 -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-04 19:01:06.491230337 -0500
+++ new/usr/src/lib/libm/common/complex/casinh.c	2014-11-04 19:01:06.502520383 -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-04 19:01:06.884550102 -0500
+++ new/usr/src/lib/libm/common/complex/casinhf.c	2014-11-04 19:01:06.896036520 -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-04 19:01:07.277695187 -0500
+++ new/usr/src/lib/libm/common/complex/casinhl.c	2014-11-04 19:01:07.291072482 -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-04 19:01:07.672974352 -0500
+++ new/usr/src/lib/libm/common/complex/casinl.c	2014-11-04 19:01:07.684419152 -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-04 19:01:08.080880762 -0500
+++ new/usr/src/lib/libm/common/complex/catan.c	2014-11-04 19:01:08.092534412 -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-04 19:01:08.503380412 -0500
+++ new/usr/src/lib/libm/common/complex/catanf.c	2014-11-04 19:01:08.514728119 -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-04 19:01:09.187959774 -0500
+++ new/usr/src/lib/libm/common/complex/catanh.c	2014-11-04 19:01:09.210484695 -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-04 19:01:09.708580422 -0500
+++ new/usr/src/lib/libm/common/complex/catanhf.c	2014-11-04 19:01:09.720325311 -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-04 19:01:10.184904265 -0500
+++ new/usr/src/lib/libm/common/complex/catanhl.c	2014-11-04 19:01:10.196381599 -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-04 19:01:10.579077015 -0500
+++ new/usr/src/lib/libm/common/complex/catanl.c	2014-11-04 19:01:10.590695524 -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-04 19:01:10.991016941 -0500
+++ new/usr/src/lib/libm/common/complex/ccos.c	2014-11-04 19:01:11.002383906 -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-04 19:01:11.413520877 -0500
+++ new/usr/src/lib/libm/common/complex/ccosf.c	2014-11-04 19:01:11.425010322 -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-04 19:01:11.809200147 -0500
+++ new/usr/src/lib/libm/common/complex/ccosh.c	2014-11-04 19:01:11.820945156 -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-04 19:01:12.209178511 -0500
+++ new/usr/src/lib/libm/common/complex/ccoshf.c	2014-11-04 19:01:12.221021607 -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-04 19:01:12.606819875 -0500
+++ new/usr/src/lib/libm/common/complex/ccoshl.c	2014-11-04 19:01:12.618428456 -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-04 19:01:13.002013826 -0500
+++ new/usr/src/lib/libm/common/complex/ccosl.c	2014-11-04 19:01:13.015442889 -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-04 19:01:13.397883350 -0500
+++ new/usr/src/lib/libm/common/complex/cexp.c	2014-11-04 19:01:13.409224531 -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-04 19:01:13.840525546 -0500
+++ new/usr/src/lib/libm/common/complex/cexpf.c	2014-11-04 19:01:13.851927111 -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-04 19:01:14.245604628 -0500
+++ new/usr/src/lib/libm/common/complex/cexpl.c	2014-11-04 19:01:14.256860985 -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-04 19:01:14.657051109 -0500
+++ new/usr/src/lib/libm/common/complex/cimag.c	2014-11-04 19:01:14.668458131 -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-04 19:01:15.050800258 -0500
+++ new/usr/src/lib/libm/common/complex/cimagf.c	2014-11-04 19:01:15.062012669 -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-04 19:01:15.442335570 -0500
+++ new/usr/src/lib/libm/common/complex/cimagl.c	2014-11-04 19:01:15.453687984 -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-04 19:01:15.834508326 -0500
+++ new/usr/src/lib/libm/common/complex/clog.c	2014-11-04 19:01:15.846058399 -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-04 19:01:16.235329969 -0500
+++ new/usr/src/lib/libm/common/complex/clogf.c	2014-11-04 19:01:16.246701289 -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-04 19:01:16.631961397 -0500
+++ new/usr/src/lib/libm/common/complex/clogl.c	2014-11-04 19:01:16.643274202 -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-04 19:01:17.028461505 -0500
+++ new/usr/src/lib/libm/common/complex/conj.c	2014-11-04 19:01:17.041210415 -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-04 19:01:17.438246588 -0500
+++ new/usr/src/lib/libm/common/complex/conjf.c	2014-11-04 19:01:17.449839984 -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-04 19:01:17.880080064 -0500
+++ new/usr/src/lib/libm/common/complex/conjl.c	2014-11-04 19:01:17.891364228 -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-04 19:01:18.271086979 -0500
+++ new/usr/src/lib/libm/common/complex/cpow.c	2014-11-04 19:01:18.284297518 -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-04 19:01:18.733940593 -0500
+++ new/usr/src/lib/libm/common/complex/cpowf.c	2014-11-04 19:01:18.745282606 -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-04 19:01:19.140837701 -0500
+++ new/usr/src/lib/libm/common/complex/cpowl.c	2014-11-04 19:01:19.152231990 -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-04 19:01:19.555079829 -0500
+++ new/usr/src/lib/libm/common/complex/cproj.c	2014-11-04 19:01:19.566433744 -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-04 19:01:19.947746353 -0500
+++ new/usr/src/lib/libm/common/complex/cprojf.c	2014-11-04 19:01:19.959167578 -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-04 19:01:20.416006268 -0500
+++ new/usr/src/lib/libm/common/complex/cprojl.c	2014-11-04 19:01:20.427323435 -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-04 19:01:20.825327004 -0500
+++ new/usr/src/lib/libm/common/complex/creal.c	2014-11-04 19:01:20.836841968 -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-04 19:01:21.253344629 -0500
+++ new/usr/src/lib/libm/common/complex/crealf.c	2014-11-04 19:01:21.264770248 -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-04 19:01:21.652531461 -0500
+++ new/usr/src/lib/libm/common/complex/creall.c	2014-11-04 19:01:21.664062634 -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-04 19:01:22.068013576 -0500
+++ new/usr/src/lib/libm/common/complex/csin.c	2014-11-04 19:01:22.079531895 -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-04 19:01:22.489558640 -0500
+++ new/usr/src/lib/libm/common/complex/csinf.c	2014-11-04 19:01:22.500957072 -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-04 19:01:22.892312945 -0500
+++ new/usr/src/lib/libm/common/complex/csinh.c	2014-11-04 19:01:22.903635118 -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-04 19:01:23.332974737 -0500
+++ new/usr/src/lib/libm/common/complex/csinhf.c	2014-11-04 19:01:23.344856444 -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-04 19:01:23.935546383 -0500
+++ new/usr/src/lib/libm/common/complex/csinhl.c	2014-11-04 19:01:24.060810667 -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-04 19:01:24.449685243 -0500
+++ new/usr/src/lib/libm/common/complex/csinl.c	2014-11-04 19:01:24.461031894 -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-04 19:01:24.843010971 -0500
+++ new/usr/src/lib/libm/common/complex/csqrt.c	2014-11-04 19:01:24.854622258 -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-04 19:01:25.249699194 -0500
+++ new/usr/src/lib/libm/common/complex/csqrtf.c	2014-11-04 19:01:25.261076572 -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-04 19:01:25.650468192 -0500
+++ new/usr/src/lib/libm/common/complex/csqrtl.c	2014-11-04 19:01:25.661837592 -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-04 19:01:26.055446497 -0500
+++ new/usr/src/lib/libm/common/complex/ctan.c	2014-11-04 19:01:26.066778495 -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-04 19:01:26.468967233 -0500
+++ new/usr/src/lib/libm/common/complex/ctanf.c	2014-11-04 19:01:26.480402551 -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-04 19:01:26.866988097 -0500
+++ new/usr/src/lib/libm/common/complex/ctanh.c	2014-11-04 19:01:26.878797068 -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-04 19:01:27.271490650 -0500
+++ new/usr/src/lib/libm/common/complex/ctanhf.c	2014-11-04 19:01:27.284511079 -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-04 19:01:27.674645592 -0500
+++ new/usr/src/lib/libm/common/complex/ctanhl.c	2014-11-04 19:01:27.685995195 -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-04 19:01:28.077020309 -0500
+++ new/usr/src/lib/libm/common/complex/ctanl.c	2014-11-04 19:01:28.088337911 -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-04 19:01:28.484985223 -0500
+++ new/usr/src/lib/libm/common/m9x/__fex_hdlr.c	2014-11-04 19:01:28.496536436 -0500
@@ -27,7 +27,6 @@
  * Use is subject to license terms.
  */
 
-#include "fenv_synonyms.h"
 #undef lint
 #include <signal.h>
 #include <siginfo.h>
--- old/usr/src/lib/libm/common/m9x/__fex_i386.c	2014-11-04 19:01:29.314761465 -0500
+++ new/usr/src/lib/libm/common/m9x/__fex_i386.c	2014-11-04 19:01:29.326578226 -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-04 19:01:29.864322903 -0500
+++ new/usr/src/lib/libm/common/m9x/__fex_sparc.c	2014-11-04 19:01:29.876065471 -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-04 19:01:30.349137908 -0500
+++ new/usr/src/lib/libm/common/m9x/__fex_sse.c	2014-11-04 19:01:30.361794060 -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-04 19:01:30.895528904 -0500
+++ new/usr/src/lib/libm/common/m9x/__fex_sym.c	2014-11-04 19:01:30.906964110 -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/feexcept.c	2014-11-04 19:01:31.347007117 -0500
+++ new/usr/src/lib/libm/common/m9x/feexcept.c	2014-11-04 19:01:31.359442646 -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-04 19:01:31.758071585 -0500
+++ new/usr/src/lib/libm/common/m9x/fenv.c	2014-11-04 19:01:31.769422365 -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-04 19:01:32.177332246 -0500
+++ /dev/null	2014-11-04 19:01:32.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-04 19:01:32.393662380 -0500
+++ new/usr/src/lib/libm/common/m9x/feprec.c	2014-11-04 19:01:32.405255275 -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-04 19:01:32.806150282 -0500
+++ new/usr/src/lib/libm/common/m9x/feround.c	2014-11-04 19:01:32.817748735 -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-04 19:01:33.233239491 -0500
+++ new/usr/src/lib/libm/common/m9x/fex_handler.c	2014-11-04 19:01:33.244818569 -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-04 19:01:34.096123840 -0500
+++ new/usr/src/lib/libm/common/m9x/fex_log.c	2014-11-04 19:01:34.130773016 -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/ldexp.c	2014-11-04 19:01:34.905653576 -0500
+++ new/usr/src/lib/libm/common/m9x/ldexp.c	2014-11-04 19:01:34.917227164 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak ldexp = __ldexp
+#pragma weak __ldexp = ldexp
 
 #include "libm.h"
 #include <errno.h>
--- old/usr/src/lib/libm/common/m9x/ldexpf.c	2014-11-04 19:01:35.330978571 -0500
+++ new/usr/src/lib/libm/common/m9x/ldexpf.c	2014-11-04 19:01:35.342692109 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak ldexpf = __ldexpf
+#pragma weak __ldexpf = ldexpf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/m9x/ldexpl.c	2014-11-04 19:01:35.742035640 -0500
+++ new/usr/src/lib/libm/common/m9x/ldexpl.c	2014-11-04 19:01:35.753625003 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak ldexpl = __ldexpl
+#pragma weak __ldexpl = ldexpl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/m9x/llrint.c	2014-11-04 19:01:36.139140559 -0500
+++ new/usr/src/lib/libm/common/m9x/llrint.c	2014-11-04 19:01:36.150731858 -0500
@@ -27,10 +27,10 @@
  * Use is subject to license terms.
  */
 
-#pragma weak llrint = __llrint
+#pragma weak __llrint = llrint
 #if defined(__sparcv9) || defined(__amd64)
-#pragma weak lrint = __llrint
-#pragma weak __lrint = __llrint
+#pragma weak lrint = llrint
+#pragma weak __lrint = llrint
 #endif
 
 /*
--- old/usr/src/lib/libm/common/m9x/llrintf.c	2014-11-04 19:01:36.552017175 -0500
+++ new/usr/src/lib/libm/common/m9x/llrintf.c	2014-11-04 19:01:36.563484091 -0500
@@ -27,10 +27,10 @@
  * Use is subject to license terms.
  */
 
-#pragma weak llrintf = __llrintf
+#pragma weak __llrintf = llrintf
 #if defined(__sparcv9) || defined(__amd64)
-#pragma weak lrintf = __llrintf
-#pragma weak __lrintf = __llrintf
+#pragma weak lrintf = llrintf
+#pragma weak __lrintf = llrintf
 #endif
 
 #include "libm.h"
--- old/usr/src/lib/libm/common/m9x/llrintl.c	2014-11-04 19:01:37.070628221 -0500
+++ new/usr/src/lib/libm/common/m9x/llrintl.c	2014-11-04 19:01:37.082010029 -0500
@@ -27,10 +27,10 @@
  * Use is subject to license terms.
  */
 
-#pragma weak llrintl = __llrintl
+#pragma weak __llrintl = llrintl
 #if defined(__sparcv9) || defined(__amd64)
-#pragma weak lrintl = __llrintl
-#pragma weak __lrintl = __llrintl
+#pragma weak lrintl = llrintl
+#pragma weak __lrintl = llrintl
 #endif
 
 #include "libm.h"
--- old/usr/src/lib/libm/common/m9x/llround.c	2014-11-04 19:01:37.491920157 -0500
+++ new/usr/src/lib/libm/common/m9x/llround.c	2014-11-04 19:01:37.503222691 -0500
@@ -27,10 +27,10 @@
  * Use is subject to license terms.
  */
 
-#pragma weak llround = __llround
+#pragma weak __llround = llround
 #if defined(__sparcv9) || defined(__amd64)
-#pragma weak lround = __llround
-#pragma weak __lround = __llround
+#pragma weak lround = llround
+#pragma weak __lround = llround
 #endif
 
 /*
--- old/usr/src/lib/libm/common/m9x/llroundf.c	2014-11-04 19:01:37.928291561 -0500
+++ new/usr/src/lib/libm/common/m9x/llroundf.c	2014-11-04 19:01:37.939731413 -0500
@@ -27,10 +27,10 @@
  * Use is subject to license terms.
  */
 
-#pragma weak llroundf = __llroundf
+#pragma weak __llroundf = llroundf
 #if defined(__sparcv9) || defined(__amd64)
-#pragma weak lroundf = __llroundf
-#pragma weak __lroundf = __llroundf
+#pragma weak lroundf = llroundf
+#pragma weak __lroundf = llroundf
 #endif
 
 #include "libm.h"
--- old/usr/src/lib/libm/common/m9x/llroundl.c	2014-11-04 19:01:38.351763255 -0500
+++ new/usr/src/lib/libm/common/m9x/llroundl.c	2014-11-04 19:01:38.364227185 -0500
@@ -27,10 +27,10 @@
  * Use is subject to license terms.
  */
 
-#pragma weak llroundl = __llroundl
+#pragma weak __llroundl = llroundl
 #if defined(__sparcv9) || defined(__amd64)
-#pragma weak lroundl = __llroundl
-#pragma weak __lroundl = __llroundl
+#pragma weak lroundl = llroundl
+#pragma weak __lroundl = llroundl
 #endif
 
 #include "libm.h"
--- old/usr/src/lib/libm/common/m9x/lrint.c	2014-11-04 19:01:39.011278921 -0500
+++ new/usr/src/lib/libm/common/m9x/lrint.c	2014-11-04 19:01:39.034399537 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak lrint = __lrint
+#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-04 19:01:39.439730433 -0500
+++ new/usr/src/lib/libm/common/m9x/lrintf.c	2014-11-04 19:01:39.451272241 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak lrintf = __lrintf
+#pragma weak __lrintf = lrintf
 
 #include <sys/isa_defs.h>	/* _ILP32 */
 #include "libm.h"
--- old/usr/src/lib/libm/common/m9x/lrintl.c	2014-11-04 19:01:39.839751218 -0500
+++ new/usr/src/lib/libm/common/m9x/lrintl.c	2014-11-04 19:01:39.851061381 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak lrintl = __lrintl
+#pragma weak __lrintl = lrintl
 
 #include <sys/isa_defs.h>	/* _ILP32 */
 #include "libm.h"
--- old/usr/src/lib/libm/common/m9x/lround.c	2014-11-04 19:01:40.314702725 -0500
+++ new/usr/src/lib/libm/common/m9x/lround.c	2014-11-04 19:01:40.326160624 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak lround = __lround
+#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-04 19:01:40.714104148 -0500
+++ new/usr/src/lib/libm/common/m9x/lroundf.c	2014-11-04 19:01:40.725477346 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak lroundf = __lroundf
+#pragma weak __lroundf = lroundf
 
 #include <sys/isa_defs.h>	/* _ILP32 */
 #include "libm.h"
--- old/usr/src/lib/libm/common/m9x/lroundl.c	2014-11-04 19:01:41.114041777 -0500
+++ new/usr/src/lib/libm/common/m9x/lroundl.c	2014-11-04 19:01:41.125484655 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak lroundl = __lroundl
+#pragma weak __lroundl = lroundl
 
 #include <sys/isa_defs.h>	/* _ILP32 */
 #include "libm.h"
--- old/usr/src/lib/libm/common/m9x/nearbyint.c	2014-11-04 19:01:41.540022328 -0500
+++ new/usr/src/lib/libm/common/m9x/nearbyint.c	2014-11-04 19:01:41.551478051 -0500
@@ -39,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-04 19:01:41.945114553 -0500
+++ new/usr/src/lib/libm/common/m9x/nearbyintf.c	2014-11-04 19:01:41.956698050 -0500
@@ -30,7 +30,6 @@
 #pragma weak nearbyintf = __nearbyintf
 
 #include "libm.h"
-#include "fenv_synonyms.h"
 #include <fenv.h>
 
 float
--- old/usr/src/lib/libm/common/m9x/nexttowardl.c	2014-11-04 19:01:42.358457841 -0500
+++ new/usr/src/lib/libm/common/m9x/nexttowardl.c	2014-11-04 19:01:42.369977110 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak nexttowardl = __nexttowardl
+#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-04 19:01:42.758759845 -0500
+++ new/usr/src/lib/libm/common/m9x/remquo.c	2014-11-04 19:01:42.770224647 -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-04 19:01:43.174693646 -0500
+++ new/usr/src/lib/libm/common/m9x/remquof.c	2014-11-04 19:01:43.186109489 -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-04 19:01:43.614898857 -0500
+++ new/usr/src/lib/libm/common/m9x/remquol.c	2014-11-04 19:01:43.629874064 -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-04 19:01:44.252855742 -0500
+++ new/usr/src/lib/libm/common/m9x/round.c	2014-11-04 19:01:44.264452291 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak round = __round
+#pragma weak __round = round
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/m9x/roundf.c	2014-11-04 19:01:44.668387630 -0500
+++ new/usr/src/lib/libm/common/m9x/roundf.c	2014-11-04 19:01:44.679859006 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak roundf = __roundf
+#pragma weak __roundf = roundf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/m9x/roundl.c	2014-11-04 19:01:45.069729099 -0500
+++ new/usr/src/lib/libm/common/m9x/roundl.c	2014-11-04 19:01:45.081244182 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak roundl = __roundl
+#pragma weak __roundl = roundl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/m9x/scalbln.c	2014-11-04 19:01:45.476331457 -0500
+++ new/usr/src/lib/libm/common/m9x/scalbln.c	2014-11-04 19:01:45.488025554 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak scalbln = __scalbln
+#pragma weak __scalbln = scalbln
 
 #include "libm.h"
 #include <float.h>		/* DBL_MAX, DBL_MIN */
--- old/usr/src/lib/libm/common/m9x/scalblnf.c	2014-11-04 19:01:45.878244626 -0500
+++ new/usr/src/lib/libm/common/m9x/scalblnf.c	2014-11-04 19:01:45.889784116 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak scalblnf = __scalblnf
+#pragma weak __scalblnf = scalblnf
 
 #include "libm.h"
 #include <float.h>		/* FLT_MAX, FLT_MIN */
--- old/usr/src/lib/libm/common/m9x/scalblnl.c	2014-11-04 19:01:46.283112419 -0500
+++ new/usr/src/lib/libm/common/m9x/scalblnl.c	2014-11-04 19:01:46.294675664 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak scalblnl = __scalblnl
+#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-04 19:01:46.683890878 -0500
+++ new/usr/src/lib/libm/common/m9x/tgamma.c	2014-11-04 19:01:46.695763333 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak tgamma = __tgamma
+#pragma weak __tgamma = tgamma
 
 /* INDENT OFF */
 /*
--- old/usr/src/lib/libm/common/m9x/tgammaf.c	2014-11-04 19:01:47.214487902 -0500
+++ new/usr/src/lib/libm/common/m9x/tgammaf.c	2014-11-04 19:01:47.225793215 -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-04 19:01:47.668106394 -0500
+++ new/usr/src/lib/libm/common/m9x/tgammal.c	2014-11-04 19:01:47.679778807 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak tgammal = __tgammal
+#pragma weak __tgammal = tgammal
 
 #include "libm.h"
 #include <sys/isa_defs.h>
--- old/usr/src/lib/libm/common/m9x/trunc.c	2014-11-04 19:01:48.150304604 -0500
+++ new/usr/src/lib/libm/common/m9x/trunc.c	2014-11-04 19:01:48.161637496 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak trunc = __trunc
+#pragma weak __trunc = trunc
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/m9x/truncf.c	2014-11-04 19:01:48.551814925 -0500
+++ new/usr/src/lib/libm/common/m9x/truncf.c	2014-11-04 19:01:48.563104447 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak truncf = __truncf
+#pragma weak __truncf = truncf
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/m9x/truncl.c	2014-11-04 19:01:49.189580796 -0500
+++ new/usr/src/lib/libm/common/m9x/truncl.c	2014-11-04 19:01:49.201366475 -0500
@@ -27,7 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma weak truncl = __truncl
+#pragma weak __truncl = truncl
 
 #include "libm.h"
 
--- old/usr/src/lib/libm/common/mapfile-vers	2014-11-04 19:01:49.632712265 -0500
+++ new/usr/src/lib/libm/common/mapfile-vers	2014-11-04 19:01:49.644647168 -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-04 19:01:50.099621138 -0500
+++ new/usr/src/lib/libm/i386/src/__reduction.s	2014-11-04 19:01:50.110865066 -0500
@@ -39,7 +39,6 @@
 /     ----------------------------------------------------------
 
 #include "libm.h"
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 #undef fabs
 
--- old/usr/src/lib/libm/i386/src/acos.s	2014-11-04 19:01:50.566532262 -0500
+++ new/usr/src/lib/libm/i386/src/acos.s	2014-11-04 19:01:50.581472685 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(acos,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
 #undef fabs
--- old/usr/src/lib/libm/i386/src/acosf.s	2014-11-04 19:01:50.969785845 -0500
+++ new/usr/src/lib/libm/i386/src/acosf.s	2014-11-04 19:01:50.981146856 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(acosf,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
 #undef fabs
--- old/usr/src/lib/libm/i386/src/acosl.s	2014-11-04 19:01:51.371375211 -0500
+++ new/usr/src/lib/libm/i386/src/acosl.s	2014-11-04 19:01:51.383073664 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(acosl,function)
-#include "libm_synonyms.h"
 
 #undef fabs
 
--- old/usr/src/lib/libm/i386/src/asin.s	2014-11-04 19:01:51.768936005 -0500
+++ new/usr/src/lib/libm/i386/src/asin.s	2014-11-04 19:01:51.781417917 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(asin,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
 #undef fabs
--- old/usr/src/lib/libm/i386/src/asinf.s	2014-11-04 19:01:52.170721708 -0500
+++ new/usr/src/lib/libm/i386/src/asinf.s	2014-11-04 19:01:52.181953748 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(asinf,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
 #undef fabs
--- old/usr/src/lib/libm/i386/src/asinl.s	2014-11-04 19:01:52.574776283 -0500
+++ new/usr/src/lib/libm/i386/src/asinl.s	2014-11-04 19:01:52.586412022 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(asinl,function)
-#include "libm_synonyms.h"
 
 #undef fabs
 
--- old/usr/src/lib/libm/i386/src/atan.s	2014-11-04 19:01:52.972737526 -0500
+++ new/usr/src/lib/libm/i386/src/atan.s	2014-11-04 19:01:52.984080292 -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-04 19:01:53.379061026 -0500
+++ new/usr/src/lib/libm/i386/src/atan2.s	2014-11-04 19:01:53.390513752 -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-04 19:01:53.927874284 -0500
+++ new/usr/src/lib/libm/i386/src/atan2f.s	2014-11-04 19:01:53.986107445 -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-04 19:01:54.462229621 -0500
+++ new/usr/src/lib/libm/i386/src/atan2l.s	2014-11-04 19:01:54.473543494 -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-04 19:01:54.856089592 -0500
+++ new/usr/src/lib/libm/i386/src/atanl.s	2014-11-04 19:01:54.867667596 -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-04 19:01:55.254363395 -0500
+++ new/usr/src/lib/libm/i386/src/ceil.s	2014-11-04 19:01:55.265952799 -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-04 19:01:55.651798863 -0500
+++ new/usr/src/lib/libm/i386/src/copysign.s	2014-11-04 19:01:55.663166323 -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-04 19:01:56.051332977 -0500
+++ new/usr/src/lib/libm/i386/src/copysignf.s	2014-11-04 19:01:56.062786573 -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-04 19:01:56.465319544 -0500
+++ new/usr/src/lib/libm/i386/src/copysignl.s	2014-11-04 19:01:56.477014903 -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-04 19:01:56.866596476 -0500
+++ new/usr/src/lib/libm/i386/src/cos.s	2014-11-04 19:01:56.878248562 -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-04 19:01:57.264550221 -0500
+++ new/usr/src/lib/libm/i386/src/exp.s	2014-11-04 19:01:57.277655616 -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-04 19:01:57.670373365 -0500
+++ new/usr/src/lib/libm/i386/src/exp10.s	2014-11-04 19:01:57.682035800 -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-04 19:01:58.076617542 -0500
+++ new/usr/src/lib/libm/i386/src/exp10f.s	2014-11-04 19:01:58.088177402 -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-04 19:01:58.478747933 -0500
+++ new/usr/src/lib/libm/i386/src/exp10l.s	2014-11-04 19:01:58.490341890 -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-04 19:01:59.374243035 -0500
+++ new/usr/src/lib/libm/i386/src/exp2.s	2014-11-04 19:01:59.385980838 -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-04 19:01:59.790759701 -0500
+++ new/usr/src/lib/libm/i386/src/exp2f.s	2014-11-04 19:01:59.801928666 -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-04 19:02:00.190714956 -0500
+++ new/usr/src/lib/libm/i386/src/exp2l.s	2014-11-04 19:02:00.202037910 -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-04 19:02:00.593557264 -0500
+++ new/usr/src/lib/libm/i386/src/expl.s	2014-11-04 19:02:00.604987220 -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-04 19:02:00.995945366 -0500
+++ new/usr/src/lib/libm/i386/src/expm1.s	2014-11-04 19:02:01.009204595 -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-04 19:02:01.402264840 -0500
+++ new/usr/src/lib/libm/i386/src/expm1f.s	2014-11-04 19:02:01.413712105 -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-04 19:02:01.806470661 -0500
+++ new/usr/src/lib/libm/i386/src/expm1l.s	2014-11-04 19:02:01.817838514 -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-04 19:02:02.210317991 -0500
+++ new/usr/src/lib/libm/i386/src/fabs.s	2014-11-04 19:02:02.221584928 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(fabs,function)
-#include "libm_synonyms.h"
 
 	ENTRY(fabs)
 	fldl    4(%esp)
--- old/usr/src/lib/libm/i386/src/fabsf.s	2014-11-04 19:02:02.631730247 -0500
+++ new/usr/src/lib/libm/i386/src/fabsf.s	2014-11-04 19:02:02.643140531 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(fabsf,function)
-#include "libm_synonyms.h"
 
 	ENTRY(fabsf)
 	flds    4(%esp)
--- old/usr/src/lib/libm/i386/src/fabsl.s	2014-11-04 19:02:03.029725863 -0500
+++ new/usr/src/lib/libm/i386/src/fabsl.s	2014-11-04 19:02:03.041356267 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(fabsl,function)
-#include "libm_synonyms.h"
 
 	ENTRY(fabsl)
 	fldt    4(%esp)
--- old/usr/src/lib/libm/i386/src/finitef.s	2014-11-04 19:02:03.424937252 -0500
+++ new/usr/src/lib/libm/i386/src/finitef.s	2014-11-04 19:02:03.436344505 -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-04 19:02:04.725936538 -0500
+++ new/usr/src/lib/libm/i386/src/finitel.s	2014-11-04 19:02:04.961308018 -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-04 19:02:05.372775937 -0500
+++ new/usr/src/lib/libm/i386/src/floor.s	2014-11-04 19:02:05.384119906 -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-04 19:02:05.782497273 -0500
+++ new/usr/src/lib/libm/i386/src/floorl.s	2014-11-04 19:02:05.795655460 -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-04 19:02:06.183727812 -0500
+++ new/usr/src/lib/libm/i386/src/fmod.s	2014-11-04 19:02:06.195272995 -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-04 19:02:06.583946965 -0500
+++ new/usr/src/lib/libm/i386/src/fmodf.s	2014-11-04 19:02:06.595656774 -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-04 19:02:06.978152680 -0500
+++ new/usr/src/lib/libm/i386/src/fmodl.s	2014-11-04 19:02:06.989594615 -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-04 19:02:07.377554913 -0500
+++ new/usr/src/lib/libm/i386/src/hypot.s	2014-11-04 19:02:07.388917768 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(hypot,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
 #undef fabs
--- old/usr/src/lib/libm/i386/src/hypotf.s	2014-11-04 19:02:07.778425027 -0500
+++ new/usr/src/lib/libm/i386/src/hypotf.s	2014-11-04 19:02:07.789927000 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(hypotf,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
 #undef fabs
--- old/usr/src/lib/libm/i386/src/ieee_funcl.s	2014-11-04 19:02:08.179059718 -0500
+++ new/usr/src/lib/libm/i386/src/ieee_funcl.s	2014-11-04 19:02:08.190547879 -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-04 19:02:08.925006293 -0500
+++ new/usr/src/lib/libm/i386/src/ilogb.s	2014-11-04 19:02:08.949582698 -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-04 19:02:09.507733189 -0500
+++ new/usr/src/lib/libm/i386/src/ilogbf.s	2014-11-04 19:02:09.519152058 -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-04 19:02:09.906834936 -0500
+++ new/usr/src/lib/libm/i386/src/ilogbl.s	2014-11-04 19:02:09.918193352 -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-04 19:02:10.307956929 -0500
+++ new/usr/src/lib/libm/i386/src/isnan.s	2014-11-04 19:02:10.319318194 -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-04 19:02:10.705728445 -0500
+++ new/usr/src/lib/libm/i386/src/isnanf.s	2014-11-04 19:02:10.717124659 -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-04 19:02:11.104977718 -0500
+++ new/usr/src/lib/libm/i386/src/isnanl.s	2014-11-04 19:02:11.116293534 -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-04 19:02:11.519315168 -0500
+++ new/usr/src/lib/libm/i386/src/llrint.s	2014-11-04 19:02:11.530857887 -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-04 19:02:11.933034339 -0500
+++ new/usr/src/lib/libm/i386/src/llrintf.s	2014-11-04 19:02:11.944419370 -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-04 19:02:12.331743884 -0500
+++ new/usr/src/lib/libm/i386/src/llrintl.s	2014-11-04 19:02:12.343566296 -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-04 19:02:12.733182025 -0500
+++ new/usr/src/lib/libm/i386/src/log.s	2014-11-04 19:02:12.744566408 -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-04 19:02:13.134988610 -0500
+++ new/usr/src/lib/libm/i386/src/log10.s	2014-11-04 19:02:13.146293900 -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-04 19:02:13.535620188 -0500
+++ new/usr/src/lib/libm/i386/src/log10f.s	2014-11-04 19:02:13.548225804 -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-04 19:02:14.159801102 -0500
+++ new/usr/src/lib/libm/i386/src/log10l.s	2014-11-04 19:02:14.442332303 -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-04 19:02:14.847413453 -0500
+++ new/usr/src/lib/libm/i386/src/log2.s	2014-11-04 19:02:14.858987171 -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-04 19:02:15.243651914 -0500
+++ new/usr/src/lib/libm/i386/src/log2f.s	2014-11-04 19:02:15.255011875 -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-04 19:02:15.641674876 -0500
+++ new/usr/src/lib/libm/i386/src/log2l.s	2014-11-04 19:02:15.653138486 -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-04 19:02:16.040327699 -0500
+++ new/usr/src/lib/libm/i386/src/logl.s	2014-11-04 19:02:16.052996643 -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-04 19:02:16.436958505 -0500
+++ new/usr/src/lib/libm/i386/src/lrint.s	2014-11-04 19:02:16.448221070 -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-04 19:02:16.833818669 -0500
+++ new/usr/src/lib/libm/i386/src/lrintf.s	2014-11-04 19:02:16.845194279 -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-04 19:02:17.230377620 -0500
+++ new/usr/src/lib/libm/i386/src/lrintl.s	2014-11-04 19:02:17.241750494 -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-04 19:02:17.639244085 -0500
+++ new/usr/src/lib/libm/i386/src/lround.s	2014-11-04 19:02:17.650496243 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(lround,function)
-#include "libm_synonyms.h"
 #undef fabs
 
 	.section .rodata
--- old/usr/src/lib/libm/i386/src/lroundl.s	2014-11-04 19:02:18.051725828 -0500
+++ new/usr/src/lib/libm/i386/src/lroundl.s	2014-11-04 19:02:18.063362306 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(lroundl,function)
-#include "libm_synonyms.h"
 #undef fabs
 
 	.section .rodata
--- old/usr/src/lib/libm/i386/src/nextafter.s	2014-11-04 19:02:18.450170681 -0500
+++ new/usr/src/lib/libm/i386/src/nextafter.s	2014-11-04 19:02:18.461546814 -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-04 19:02:19.088597721 -0500
+++ new/usr/src/lib/libm/i386/src/nextafterf.s	2014-11-04 19:02:19.100431362 -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-04 19:02:19.490057306 -0500
+++ new/usr/src/lib/libm/i386/src/nextafterl.s	2014-11-04 19:02:19.501548285 -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-04 19:02:19.895339334 -0500
+++ new/usr/src/lib/libm/i386/src/nexttowardl.s	2014-11-04 19:02:19.906867075 -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-04 19:02:20.302112289 -0500
+++ new/usr/src/lib/libm/i386/src/pow.s	2014-11-04 19:02:20.313796190 -0500
@@ -59,7 +59,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(pow,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 #include "xpg6.h"
 
--- old/usr/src/lib/libm/i386/src/powf.s	2014-11-04 19:02:20.744122750 -0500
+++ new/usr/src/lib/libm/i386/src/powf.s	2014-11-04 19:02:20.755461499 -0500
@@ -58,7 +58,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(powf,function)
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 #include "xpg6.h"
 
--- old/usr/src/lib/libm/i386/src/powl.s	2014-11-04 19:02:21.172739395 -0500
+++ new/usr/src/lib/libm/i386/src/powl.s	2014-11-04 19:02:21.184095928 -0500
@@ -55,7 +55,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(powl,function)
-#include "libm_synonyms.h"
 #include "xpg6.h"
 
 #undef fabs
--- old/usr/src/lib/libm/i386/src/remainder.s	2014-11-04 19:02:21.596948444 -0500
+++ new/usr/src/lib/libm/i386/src/remainder.s	2014-11-04 19:02:21.608317515 -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-04 19:02:21.995163963 -0500
+++ new/usr/src/lib/libm/i386/src/remainderf.s	2014-11-04 19:02:22.008751929 -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-04 19:02:22.396298760 -0500
+++ new/usr/src/lib/libm/i386/src/remainderl.s	2014-11-04 19:02:22.407493383 -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-04 19:02:22.797233863 -0500
+++ new/usr/src/lib/libm/i386/src/remquo.s	2014-11-04 19:02:22.808469381 -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-04 19:02:23.196634556 -0500
+++ new/usr/src/lib/libm/i386/src/remquof.s	2014-11-04 19:02:23.207867923 -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-04 19:02:23.916851218 -0500
+++ new/usr/src/lib/libm/i386/src/remquol.s	2014-11-04 19:02:23.939028678 -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-04 19:02:24.613049747 -0500
+++ new/usr/src/lib/libm/i386/src/rint.s	2014-11-04 19:02:24.624282816 -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-04 19:02:25.008540092 -0500
+++ new/usr/src/lib/libm/i386/src/rintf.s	2014-11-04 19:02:25.019936333 -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-04 19:02:25.406557629 -0500
+++ new/usr/src/lib/libm/i386/src/rintl.s	2014-11-04 19:02:25.418107083 -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-04 19:02:25.802733594 -0500
+++ new/usr/src/lib/libm/i386/src/rndintl.s	2014-11-04 19:02:25.814264664 -0500
@@ -29,11 +29,7 @@
         .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)
--- old/usr/src/lib/libm/i386/src/round.s	2014-11-04 19:02:26.207397778 -0500
+++ new/usr/src/lib/libm/i386/src/round.s	2014-11-04 19:02:26.218890015 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(round,function)
-#include "libm_synonyms.h"
 #undef fabs
 
 	.section .rodata
--- old/usr/src/lib/libm/i386/src/roundl.s	2014-11-04 19:02:26.616240102 -0500
+++ new/usr/src/lib/libm/i386/src/roundl.s	2014-11-04 19:02:26.627658253 -0500
@@ -30,7 +30,6 @@
 
 #include "libm.h"
 LIBM_ANSI_PRAGMA_WEAK(roundl,function)
-#include "libm_synonyms.h"
 #undef fabs
 
 	.section .rodata
--- old/usr/src/lib/libm/i386/src/scalbln.s	2014-11-04 19:02:27.032889393 -0500
+++ new/usr/src/lib/libm/i386/src/scalbln.s	2014-11-04 19:02:27.045549442 -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-04 19:02:27.430261942 -0500
+++ new/usr/src/lib/libm/i386/src/scalblnf.s	2014-11-04 19:02:27.441753312 -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-04 19:02:27.826142607 -0500
+++ new/usr/src/lib/libm/i386/src/scalblnl.s	2014-11-04 19:02:27.837555813 -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-04 19:02:28.224483799 -0500
+++ new/usr/src/lib/libm/i386/src/scalbn.s	2014-11-04 19:02:28.236039588 -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-04 19:02:28.933198016 -0500
+++ new/usr/src/lib/libm/i386/src/scalbnf.s	2014-11-04 19:02:28.950217194 -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-04 19:02:29.567080793 -0500
+++ new/usr/src/lib/libm/i386/src/scalbnl.s	2014-11-04 19:02:29.578547987 -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-04 19:02:29.973419822 -0500
+++ new/usr/src/lib/libm/i386/src/sin.s	2014-11-04 19:02:29.984699087 -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-04 19:02:30.373774382 -0500
+++ new/usr/src/lib/libm/i386/src/sincos.s	2014-11-04 19:02:30.385068312 -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-04 19:02:30.771813095 -0500
+++ new/usr/src/lib/libm/i386/src/sqrtl.s	2014-11-04 19:02:30.783054928 -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-04 19:02:31.170770095 -0500
+++ new/usr/src/lib/libm/i386/src/tan.s	2014-11-04 19:02:31.182093179 -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-04 19:02:31.570765671 -0500
+++ new/usr/src/lib/libm/i386/src/trunc.s	2014-11-04 19:02:31.582102873 -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-04 19:02:31.966692209 -0500
+++ new/usr/src/lib/libm/i386/src/truncl.s	2014-11-04 19:02:31.977941441 -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-04 19:02:32.383676817 -0500
+++ new/usr/src/lib/libm/sparc/src/copysign.S	2014-11-04 19:02:32.395107156 -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-04 19:02:32.796007449 -0500
+++ new/usr/src/lib/libm/sparc/src/fabs.S	2014-11-04 19:02:32.811859801 -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-04 19:02:33.201686453 -0500
+++ new/usr/src/lib/libm/sparc/src/nextafter.S	2014-11-04 19:02:33.213216409 -0500
@@ -33,7 +33,6 @@
 	.weak _nextafter
 	.type _nextafter,#function
 _nextafter	= __nextafter
-#include "libm_synonyms.h"
 #include "libm_protos.h"
 
 	RO_DATA
--- old/usr/src/lib/libmvec/Makefile.com	2014-11-04 19:02:33.841996113 -0500
+++ new/usr/src/lib/libmvec/Makefile.com	2014-11-04 19:02:33.854321744 -0500
@@ -93,7 +93,6 @@
 		vz_exp_.o \
 		vz_log_.o \
 		vz_pow_.o \
-		#end
 
 mvecvisCOBJS	= \
 		__vTBL_atan1.o \
@@ -109,7 +108,6 @@
 		__vsinbigf.o \
 		__vsincosbig.o \
 		__vsincosbigf.o \
-		#end
 
 mvecvisSOBJS	= \
 		__vatan.o \
@@ -136,7 +134,6 @@
 		__vsinf.o \
 		__vsqrt.o \
 		__vsqrtf.o \
-		#end
 
 mvecvis2COBJS	= \
 		__vTBL_sincos.o \
@@ -147,14 +144,12 @@
 		__vrem_pio2m.o \
 		__vsinbig.o \
 		__vsinbig_ultra3.o \
-		#end
 
 mvecvis2SOBJS	= \
 		__vcos_ultra3.o \
 		__vlog_ultra3.o \
 		__vsin_ultra3.o \
 		__vsqrtf_ultra3.o \
-		#end
 
 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
@@ -188,14 +183,13 @@
 
 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)) \
@@ -275,7 +269,6 @@
 	../common/vz_exp_.c \
 	../common/vz_log_.c \
 	../common/vz_pow_.c \
-	#end
 
 .KEEP_STATE:
 
--- old/usr/src/lib/libmvec/common/__vhypot.c	2014-11-04 19:02:34.858733293 -0500
+++ new/usr/src/lib/libmvec/common/__vhypot.c	2014-11-04 19:02:34.870382230 -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-04 19:02:35.346620932 -0500
+++ new/usr/src/lib/libmvec/common/__vhypotf.c	2014-11-04 19:02:35.358799556 -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-04 19:02:35.769231055 -0500
+++ new/usr/src/lib/libmvec/common/__vrhypot.c	2014-11-04 19:02:35.780833963 -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-04 19:02:36.204684768 -0500
+++ new/usr/src/lib/libmvec/common/__vrhypotf.c	2014-11-04 19:02:36.216282231 -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-04 19:02:36.635666511 -0500
+++ new/usr/src/lib/libmvec/common/__vrsqrt.c	2014-11-04 19:02:36.647049557 -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-04 19:02:37.062823403 -0500
+++ new/usr/src/lib/libmvec/common/__vrsqrtf.c	2014-11-04 19:02:37.074520636 -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-04 19:02:37.504147175 -0500
+++ new/usr/src/lib/libmvec/common/__vsqrt.c	2014-11-04 19:02:37.515605638 -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-04 19:02:37.904095871 -0500
+++ new/usr/src/lib/libmvec/common/__vsqrtf.c	2014-11-04 19:02:37.915501467 -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;
 	}
 }
-
