This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[committted, PATCH] PR ld/20528: Don't merge 2 sections with different SHF_EXCLUDE
- From: "H.J. Lu" <hongjiu dot lu at intel dot com>
- To: binutils at sourceware dot org
- Date: Thu, 29 Sep 2016 13:00:29 -0700
- Subject: [committted, PATCH] PR ld/20528: Don't merge 2 sections with different SHF_EXCLUDE
- Authentication-results: sourceware.org; auth=none
- Reply-to: "H.J. Lu" <hjl dot tools at gmail dot com>
SEC_EXCLUDE is ignored when doing a relocatable link. But we can't
merge 2 input sections with the same name when only one of them has
SHF_EXCLUDE.
PR ld/20528
* emultempl/elf32.em (gld${EMULATION_NAME}_place_orphan): Don't
merge 2 sections with different SHF_EXCLUDE.
* testsuite/ld-elf/pr20528a.d: New file.
* testsuite/ld-elf/pr20528a.s: Likewise.
* testsuite/ld-elf/pr20528b.d: Likewise.
* testsuite/ld-elf/pr20528b.s: Likewise.
---
ld/emultempl/elf32.em | 9 ++++++++-
ld/testsuite/ld-elf/pr20528a.d | 9 +++++++++
ld/testsuite/ld-elf/pr20528a.s | 6 ++++++
ld/testsuite/ld-elf/pr20528b.d | 9 +++++++++
ld/testsuite/ld-elf/pr20528b.s | 6 ++++++
5 files changed, 38 insertions(+), 1 deletion(-)
create mode 100644 ld/testsuite/ld-elf/pr20528a.d
create mode 100644 ld/testsuite/ld-elf/pr20528a.s
create mode 100644 ld/testsuite/ld-elf/pr20528b.d
create mode 100644 ld/testsuite/ld-elf/pr20528b.s
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 8461b1d..2815a3e 100644
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -1907,9 +1907,16 @@ gld${EMULATION_NAME}_place_orphan (asection *s,
lang_insert_orphan to create a new output section. */
constraint = SPECIAL;
+ /* SEC_EXCLUDE is cleared when doing a relocatable link. But
+ we can't merge 2 input sections with the same name when only
+ one of them has SHF_EXCLUDE. */
if (os->bfd_section != NULL
&& (os->bfd_section->flags == 0
- || (((s->flags ^ os->bfd_section->flags)
+ || ((!bfd_link_relocatable (&link_info)
+ || (((elf_section_flags (s)
+ ^ elf_section_flags (os->bfd_section))
+ & SHF_EXCLUDE) == 0))
+ && ((s->flags ^ os->bfd_section->flags)
& (SEC_LOAD | SEC_ALLOC)) == 0
&& _bfd_elf_match_sections_by_type (link_info.output_bfd,
os->bfd_section,
diff --git a/ld/testsuite/ld-elf/pr20528a.d b/ld/testsuite/ld-elf/pr20528a.d
new file mode 100644
index 0000000..00d0a7a
--- /dev/null
+++ b/ld/testsuite/ld-elf/pr20528a.d
@@ -0,0 +1,9 @@
+#source: pr20528a.s
+#source: pr20528b.s
+#ld: -r
+#readelf: -S --wide
+
+#...
+[ ]*\[.*\][ ]+\.text.startup[ ]+PROGBITS.*[ ]+AX[ ]+.*
+[ ]*\[.*\][ ]+\.text.startup[ ]+PROGBITS.*[ ]+AXE[ ]+.*
+#pass
diff --git a/ld/testsuite/ld-elf/pr20528a.s b/ld/testsuite/ld-elf/pr20528a.s
new file mode 100644
index 0000000..523bc6f
--- /dev/null
+++ b/ld/testsuite/ld-elf/pr20528a.s
@@ -0,0 +1,6 @@
+ .text
+ .section .text.startup,"ax",%progbits
+ .globl main
+ .type main, %function
+main:
+ .byte 0
diff --git a/ld/testsuite/ld-elf/pr20528b.d b/ld/testsuite/ld-elf/pr20528b.d
new file mode 100644
index 0000000..3ae6153
--- /dev/null
+++ b/ld/testsuite/ld-elf/pr20528b.d
@@ -0,0 +1,9 @@
+#source: pr20528b.s
+#source: pr20528a.s
+#ld: -r
+#readelf: -S --wide
+
+#...
+[ ]*\[.*\][ ]+\.text.startup[ ]+PROGBITS.*[ ]+AXE[ ]+.*
+[ ]*\[.*\][ ]+\.text.startup[ ]+PROGBITS.*[ ]+AX[ ]+.*
+#pass
diff --git a/ld/testsuite/ld-elf/pr20528b.s b/ld/testsuite/ld-elf/pr20528b.s
new file mode 100644
index 0000000..9c41e8b
--- /dev/null
+++ b/ld/testsuite/ld-elf/pr20528b.s
@@ -0,0 +1,6 @@
+ .text
+ .section .text.startup,"axe",%progbits
+ .globl main1
+ .type main1, %function
+main1:
+ .byte 0
--
2.7.4