9 files changed, 18 insertions, 18 deletions

diff --git a/lib/libc/alpha/gen/_setjmp.S b/lib/libc/alpha/gen/_setjmp.S
index c18462f2cd55..04542962fd73 100644
--- a/lib/libc/alpha/gen/_setjmp.S
+++ b/lib/libc/alpha/gen/_setjmp.S
@@ -45,7 +45,6 @@
 	.set	noreorder
 
 XLEAF(_setjmp, 1)
-XLEAF(_libc__setjmp, 1)
 LEAF(___setjmp, 1)
 	LDGP(pv)
 	stq	ra, (2 * 8)(a0)			/* sc_pc = return address */
@@ -89,8 +88,9 @@ LEAF(___setjmp, 1)
 	RET
 END(___setjmp)
 
+#ifndef _THREAD_SAFE
 XLEAF(_longjmp, 2)
-XLEAF(_libc__longjmp, 2)
+#endif
 LEAF(___longjmp, 2)
 	LDGP(pv)
 	ldq	t0, ((31 + 4) * 8)(a0)		/* magic in sc_regs[31] */
diff --git a/lib/libc/alpha/gen/setjmp.S b/lib/libc/alpha/gen/setjmp.S
index 4d21f9e081db..dd03a1ad0a42 100644
--- a/lib/libc/alpha/gen/setjmp.S
+++ b/lib/libc/alpha/gen/setjmp.S
@@ -45,7 +45,6 @@
 	.set	noreorder
 
 XLEAF(setjmp, 1)
-XLEAF(_libc_setjmp, 1)
 LEAF(__setjmp, 1)
 	LDGP(pv)
 	stq	ra, (2 * 8)(a0)			/* sc_pc = return address */
@@ -117,8 +116,9 @@ LEAF(__setjmp, 1)
 	RET
 END(__setjmp)
 
+#ifndef _THREAD_SAFE
 XLEAF(longjmp, 2)
-XLEAF(_libc_longjmp, 2)
+#endif
 LEAF(__longjmp, 2)
 	LDGP(pv)
 	stq	a1, (( 0 + 4) * 8)(a0)		/* save return value */
diff --git a/lib/libc/alpha/gen/sigsetjmp.S b/lib/libc/alpha/gen/sigsetjmp.S
index 80b38bca4ed6..6fb5085feae3 100644
--- a/lib/libc/alpha/gen/sigsetjmp.S
+++ b/lib/libc/alpha/gen/sigsetjmp.S
@@ -46,7 +46,6 @@
 	.set	noreorder
 
 XLEAF(sigsetjmp, 2)
-XLEAF(_libc_sigsetjmp, 2)
 LEAF(__sigsetjmp, 2)
 	LDGP(pv)
 	stq	a1, (81 * 8)(a0)		/* save the mask */
@@ -56,8 +55,9 @@ Lsavesig:
 	jmp	zero, setjmp
 END(__sigsetjmp)
 
+#ifndef _THREAD_SAFE
 XLEAF(siglongjmp, 2)
-XLEAF(_libc_siglongjmp, 2)
+#endif
 LEAF(__siglongjmp, 2)
 	LDGP(pv)
 	ldq	t0, (81 * 8)(a0)		/* get the mask */
diff --git a/lib/libc/amd64/gen/_setjmp.S b/lib/libc/amd64/gen/_setjmp.S
index 21ab880f83e7..64606c52ac96 100644
--- a/lib/libc/amd64/gen/_setjmp.S
+++ b/lib/libc/amd64/gen/_setjmp.S
@@ -54,7 +54,6 @@
 #include "DEFS.h"
 
 ALTENTRY(_setjmp)
-ALTENTRY(_libc__setjmp)
 ENTRY(___setjmp)
 	movl	4(%esp),%eax
 	movl	0(%esp),%edx
@@ -68,8 +67,9 @@ ENTRY(___setjmp)
 	xorl	%eax,%eax
 	ret
 
+#ifndef _THREAD_SAFE
 ALTENTRY(_longjmp)
-ALTENTRY(_libc__longjmp)
+#endif
 ENTRY(___longjmp)
 	movl	4(%esp),%edx
 	movl	8(%esp),%eax
diff --git a/lib/libc/amd64/gen/setjmp.S b/lib/libc/amd64/gen/setjmp.S
index 4162c1e73561..211c8a520e12 100644
--- a/lib/libc/amd64/gen/setjmp.S
+++ b/lib/libc/amd64/gen/setjmp.S
@@ -55,7 +55,6 @@
 #include "SYS.h"
 
 ALTENTRY(setjmp)
