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.
This commit is contained in:
Martin Schwidefsky 2002-07-02 09:04:43 +00:00
parent 6f558d7454
commit 148b4c7a2b
2 changed files with 7 additions and 3 deletions

View File

@ -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.

View File

@ -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