Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

elf: Don't merge sections with different SHF_LINK_ORDER

Browse Source 
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.
This commit is contained in:
H.J. Lu
2023-08-30 10:24:56 -07:00
parent bac5753ca2
commit 68a2d9bf87
7 changed files with 113 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ld/ldelf.c
View File

@@ -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;

16
ld/testsuite/ld-elf/pr30791a.d Normal file
View File

@@ -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

20
ld/testsuite/ld-elf/pr30791a.s Normal file
View File

@@ -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

11
ld/testsuite/ld-elf/pr30791b.d Normal file
View File

@@ -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.*
#...

20
ld/testsuite/ld-elf/pr30791b.s Normal file
View File

@@ -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

20
ld/testsuite/ld-elf/pr30791c.s Normal file
View File

@@ -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

20
ld/testsuite/ld-elf/pr30791d.s Normal file
View File

@@ -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