* write.c (TC_FORCE_RELOCATION_SUB_SAME): Revert last change.

	* config/tc-s390.h (TC_FORCE_RELOCATION_SUB_SAME): Define.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 818eb8826f6bea7c09b97b866586802442c85c74..14677ab23176905b2e6a2ff3ae8666c635286bd8 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-13  Alan Modra  <amodra@bigpond.net.au>
+
+       * write.c (TC_FORCE_RELOCATION_SUB_SAME): Revert last change.
+       * config/tc-s390.h (TC_FORCE_RELOCATION_SUB_SAME): Define.
+
 2003-02-11  Uwe Stieber  <uwe@wwws.de>
 
        * configure.in: Add support for kaOS as cross build target system.

diff --git a/gas/config/tc-s390.h b/gas/config/tc-s390.h
index e197029ae73bac710d08ddd34440f60cea40e9fe..ed4d55065078218d0f06d6c4d0cea285c032e5cd 100644 (file)
--- a/gas/config/tc-s390.h
+++ b/gas/config/tc-s390.h
@@ -32,6 +32,10 @@ struct fix;
 #define TC_FORCE_RELOCATION(FIX) tc_s390_force_relocation(FIX)
 extern int tc_s390_force_relocation PARAMS ((struct fix *));
 
+/* Don't resolve foo@PLT-bar to offset@PLT.  */
+#define TC_FORCE_RELOCATION_SUB_SAME(FIX, SEG) \
+  (! SEG_NORMAL (SEG) || TC_FORCE_RELOCATION (FIX))
+
 #define tc_fix_adjustable(X)  tc_s390_fix_adjustable(X)
 extern int tc_s390_fix_adjustable PARAMS ((struct fix *));
 

diff --git a/gas/write.c b/gas/write.c
index 27fd0eb41213972238563b15abdcb7c5d15b08ae..f5db82e298d5a1750c0789811a3f1007dc428798 100644 (file)
--- a/gas/write.c
+++ b/gas/write.c
@@ -51,7 +51,7 @@
 
 #ifndef TC_FORCE_RELOCATION_SUB_SAME
 #define TC_FORCE_RELOCATION_SUB_SAME(FIX, SEG) \
-  (! SEG_NORMAL (SEG) || TC_FORCE_RELOCATION (FIX))
+  (! SEG_NORMAL (SEG))
 #endif
 
 #ifndef TC_FORCE_RELOCATION_SUB_ABS