diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2001-04-13 00:34:36 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2001-04-13 00:34:36 +0000 |
| commit | f5fa8ca231d47662321addbfbde105e2bed0be07 (patch) | |
| tree | f7627630ea5563084aff4b9d1cfe756113ee8a85 /gas/write.c | |
| parent | 6c98e688d5bbc670851c9e092c132a565eb67519 (diff) | |
| download | gdb-f5fa8ca231d47662321addbfbde105e2bed0be07.zip gdb-f5fa8ca231d47662321addbfbde105e2bed0be07.tar.gz gdb-f5fa8ca231d47662321addbfbde105e2bed0be07.tar.bz2 | |
bfd/
* libbfd-in.h (_bfd_merge_section): New.
(_bfd_write_merged_section): New.
(_bfd_merged_section_offset): New.
* libbfd.h: Rebuilt.
* linker.c (_bfd_generic_link_output_symbols): Handle
discard_sec_merge.
* aoutx.h (aout_link_write_symbols): Likewise.
* pdp11.c (aout_link_write_symbols): Likewise.
* elflink.h (elf_link_add_object_symbols): Call _bfd_merge_section.
(elf_bfd_final_link): Adjust global symbols pointing into SEC_MERGE
sections.
(elf_link_sec_merge_syms): New.
(elf_link_input_bfd): Call _bfd_merged_section_offset
and _bfd_write_merged_section.
Handle discard_sec_merge.
* elf-bfd.h (struct elf_link_hash_table): Add merge_info
field.
(struct bfd_elf_section_data): Likewise.
* elf.c (_bfd_elf_make_section_from_shdr): Set SEC_MERGE and
SEC_STRINGS section flags and entsize from their ELF counterparts.
(_bfd_elf_link_hash_table_init): Initialize merge_info.
(elf_fake_sections): Set SHF_MERGE, SHF_STRINGS and sh_entsize
from their BFD counterparts.
* merge.c: New file.
* Makefile.am: Add strtab.lo.
* Makefile.in: Rebuilt.
include/
* bfdlink.h (bfd_link_discard): Add discard_sec_merge.
gas/
* config/obj-elf.c (obj_elf_change_section): Add entsize argument,
handle SHF_MERGE and SHF_STRINGS.
(obj_elf_parse_section_letters): Set SHF_MERGE and SHF_STRINGS.
(obj_elf_section): Allow additional argument specifying entity size.
* write.c (adjust_reloc_syms): Keep relocations against local symbols
in SEC_MERGE sections.
ld/
* ldmain.c (main): Default to discard_sec_merge.
* lexsup.c (OPTION_DISCARD_NONE): Define.
(ld_options): Add --discard-none.
(parse_args): Handle OPTION_DISCARD_NONE.
* ldlang.c (wild_doit): SEC_MERGE should be set in the output
section only if SEC_MERGE and SEC_STRINGS flags and entsize of
all its input sections match.
Diffstat (limited to 'gas/write.c')
| -rw-r--r-- | gas/write.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/gas/write.c b/gas/write.c index 1a2798b..151f1cf 100644 --- a/gas/write.c +++ b/gas/write.c @@ -872,6 +872,13 @@ 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., |