* config/tc-s390.c (tc_s390_fix_adjustable): Re-add patch to prevent

adjustments to symbols in merge sections.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index e785974d55c9a08d8c84017ea88e7f35aa5a2cb4..2c3d1970137f800ad049c2d61e249b89c789ddf2 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-19  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+       * config/tc-s390.c (tc_s390_fix_adjustable): Re-add patch to prevent
+       adjustments to symbols in merge sections.
+
 2002-11-19  Luke Deller <luked@cse.unsw.edu.au>
 
        * config/tc-alpha.c (s_alpha_prologue): as_bad when sym is NULL.

diff --git a/gas/config/tc-s390.c b/gas/config/tc-s390.c
index 71f0e3b9e56a7546f38743975163b7ad8bd04b68..d7e6fe6cda3524f29719e8b90dbedc82888d9e4c 100644 (file)
--- a/gas/config/tc-s390.c
+++ b/gas/config/tc-s390.c
@@ -1629,6 +1629,9 @@ int
 tc_s390_fix_adjustable (fixP)
      fixS *fixP;
 {
+  /* 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
       || fixP->fx_r_type == BFD_RELOC_390_PLT16DBL