diff options
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 7 | ||||
| -rw-r--r-- | gas/config/tc-alpha.c | 3 | ||||
| -rw-r--r-- | gas/write.c | 10 |
3 files changed, 8 insertions, 12 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 9440e14..b2caa0b 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,10 @@ +2001-11-23 Jakub Jelinek <jakub@redhat.com> + + * config/tc-alpha.c (tc_gen_reloc): Remove SEC_MERGE test. + * write.c (adjust_reloc_syms): Don't handle relocs against + SEC_MERGE section symbols specially. + (fixup_segment): Likewise. + 2001-11-21 Richard Sandiford <rsandifo@redhat.com> * config/tc-mips.c (mips_need_elf_addend_fixup): New, extracted from... diff --git a/gas/config/tc-alpha.c b/gas/config/tc-alpha.c index f73c862..f9908e7 100644 --- a/gas/config/tc-alpha.c +++ b/gas/config/tc-alpha.c @@ -1507,8 +1507,7 @@ tc_gen_reloc (sec, fixp) * at assembly time. bfd_perform_reloc doesn't know about this sort * of thing, and as a result we need to fake it out here. */ - if ((S_IS_EXTERN (fixp->fx_addsy) || S_IS_WEAK (fixp->fx_addsy) - || (S_GET_SEGMENT (fixp->fx_addsy)->flags & SEC_MERGE)) + if ((S_IS_EXTERN (fixp->fx_addsy) || S_IS_WEAK (fixp->fx_addsy)) && !S_IS_COMMON (fixp->fx_addsy)) reloc->addend -= symbol_get_bfdsym (fixp->fx_addsy)->value; #endif diff --git a/gas/write.c b/gas/write.c index 8176335..5397aa0 100644 --- a/gas/write.c +++ b/gas/write.c @@ -873,13 +873,6 @@ adjust_reloc_syms (abfd, sec, xxx) symbol_mark_used_in_reloc (fixp->fx_addsy); goto done; } - - /* Never adjust a reloc against local symbol in a merge section. */ - if (symsec->flags & SEC_MERGE) - { - symbol_mark_used_in_reloc (fixp->fx_addsy); - goto done; - } #endif /* Is there some other reason we can't adjust this one? (E.g., @@ -2815,9 +2808,6 @@ fixup_segment (fixP, this_segment_type) else if (add_symbol_segment == undefined_section #ifdef BFD_ASSEMBLER || bfd_is_com_section (add_symbol_segment) - || (bfd_get_section_flags (stdoutput, - add_symbol_segment) - & SEC_MERGE) != 0 #endif ) { |