From: Franz Sirl <Franz.Sirl-kernel@lauterbach.com>
Date: Sat, 1 Dec 2001 08:34:13 +0000 (+0000)
Subject: ppc-asm.h (JUMP_TARGET): New macro.
X-Git-Tag: prereleases/libstdc++-3.0.95~600
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8a155ecc2aff1c9ae5ebccaf6dd116e064442fb2;p=thirdparty%2Fgcc.git

ppc-asm.h (JUMP_TARGET): New macro.

	2001-12-01  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>

	* ginclude/ppc-asm.h (JUMP_TARGET): New macro.
	* config/rs6000/tramp.asm: Use it.

From-SVN: r47509
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6af1446ef311..666edafc092d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-01  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>
+
+	* ginclude/ppc-asm.h (JUMP_TARGET): New macro.
+	* config/rs6000/tramp.asm: Use it.
+
 2001-12-01  Zack Weinberg  <zack@codesourcery.com>
 
 	* gencheck.c, gengenrtl.c: Don't define xmalloc.
diff --git a/gcc/config/rs6000/tramp.asm b/gcc/config/rs6000/tramp.asm
index 737a8fbfaffc..c2a38d10f5cf 100644
--- a/gcc/config/rs6000/tramp.asm
+++ b/gcc/config/rs6000/tramp.asm
@@ -104,6 +104,6 @@ FUNC_START(__trampoline_setup)
 	blr
 
 .Labort:
-	bl	FUNC_NAME(abort)
+	bl	JUMP_TARGET(abort)
 FUNC_END(__trampoline_setup)
 
diff --git a/gcc/ginclude/ppc-asm.h b/gcc/ginclude/ppc-asm.h
index 678743245f35..3a6fb2a8bcd4 100644
--- a/gcc/ginclude/ppc-asm.h
+++ b/gcc/ginclude/ppc-asm.h
@@ -105,6 +105,7 @@
 
 #if defined(_CALL_AIXDESC)
 #define FUNC_NAME(name) GLUE(.,name)
+#define JUMP_TARGET(name) FUNC_NAME(name)
 #define FUNC_START(name) \
 	.section DESC_SECTION,"aw"; \
 name: \
@@ -123,6 +124,7 @@ GLUE(.L,name): \
 
 #elif defined(__WINNT__)
 #define FUNC_NAME(name) GLUE(..,name)
+#define JUMP_TARGET(name) FUNC_NAME(name)
 #define FUNC_START(name) \
 	.pdata; \
 	.align 2; \
@@ -141,6 +143,7 @@ GLUE(FE_MOT_RESVD..,name):
 
 #elif defined(_CALL_NT)
 #define FUNC_NAME(name) GLUE(..,name)
+#define JUMP_TARGET(name) FUNC_NAME(name)
 #define FUNC_START(name) \
 	.section DESC_SECTION,"aw"; \
 name: \
@@ -176,6 +179,11 @@ GLUE(.L,name): \
 
 #else
 #define FUNC_NAME(name) GLUE(__USER_LABEL_PREFIX__,name)
+#if defined __PIC__ || defined __pic__
+#define JUMP_TARGET(name) FUNC_NAME(name@plt)
+#else
+#define JUMP_TARGET(name) FUNC_NAME(name)
+#endif
 #define FUNC_START(name) \
 	.type FUNC_NAME(name),@function; \
 	.globl FUNC_NAME(name); \