diff mbox series

elf: Don't merge sections with different SHF_LINK_ORDER

Message ID 20230830173149.757103-1-hjl.tools@gmail.com
State New
Headers
Series elf: Don't merge sections with different SHF_LINK_ORDER |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_binutils_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_binutils_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_binutils_check--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_binutils_check--master-arm success Testing passed

Commit Message

H.J. Lu Aug. 30, 2023, 5:31 p.m. UTC 
  For relocatable link, don't merge 2 SHF_LINK_ORDER sections if output
sections of their linked to sections are different.

	* ldelf.c (elf_orphan_compatible): Don't merge sections with
	different SHF_LINK_ORDER.
	* testsuite/ld-elf/pr30791a.d: New file.
	* testsuite/ld-elf/pr30791a.s: Likewise.
	* testsuite/ld-elf/pr30791b.d: Likewise.
	* testsuite/ld-elf/pr30791b.s: Likewise.
	* testsuite/ld-elf/pr30791c.s: Likewise.
	* testsuite/ld-elf/pr30791d.s: Likewise.
---
 ld/ldelf.c                     |  7 ++++++-
 ld/testsuite/ld-elf/pr30791a.d | 16 ++++++++++++++++
 ld/testsuite/ld-elf/pr30791a.s | 20 ++++++++++++++++++++
 ld/testsuite/ld-elf/pr30791b.d | 11 +++++++++++
 ld/testsuite/ld-elf/pr30791b.s | 20 ++++++++++++++++++++
 ld/testsuite/ld-elf/pr30791c.s | 20 ++++++++++++++++++++
 ld/testsuite/ld-elf/pr30791d.s | 20 ++++++++++++++++++++
 7 files changed, 113 insertions(+), 1 deletion(-)
 create mode 100644 ld/testsuite/ld-elf/pr30791a.d
 create mode 100644 ld/testsuite/ld-elf/pr30791a.s
 create mode 100644 ld/testsuite/ld-elf/pr30791b.d
 create mode 100644 ld/testsuite/ld-elf/pr30791b.s
 create mode 100644 ld/testsuite/ld-elf/pr30791c.s
 create mode 100644 ld/testsuite/ld-elf/pr30791d.s

Comments

Alan Modra Aug. 30, 2023, 11:50 p.m. UTC | #1 
On Wed, Aug 30, 2023 at 10:31:49AM -0700, H.J. Lu via Binutils wrote:
> For relocatable link, don't merge 2 SHF_LINK_ORDER sections if output
> sections of their linked to sections are different.
> 
> 	* ldelf.c (elf_orphan_compatible): Don't merge sections with
> 	different SHF_LINK_ORDER.
> 	* testsuite/ld-elf/pr30791a.d: New file.
> 	* testsuite/ld-elf/pr30791a.s: Likewise.
> 	* testsuite/ld-elf/pr30791b.d: Likewise.
> 	* testsuite/ld-elf/pr30791b.s: Likewise.
> 	* testsuite/ld-elf/pr30791c.s: Likewise.
> 	* testsuite/ld-elf/pr30791d.s: Likewise.

OK, thanks.
Alan Modra Aug. 31, 2023, 8:54 a.m. UTC | #2 
On Wed, Aug 30, 2023 at 10:31:49AM -0700, H.J. Lu via Binutils wrote:
> For relocatable link, don't merge 2 SHF_LINK_ORDER sections if output
> sections of their linked to sections are different.

d30v-elf  +FAIL: ld-elf/pr30791a
dlx-elf  +FAIL: ld-elf/pr30791a
fr30-elf  +FAIL: ld-elf/pr30791a
frv-elf  +FAIL: ld-elf/pr30791a
ft32-elf  +FAIL: ld-elf/pr30791a
hppa-linux-gnu  +FAIL: ld-elf/pr30791b
iq2000-elf  +FAIL: ld-elf/pr30791a
mn10200-elf  +FAIL: ld-elf/pr30791a
msp430-elf  +FAIL: ld-elf/pr30791a
mt-elf  +FAIL: ld-elf/pr30791a
pj-elf  +FAIL: ld-elf/pr30791a
s12z-elf  +FAIL: ld-elf/pr30791a
xgate-elf  +FAIL: ld-elf/pr30791a
z80-elf  +FAIL: ld-elf/pr30791a
z80-elf  +FAIL: ld-elf/pr30791b
diff mbox series

Patch

diff --git a/ld/ldelf.c b/ld/ldelf.c
index 4212075a0e2..d74354a9622 100644
--- a/ld/ldelf.c
+++ b/ld/ldelf.c
@@ -2080,9 +2080,14 @@  elf_orphan_compatible (asection *in, asection *out)
     return false;
   /* We can't merge with a member of an output section group or merge
      two sections with differing SHF_EXCLUDE or other processor and OS
-     specific flags when doing a relocatable link.  */
+     specific flags or with different SHF_LINK_ORDER when doing a
+     relocatable link.  */
   if (bfd_link_relocatable (&link_info)
       && (elf_next_in_group (out) != NULL
+	  || ((elf_section_flags (in) & SHF_LINK_ORDER) != 0
+	      && (elf_section_flags (out) & SHF_LINK_ORDER) != 0
+	      && (elf_linked_to_section (in)->output_section
+		  != elf_linked_to_section (out)->output_section))
 	  || ((elf_section_flags (out) ^ elf_section_flags (in))
 	      & (SHF_MASKPROC | SHF_MASKOS)) != 0))
     return false;