-ALTENTRY(_libc_setjmp)
 ENTRY(__setjmp)
 	movl	4(%esp),%ecx
 	PIC_PROLOGUE
@@ -82,8 +81,9 @@ ENTRY(__setjmp)
 	xorl	%eax,%eax
 	ret
 
+#ifndef _THREAD_SAFE
 ALTENTRY(longjmp)
-ALTENTRY(_libc_longjmp)
+#endif
 ENTRY(__longjmp)
 	movl	4(%esp),%edx
 	PIC_PROLOGUE
diff --git a/lib/libc/amd64/gen/sigsetjmp.S b/lib/libc/amd64/gen/sigsetjmp.S
index 09ca55420a4b..2449094b30c1 100644
--- a/lib/libc/amd64/gen/sigsetjmp.S
+++ b/lib/libc/amd64/gen/sigsetjmp.S
@@ -60,7 +60,6 @@
  */
 
 ALTENTRY(sigsetjmp)
-ALTENTRY(_libc_sigsetjmp)
 ENTRY(__sigsetjmp)
 	movl	8(%esp),%eax
 	movl	4(%esp),%ecx
@@ -91,8 +90,9 @@ ENTRY(__sigsetjmp)
 	xorl	%eax,%eax
 	ret
 
+#ifndef _THREAD_SAFE
 ALTENTRY(siglongjmp)
-ALTENTRY(_libc_siglongjmp)
+#endif
 ENTRY(__siglongjmp)
 	movl	4(%esp),%edx
 	cmpl	$0,44(%edx)
diff --git a/lib/libc/i386/gen/_setjmp.S b/lib/libc/i386/gen/_setjmp.S
index 21ab880f83e7..64606c52ac96 100644
--- a/lib/libc/i386/gen/_setjmp.S
+++ b/lib/libc/i386/gen/_setjmp.S
@@ -54,7 +54,6 @@
 #include "DEFS.h"
 
 ALTENTRY(_setjmp)
-ALTENTRY(_libc__setjmp)
 ENTRY(___setjmp)
 	movl	4(%esp),%eax
 	movl	0(%esp),%edx
@@ -68,8 +67,9 @@ ENTRY(___setjmp)
 	xorl	%eax,%eax
 	ret
 
+#ifndef _THREAD_SAFE
 ALTENTRY(_longjmp)
-ALTENTRY(_libc__longjmp)
+#endif
 ENTRY(___longjmp)
 	movl	4(%esp),%edx
 	movl	8(%esp),%eax
diff --git a/lib/libc/i386/gen/setjmp.S b/lib/libc/i386/gen/setjmp.S
index 4162c1e73561..211c8a520e12 100644
--- a/lib/libc/i386/gen/setjmp.S
+++ b/lib/libc/i386/gen/setjmp.S
@@ -55,7 +55,6 @@
 #include "SYS.h"
 
 ALTENTRY(setjmp)
-ALTENTRY(_libc_setjmp)
 ENTRY(__setjmp)
 	movl	4(%esp),%ecx
 	PIC_PROLOGUE
@@ -82,8 +81,9 @@ ENTRY(__setjmp)
 	xorl	%eax,%eax
 	ret
 
+#ifndef _THREAD_SAFE
 ALTENTRY(longjmp)
-ALTENTRY(_libc_longjmp)
+#endif
 ENTRY(__longjmp)
 	movl	4(%esp),%edx
 	PIC_PROLOGUE
diff --git a/lib/libc/i386/gen/sigsetjmp.S b/lib/libc/i386/gen/sigsetjmp.S
index 09ca55420a4b..2449094b30c1 100644
--- a/lib/libc/i386/gen/sigsetjmp.S
+++ b/lib/libc/i386/gen/sigsetjmp.S
@@ -60,7 +60,6 @@
  */
 
 ALTENTRY(sigsetjmp)
-ALTENTRY(_libc_sigsetjmp)
 ENTRY(__sigsetjmp)
 	movl	8(%esp),%eax
 	movl	4(%esp),%ecx
@@ -91,8 +90,9 @@ ENTRY(__sigsetjmp)
 	xorl	%eax,%eax
 	ret
 
+#ifndef _THREAD_SAFE
 ALTENTRY(siglongjmp)
-ALTENTRY(_libc_siglongjmp)
+#endif
 ENTRY(__siglongjmp)
 	movl	4(%esp),%edx
 	cmpl	$0,44(%edx)