summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorclyon <clyon>2011-09-01 14:10:37 +0000
committerclyon <clyon>2011-09-01 14:10:37 +0000
commit3853dac583b9ce91ce23347ee39483747e261f65 (patch)
tree35e4db775eda7637f7d8e6e7c0f5f89741daab74
parent933c88fcd452923382e24d46b390d03459b39fa6 (diff)
downloadgdb-sid-snapshot-20110901.tar.gz
2011-09-01 Christophe Lyon <christophe.lyon@st.com>sid-snapshot-20110901
bfd/ * elf32-arm.c (elf32_arm_output_arch_local_syms): Skip excluded sections. ld/testsuite/ * ld-arm/arm-elf.exp: Add new rodata-merge-map test. * ld-arm/rodata-merge-map.ld: New file. * ld-arm/rodata-merge-map.sym: Likewise. * ld-arm/rodata-merge-map1.s Likewise. * ld-arm/rodata-merge-map2.s: Likewise. * ld-arm/rodata-merge-map3.s: Likewise.
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elf32-arm.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1bbf84fab99..7f97fa4f60e 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-01 Christophe Lyon <christophe.lyon@st.com>
+
+ * elf32-arm.c (elf32_arm_output_arch_local_syms): Skip excluded
+ sections.
+
2011-08-26 Nick Clifton <nickc@redhat.com>
* po/es.po: Updated Spanish translation.
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index 4d407a9b458..12bbc54a33c 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -14506,7 +14506,8 @@ elf32_arm_output_arch_local_syms (bfd *output_bfd,
== SEC_HAS_CONTENTS
&& get_arm_elf_section_data (osi.sec) != NULL
&& get_arm_elf_section_data (osi.sec)->mapcount == 0
- && osi.sec->size > 0)
+ && osi.sec->size > 0
+ && (osi.sec->flags & SEC_EXCLUDE) == 0)
{
osi.sec_shndx = _bfd_elf_section_from_bfd_section
(output_bfd, osi.sec->output_section);