From 9976e59211502022168944cbed4949cbd94fc650 Mon Sep 17 00:00:00 2001
From: Jason Evans <jasone@FreeBSD.org>
Date: Thu, 4 May 2000 04:36:26 +0000
Subject: Use assembler directives rather than ALTENTRY() so that longjmp() and
 siglongjmp() are weak symbols.  This is necessary to allow static linking
 with the linuxthreads library port.

---
 lib/libc/i386/gen/setjmp.S    | 9 ++++-----
 lib/libc/i386/gen/sigsetjmp.S | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'lib/libc/i386')

diff --git a/lib/libc/i386/gen/setjmp.S b/lib/libc/i386/gen/setjmp.S
index 39e9c2165ec1..738407a1a8f2 100644
--- a/lib/libc/i386/gen/setjmp.S
+++ b/lib/libc/i386/gen/setjmp.S
@@ -80,12 +80,11 @@ ENTRY(setjmp)
 	xorl	%eax,%eax
 	ret
 
-#ifdef _THREAD_SAFE
-ENTRY(__longjmp)
-#else
-ALTENTRY(__longjmp)
-ENTRY(longjmp)
+#ifndef _THREAD_SAFE
+.weak CNAME(longjmp);
+.set CNAME(longjmp),CNAME(__longjmp);
 #endif
+ENTRY(__longjmp)
 	movl	4(%esp),%edx
 	PIC_PROLOGUE
 	pushl	$0			/* (sigset_t*)oset */
diff --git a/lib/libc/i386/gen/sigsetjmp.S b/lib/libc/i386/gen/sigsetjmp.S
index 13c0dc7246c1..40aebb65e53f 100644
--- a/lib/libc/i386/gen/sigsetjmp.S
+++ b/lib/libc/i386/gen/sigsetjmp.S
@@ -89,12 +89,11 @@ ENTRY(sigsetjmp)
 	xorl	%eax,%eax
 	ret
 
-#ifdef _THREAD_SAFE
-ENTRY(__siglongjmp)
-#else
-ALTENTRY(__siglongjmp)
-ENTRY(siglongjmp)
+#ifndef _THREAD_SAFE
+.weak CNAME(siglongjmp);
+.set CNAME(siglongjmp),CNAME(__siglongjmp);
 #endif
+ENTRY(__siglongjmp);
 	movl	4(%esp),%edx
 	cmpl	$0,44(%edx)
 	jz	2f
-- 
cgit v1.2.3