[illumos-gate merge]

commit 9ef283481583d677cd2cf5449ef49b90eacc97d4
    5261 libm should stop using synonyms.h (fix studio build)
commit ed1591688000a5d179c4ba27793cae55590c55d2
    5590 improper use of NULL in tools/protocmp
commit ad0b1ea5d69a45fe23c434277599e315f29a5fca
    5589 improper use of NULL in tools/ctf
commit 97a9db610324e7db4393415018e0e737485a94cd
    4393 /etc/rpc: 100133 and 100169 should be added

5 files changed, 35 insertions, 36 deletions

diff --git a/usr/src/lib/libm/amd64/src/locallibm.il b/usr/src/lib/libm/amd64/src/locallibm.il
index 65921d3c97..375720c84d 100644
--- a/usr/src/lib/libm/amd64/src/locallibm.il
+++ b/usr/src/lib/libm/amd64/src/locallibm.il
@@ -91,7 +91,7 @@
 1:	movl	%edi,%eax
 	.end
 
-	.inline	__copysign,0
+	.inline	copysign,0
 	movq	$0x7fffffffffffffff,%rax
 	movdq	%rax,%xmm2
 	andpd	%xmm2,%xmm0
@@ -99,19 +99,19 @@
 	orpd	%xmm2,%xmm0
 	.end
 
-	.inline	__fabs,0
+	.inline	fabs,0
 	movq	$0x7fffffffffffffff,%rax
 	movdq	%rax,%xmm1
 	andpd	%xmm1,%xmm0
 	.end
 
-	.inline	__fabsf,0
+	.inline	fabsf,0
 	movl	$0x7fffffff,%eax
 	movdl	%eax,%xmm1
 	andps	%xmm1,%xmm0
 	.end
 
-	.inline	_finite,0
+	.inline	finite,0
 	subq	$16,%rsp
 	movlpd	%xmm0,(%rsp)
 	movq	(%rsp),%rcx
@@ -123,16 +123,16 @@
 	addq	$16,%rsp
 	.end
 
-	.inline	__signbit,0
+	.inline	signbit,0
 	movmskpd %xmm0,%eax
 	andq	$1,%rax
 	.end
 
-	.inline	__sqrt,0
+	.inline	sqrt,0
 	sqrtsd	%xmm0,%xmm0
 	.end
 
-	.inline	__sqrtf,0
+	.inline	sqrtf,0
 	sqrtss	%xmm0,%xmm0
 	.end
 
diff --git a/usr/src/lib/libm/i386/src/locallibm.il b/usr/src/lib/libm/i386/src/locallibm.il
index ca79724f86..bca43cb8e5 100644
--- a/usr/src/lib/libm/i386/src/locallibm.il
+++ b/usr/src/lib/libm/i386/src/locallibm.il
@@ -127,7 +127,7 @@
 	addl	$8,%esp
 	.end
 
-	.inline	__ceil,0
+	.inline	ceil,0
 	subl	$8,%esp
 	fstcw	(%esp)
 	fldl	8(%esp)			///
@@ -148,7 +148,7 @@
 	addl	$8,%esp
 	.end
 
-	.inline	__copysign,0
+	.inline	copysign,0
 	movl	4(%esp),%eax		/// eax <-- hi_32(x)
 	movl	12(%esp),%ecx		/// ecx <-- hi_32(y)
 	andl	$0x7fffffff,%eax	/ eax <-- hi_32(abs(x))
@@ -170,17 +170,17 @@
 	fsqrt
 	.end
 
-	.inline	__fabs,0
+	.inline	fabs,0
 	fldl	(%esp)			///
 	fabs
 	.end
 
-	.inline	__fabsf,0
+	.inline	fabsf,0
 	flds	(%esp)
 	fabs
 	.end
 
-	.inline	__fabsl,0
+	.inline	fabsl,0
 	fldt	(%esp)
 	fabs
 	.end
@@ -188,7 +188,7 @@
 /
 /	branchless _finite
 /
-	.inline	_finite,0
+	.inline	finite,0
         movl    4(%esp),%eax		/// eax <-- hi_32(x)
         notl	%eax			/ not(bexp) = 0 iff bexp = all 1's
         andl    $0x7ff00000,%eax
@@ -196,7 +196,7 @@
 	shrl	$31,%eax
         .end
 
-	.inline	__floor,0
+	.inline	floor,0
 	subl	$8,%esp
 	fstcw	(%esp)
 	fldl	8(%esp)			///
@@ -217,7 +217,7 @@
 	addl	$8,%esp
 	.end
 
-	.inline	__isnanf,0
+	.inline	isnanf,0
 	movl	(%esp),%eax
 	andl	$0x7fffffff,%eax
 	negl	%eax
@@ -278,7 +278,7 @@
 	fsqrt
 	.end
 
-	.inline	__rint,0
+	.inline	rint,0
 	fldl	(%esp)
         movl	4(%esp),%eax
         andl	$0x7fffffff,%eax
@@ -289,39 +289,39 @@
 	fwait			/ in case we jumped around frndint
 	.end
 
-	.inline	__scalbn,0
+	.inline	scalbn,0
 	fildl	8(%esp)			/// convert N to extended
 	fldl	(%esp)			/// push x
 	fscale
 	fstp	%st(1)
 	.end
 
