diff options
| author | Nick Clifton <nickc@redhat.com> | 2015-02-23 14:53:02 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2015-02-23 14:53:02 +0000 |
| commit | 0f8f0c57ea4742ad2d9b0598a18243331c1c06e3 (patch) | |
| tree | f5a577adf5af444ca801d78171ea669dc05dee9b /bfd | |
| parent | 8f3102ea1a9954ed00f84a9e3452a79e94953840 (diff) | |
| download | binutils-0f8f0c57ea4742ad2d9b0598a18243331c1c06e3.zip binutils-0f8f0c57ea4742ad2d9b0598a18243331c1c06e3.tar.gz binutils-0f8f0c57ea4742ad2d9b0598a18243331c1c06e3.tar.bz2 | |
Fixes the generation of dwarf line debug information for the msp430, even in the presence of function sections and linker garbage collection.
PR 17940
* dwarf2dbg.c (out_header): When generating dwarf sections use
real symbols not temps for the start and end symbols.
* config/tc-msp430.h (TC_FORCE_RELOCATION_SUB_SAME): Also prevent
adjustments to relocations in debug sections.
(TC_LINKRELAX_FIXUP): Likewise.
* elf32-msp430.c (msp430_elf_relax_delete_bytes): Adjust debug
symbols at end of sections. Adjust function sizes.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 4 | ||||
| -rw-r--r-- | bfd/elf32-msp430.c | 49 |
2 files changed, 49 insertions, 4 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index e9fb08b..f4391d7 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -3,6 +3,10 @@ PR 17914 * cpu-w65.c: Correct typos in license notice. + PR 17940 + * elf32-msp430.c (msp430_elf_relax_delete_bytes): Adjust debug + symbols at end of sections. Adjust function sizes. + 2015-02-20 Andreas Arnez <arnez@linux.vnet.ibm.com> * elf-bfd.h (elfcore_write_s390_vxrs_low): Add prototype. diff --git a/bfd/elf32-msp430.c b/bfd/elf32-msp430.c index c839ea0..fdab3d3 100644 --- a/bfd/elf32-msp430.c +++ b/bfd/elf32-msp430.c @@ -1656,9 +1656,38 @@ msp430_elf_relax_delete_bytes (bfd * abfd, asection * sec, bfd_vma addr, symtab_hdr = & elf_tdata (abfd)->symtab_hdr; isym = (Elf_Internal_Sym *) symtab_hdr->contents; for (isymend = isym + symtab_hdr->sh_info; isym < isymend; isym++) - if (isym->st_shndx == sec_shndx - && isym->st_value > addr && isym->st_value < toaddr) - isym->st_value -= count; + { + const char * name; + + name = bfd_elf_string_from_elf_section + (abfd, symtab_hdr->sh_link, isym->st_name); + name = (name == NULL || * name == 0) ? bfd_section_name (abfd, sec) : name; + + if (isym->st_shndx != sec_shndx) + continue; + + if (isym->st_value > addr + && (isym->st_value < toaddr + /* We also adjust a symbol at the end of the section if its name is + on the list below. These symbols are used for debug info + generation and they refer to the end of the current section, not + the start of the next section. */ + || (isym->st_value == toaddr + && name != NULL + && (CONST_STRNEQ (name, ".Letext") + || CONST_STRNEQ (name, ".LFE"))))) + { + if (isym->st_value < addr + count) + isym->st_value = addr; + else + isym->st_value -= count; + } + /* Adjust the function symbol's size as well. */ + else if (ELF_ST_TYPE (isym->st_info) == STT_FUNC + && isym->st_value + isym->st_size > addr + && isym->st_value + isym->st_size < toaddr) + isym->st_size -= count; + } /* Now adjust the global symbols defined in this section. */ symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym) @@ -1674,7 +1703,19 @@ msp430_elf_relax_delete_bytes (bfd * abfd, asection * sec, bfd_vma addr, && sym_hash->root.u.def.section == sec && sym_hash->root.u.def.value > addr && sym_hash->root.u.def.value < toaddr) - sym_hash->root.u.def.value -= count; + { + if (sym_hash->root.u.def.value < addr + count) + sym_hash->root.u.def.value = addr; + else + sym_hash->root.u.def.value -= count; + } + /* Adjust the function symbol's size as well. */ + else if (sym_hash->root.type == bfd_link_hash_defined + && sym_hash->root.u.def.section == sec + && sym_hash->type == STT_FUNC + && sym_hash->root.u.def.value + sym_hash->size > addr + && sym_hash->root.u.def.value + sym_hash->size < toaddr) + sym_hash->size -= count; } return TRUE; |