2002-07-02 Martin Schwidefsky <schwidefsky@de.ibm.com>

	* config/tc-s390.c (tc_s390_fix_adjustable): Prevent any adjustment
	to symbols in merge sections, even non pc-relative ones.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 42a98651a0d658d2c6e2271930630b7c74bdff8f..b360622ff44c3190e6bf5c2661e47c52b9ae9ced 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-02  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+       * config/tc-s390.c (tc_s390_fix_adjustable): Prevent any adjustment
+       to symbols in merge sections, even non pc-relative ones.
+
 2002-06-29  Stephane Carrez  <stcarrez@nerim.fr>
 
        * config/tc-m68hc11.h (m68hc11_listing_header): Fix warning.

diff --git a/gas/config/tc-s390.c b/gas/config/tc-s390.c
index 44ba941b5e82c3d89ca911c3b20109530db2934e..bce0604f61aea3c5c7d6f8e617deafdf8f3ce47a 100644 (file)
--- a/gas/config/tc-s390.c
+++ b/gas/config/tc-s390.c
@@ -1633,9 +1633,8 @@ tc_s390_fix_adjustable (fixP)
     return 0;
   if (S_IS_WEAK (fixP->fx_addsy))
     return 0;
-  /* Don't adjust pc-relative references to merge sections.  */
-  if ((S_GET_SEGMENT (fixP->fx_addsy)->flags & SEC_MERGE) != 0
-      && fixP->fx_pcrel)
+  /* Don't adjust references to merge sections.  */
+  if ((S_GET_SEGMENT (fixP->fx_addsy)->flags & SEC_MERGE) != 0)
     return 0;
   /* adjust_reloc_syms doesn't know about the GOT.  */
   if (   fixP->fx_r_type == BFD_RELOC_32_GOTOFF