-	.inline	__signbit,0
+	.inline	signbit,0
 	movl	4(%esp),%eax		/// high part of x
 	shrl	$31,%eax
 	.end
 
-	.inline	__signbitf,0
+	.inline	signbitf,0
 	movl	(%esp),%eax
 	shrl	$31,%eax
 	.end
 
-	.inline	__sqrt,0
+	.inline	sqrt,0
 	fldl	(%esp)
 	fsqrt
 	.end
 
-	.inline	__sqrtf,0
+	.inline	sqrtf,0
 	flds	(%esp)
 	fsqrt
 	.end
 
-	.inline	__sqrtl,0
+	.inline	sqrtl,0
 	fldt	(%esp)
 	fsqrt
 	.end
 
-	.inline	__isnanl,0
+	.inline	isnanl,0
 	movl    8(%esp),%eax            / ax <-- sign bit and __exp
 	andl    $0x00007fff,%eax
 	jz      1f                      / jump if __exp is all 0
diff --git a/usr/src/lib/libm/sparc/src/locallibm.il b/usr/src/lib/libm/sparc/src/locallibm.il
index 3822f5f92d..b6fa0adfc5 100644
--- a/usr/src/lib/libm/sparc/src/locallibm.il
+++ b/usr/src/lib/libm/sparc/src/locallibm.il
@@ -311,13 +311,13 @@
 	fsqrtd	%f0,%f0
 	.end
 
-	.inline	__sqrtf,1
+	.inline	sqrtf,1
 	st	%o0,[%sp+0x44]
 	ld	[%sp+0x44],%f0
 	fsqrts	%f0,%f0
 	.end
 
-	.inline	__sqrt,2
+	.inline	sqrt,2
 	std	%o0,[%sp+0x48]		! store to 8-aligned address
 	ldd	[%sp+0x48],%f0
 	fsqrtd	%f0,%f0
@@ -814,7 +814,7 @@
 	.nonvolatile
 	.end
 
-	.inline	__fp_class,2
+	.inline	fp_class,2
 	sethi	%hi(0x80000000),%o2	! o2 gets 80000000
 	andn	%o0,%o2,%o0		! o0-o1 gets abs(x)
 	orcc	%o0,%o1,%g0		! set cc as x is zero/nonzero
@@ -859,7 +859,7 @@
 2:
 	.end
 
-	.inline	__fp_classf,1
+	.inline	fp_classf,1
 	sethi	%hi(0x80000000),%o2
 	andncc	%o0,%o2,%o0
 	bne	1f
@@ -1229,14 +1229,14 @@
         sub	%o0,%o1,%o0
         .end
 
-	.inline	__fabs,2
+	.inline	fabs,2
 	st	%o0,[%sp+0x48]
 	st	%o1,[%sp+0x4c]
 	ldd	[%sp+0x48],%f0
 	fabsd	%f0,%f0
 	.end
 
-	.inline	__fabsf,1
+	.inline	fabsf,1
 	st	%o0,[%sp+0x44]
 	ld	[%sp+0x44],%f0
 	fabss	%f0,%f0
diff --git a/usr/src/lib/libm/sparcv9/src/locallibm.il b/usr/src/lib/libm/sparcv9/src/locallibm.il
index dcef23826a..2cd9e21470 100644
--- a/usr/src/lib/libm/sparcv9/src/locallibm.il
+++ b/usr/src/lib/libm/sparcv9/src/locallibm.il
@@ -39,11 +39,11 @@
 	fsqrtd	%f0,%f0
 	.end
 
-	.inline	__sqrtf,1
+	.inline	sqrtf,1
 	fsqrts	%f1,%f0
 	.end
 
-	.inline	__sqrt,1
+	.inline	sqrt,1
 	fsqrtd	%f0,%f0
 	.end
 
@@ -420,7 +420,7 @@
 	.nonvolatile
 	.end
 
-	.inline	__fp_class,1
+	.inline	fp_class,1
 	fabsd	%f0,%f0
 	std	%f0,[%sp+0x87f]
 	ldx	[%sp+0x87f],%o0
@@ -460,7 +460,7 @@
 2:
 	.end
 
-	.inline	__fp_classf,1
+	.inline	fp_classf,1
 	fabss	%f1,%f1
 	st	%f1,[%sp+0x87f]
 	ld	[%sp+0x87f],%o0
@@ -676,11 +676,11 @@
 	sra	%o0,0,%o0
 	.end
 
-	.inline	__fabs,1
+	.inline	fabs,1
 	fabsd	%f0,%f0
 	.end
 
-	.inline	__fabsf,1
+	.inline	fabsf,1
 	fabss	%f1,%f0
 	.end
 !
diff --git a/usr/src/lib/libmvec/Makefile.com b/usr/src/lib/libmvec/Makefile.com
index b9f39e2279..e574b0df22 100644
--- a/usr/src/lib/libmvec/Makefile.com
+++ b/usr/src/lib/libmvec/Makefile.com
@@ -179,7 +179,6 @@ FLTRPATH		= $(FLTRPATH_$(TARGET_ARCH))
 
 sparc_CFLAGS += -_cc=-W0,-xintrinsic
 sparcv9_CFLAGS += -_cc=-W0,-xintrinsic
-CPPFLAGS_i386	+= -Dfabs=__fabs
 
 SRCS_mvec_i386 = ../common/__vsqrtf.c