From: Roland McGrath <roland@gnu.org>
Date: Sun, 23 Jul 1995 00:58:43 +0000 (+0000)
Subject: Sat Jul 22 20:53:18 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
X-Git-Tag: cvs/libc-950722
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=d7e16e9e8348b8bcdb805f0c25baf80b057f2b59;p=glibc.git

Sat Jul 22 20:53:18 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>

	* sysdeps/unix/i386/sysdep.h (JUMPTARGET): Use ## to avoid space
 	before @PLT.
	* sysdeps/mach/i386/sysdep.h (JUMPTARGET): New macro.
	* sysdeps/i386/bsd-_setjmp.S: Use JUMPTARGET macro in jmp insn.
	* sysdeps/i386/bsd-setjmp.S: Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index a2d197eb30..b995e15477 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Jul 22 20:53:18 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* sysdeps/unix/i386/sysdep.h (JUMPTARGET): Use ## to avoid space
+ 	before @PLT.
+	* sysdeps/mach/i386/sysdep.h (JUMPTARGET): New macro.
+	* sysdeps/i386/bsd-_setjmp.S: Use JUMPTARGET macro in jmp insn.
+	* sysdeps/i386/bsd-setjmp.S: Likewise.
+
 Sat Jul 22 19:58:54 1995  Michael I Bushnell  <mib@geech.gnu.ai.mit.edu>
 
 	* inet/Makefile (routines): Added `ruserpass'.
diff --git a/sysdeps/mach/i386/sysdep.h b/sysdeps/mach/i386/sysdep.h
index 5b4246e016..f467fef24b 100644
--- a/sysdeps/mach/i386/sysdep.h
+++ b/sysdeps/mach/i386/sysdep.h
@@ -51,4 +51,12 @@ Cambridge, MA 02139, USA.  */
 
 #define STACK_GROWTH_DOWN
 
+
+#ifdef PIC
+#define JUMPTARGET(name) name##@PLT
+#else
+#define JUMPTARGET(name) name
+#endif
+
+
 #include_next <sysdep.h>
diff --git a/sysdeps/unix/i386/sysdep.h b/sysdeps/unix/i386/sysdep.h
index 4e4b6e6ab5..46f2886c4a 100644
--- a/sysdeps/unix/i386/sysdep.h
+++ b/sysdeps/unix/i386/sysdep.h
@@ -48,7 +48,7 @@ Cambridge, MA 02139, USA.  */
   jb JUMPTARGET(syscall_error)
 
 #ifdef PIC
-#define JUMPTARGET(name) name@PLT
+#define JUMPTARGET(name) name##@PLT
 #else
 #define JUMPTARGET(name) name
 #endif