This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[PATCH] ld -r: Don't merge with member of output section group
- From: "H.J. Lu" <hjl dot tools at gmail dot com>
- To: Binutils <binutils at sourceware dot org>
- Date: Wed, 17 Jul 2019 13:20:04 -0700
- Subject: [PATCH] ld -r: Don't merge with member of output section group
When doing a relocatable link, members of input section group are
placed in their own output sections. We need to make sure that no
input sections are merged with member of output section group.
OK for master and release branches?
PR ld/24819
* emultempl/elf32.em (elf_orphan_compatible): Return FALSE for
member of output section group when doing a relocatable link.
* testsuite/ld-elf/pr24819.d: New file.
* testsuite/ld-elf/pr24819.s: Likewise.
--
H.J.
From b1d60254febe7476dab9d4572b29dfa2619f4207 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Wed, 17 Jul 2019 12:47:04 -0700
Subject: [PATCH] ld -r: Don't merge with member of output section group
When doing a relocatable link, members of input section group are
placed in their own output sections. We need to make sure that no
input sections are merged with member of output section group.
PR ld/24819
* emultempl/elf32.em (elf_orphan_compatible): Return FALSE for
member of output section group when doing a relocatable link.
* testsuite/ld-elf/pr24819.d: New file.
* testsuite/ld-elf/pr24819.s: Likewise.
---
ld/emultempl/elf32.em | 9 ++++++---
ld/testsuite/ld-elf/pr24819.d | 8 ++++++++
ld/testsuite/ld-elf/pr24819.s | 4 ++++
3 files changed, 18 insertions(+), 3 deletions(-)
create mode 100644 ld/testsuite/ld-elf/pr24819.d
create mode 100644 ld/testsuite/ld-elf/pr24819.s
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 3e8ee4693e..f3c6e3adee 100644
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -2028,10 +2028,13 @@ elf_orphan_compatible (asection *in, asection *out)
if (elf_section_data (out)->this_hdr.sh_info
!= elf_section_data (in)->this_hdr.sh_info)
return FALSE;
- /* We can't merge two sections with differing SHF_EXCLUDE when doing
- a relocatable link. */
+ /* We can't merge with member of output section group nor merge two
+ sections with differing SHF_EXCLUDE when doing a relocatable link.
+ */
if (bfd_link_relocatable (&link_info)
- && ((elf_section_flags (out) ^ elf_section_flags (in)) & SHF_EXCLUDE) != 0)
+ && (elf_next_in_group (out) != NULL
+ || ((elf_section_flags (out) ^ elf_section_flags (in))
+ & SHF_EXCLUDE) != 0))
return FALSE;
return _bfd_elf_match_sections_by_type (link_info.output_bfd, out,
in->owner, in);
diff --git a/ld/testsuite/ld-elf/pr24819.d b/ld/testsuite/ld-elf/pr24819.d
new file mode 100644
index 0000000000..0a82b63c39
--- /dev/null
+++ b/ld/testsuite/ld-elf/pr24819.d
@@ -0,0 +1,8 @@
+#ld: -r
+#readelf: -S --wide
+
+#...
+ \[[ 0-9]+\] \.data\.foo[ \t]+PROGBITS[ \t0-9a-f]+WAG .*
+#...
+ \[[ 0-9]+\] \.data\.foo[ \t]+PROGBITS[ \t0-9a-f]+WA .*
+#pass
diff --git a/ld/testsuite/ld-elf/pr24819.s b/ld/testsuite/ld-elf/pr24819.s
new file mode 100644
index 0000000000..08ba2b8437
--- /dev/null
+++ b/ld/testsuite/ld-elf/pr24819.s
@@ -0,0 +1,4 @@
+ .section .data.foo,"awG",%progbits,.group1,comdat
+ .byte 0
+ .section .data.foo,"aw",%progbits
+ .byte 0
--
2.20.1