diff --git a/ld/testsuite/ld-elf/pr30791a.d b/ld/testsuite/ld-elf/pr30791a.d
new file mode 100644
index 00000000000..2446b525fa9
--- /dev/null
+++ b/ld/testsuite/ld-elf/pr30791a.d
@@ -0,0 +1,16 @@ 
+#source: pr30791a.s
+#source: pr30791b.s
+#ld: -r
+#readelf: -S --wide
+
+#...
+Section Headers:
+#...
+  \[[ 0-9]+\] __patchable_function_entries[ \t]+PROGBITS[ \t0-9a-f]+WAL.*
+#...
+  \[[ 0-9]+\] __patchable_function_entries[ \t]+PROGBITS[ \t0-9a-f]+WAL.*
+#...
+  \[[ 0-9]+\] __patchable_function_entries[ \t]+PROGBITS[ \t0-9a-f]+WAL.*
+#...
+  \[[ 0-9]+\] __patchable_function_entries[ \t]+PROGBITS[ \t0-9a-f]+WAL.*
+#pass
diff --git a/ld/testsuite/ld-elf/pr30791a.s b/ld/testsuite/ld-elf/pr30791a.s
new file mode 100644
index 00000000000..44b75db87d8
--- /dev/null
+++ b/ld/testsuite/ld-elf/pr30791a.s
@@ -0,0 +1,20 @@ 
+	.section	.text.a,"ax",%progbits
+	.globl	a
+	.type	a, %function
+a:
+.LFB0:
+	.section	__patchable_function_entries,"awo",%progbits,.LPFE0
+	.dc.a	.LPFE0
+	.section	.text.a
+.LPFE0:
+	.byte	0
+	.section	.text.b,"ax",%progbits
+	.globl	b
+	.type	b, %function
+b:
+.LFB1:
+	.section	__patchable_function_entries,"awo",%progbits,.LPFE1
+	.dc.a	.LPFE1
+	.section	.text.b
+.LPFE1:
+	.byte	0
diff --git a/ld/testsuite/ld-elf/pr30791b.d b/ld/testsuite/ld-elf/pr30791b.d
new file mode 100644
index 00000000000..5013c240f8a
--- /dev/null
+++ b/ld/testsuite/ld-elf/pr30791b.d
@@ -0,0 +1,11 @@ 
+#source: pr30791c.s
+#source: pr30791d.s
+#ld: -r
+#readelf: -S --wide
+
+#failif
+#...
+  \[[ 0-9]+\] __patchable_function_entries[ \t]+PROGBITS[ \t0-9a-f]+WAL.*
+#...
+  \[[ 0-9]+\] __patchable_function_entries[ \t]+PROGBITS[ \t0-9a-f]+WAL.*
+#...
diff --git a/ld/testsuite/ld-elf/pr30791b.s b/ld/testsuite/ld-elf/pr30791b.s
new file mode 100644
index 00000000000..3f97f6c979f
--- /dev/null
+++ b/ld/testsuite/ld-elf/pr30791b.s
@@ -0,0 +1,20 @@ 
+	.section	.text.c,"ax",%progbits
+	.globl	c
+	.type	c, %function
+c:
+.LFB0:
+	.section	__patchable_function_entries,"awo",%progbits,.LPFE0
+	.dc.a	.LPFE0
+	.section	.text.c
+.LPFE0:
+	.byte	0
+	.section	.text.d,"ax",%progbits
+	.globl	d
+	.type	d, %function
+d:
+.LFB1:
+	.section	__patchable_function_entries,"awo",%progbits,.LPFE1
+	.dc.a	.LPFE1
+	.section	.text.d
+.LPFE1:
+	.byte	0
diff --git a/ld/testsuite/ld-elf/pr30791c.s b/ld/testsuite/ld-elf/pr30791c.s
new file mode 100644
index 00000000000..71ef77bf5e9
--- /dev/null
+++ b/ld/testsuite/ld-elf/pr30791c.s
@@ -0,0 +1,20 @@ 
+	.text
+	.globl	a
+	.type	a, %function
+a:
+.LFB0:
+	.section	__patchable_function_entries,"awo",%progbits,.LPFE0
+	.dc.a	.LPFE0
+	.text
+.LPFE0:
+	.byte	0
+	.text
+	.globl	b
+	.type	b, %function
+b:
+.LFB1:
+	.section	__patchable_function_entries,"awo",%progbits,.LPFE1
+	.dc.a	.LPFE1
+	.text
+.LPFE1:
+	.byte	0
diff --git a/ld/testsuite/ld-elf/pr30791d.s b/ld/testsuite/ld-elf/pr30791d.s
new file mode 100644
index 00000000000..5ca1c60bdb9
--- /dev/null
+++ b/ld/testsuite/ld-elf/pr30791d.s
@@ -0,0 +1,20 @@ 
+	.text
+	.globl	c
+	.type	c, %function
+c:
+.LFB0:
+	.section	__patchable_function_entries,"awo",%progbits,.LPFE0
+	.dc.a	.LPFE0
+	.text
+.LPFE0:
+	.byte	0
+	.text
+	.globl	d
+	.type	d, %function
+d:
+.LFB1:
+	.section	__patchable_function_entries,"awo",%progbits,.LPFE1
+	.dc.a	.LPFE1
+	.text
+.LPFE1:
+	.byte	0