mirrors/binutils-gdb
0
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-12-18 14:53:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't merge 2 sections with different SHF_EXCLUDE

Browse Source 
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.
This commit is contained in:
H.J. Lu 2016-09-29 12:58:29 -07:00
parent bb805577d2
commit 93dc595d76
6 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ld/ChangeLog
View File

@ -1,3 +1,13 @@
2016-09-29 H.J. Lu <hongjiu.lu@intel.com>
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.
2016-09-28 Christophe Lyon <christophe.lyon@linaro.org>
PR ld/20608

9
ld/emultempl/elf32.em
View File

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

9
ld/testsuite/ld-elf/pr20528a.d Normal file
View File

@ -0,0 +1,9 @@
#source: pr20528a.s
#source: pr20528b.s
#ld: -r
#readelf: -S --wide
#...
[ ]*\[.*\][ ]+\.text.startup[ ]+PROGBITS.*[ ]+AX[ ]+.*
[ ]*\[.*\][ ]+\.text.startup[ ]+PROGBITS.*[ ]+AXE[ ]+.*
#pass

6
ld/testsuite/ld-elf/pr20528a.s Normal file
View File

@ -0,0 +1,6 @@
.text
.section .text.startup,"ax",%progbits
.globl main
.type main, %function
main:
.byte 0

9
ld/testsuite/ld-elf/pr20528b.d Normal file
View File

@ -0,0 +1,9 @@
#source: pr20528b.s
#source: pr20528a.s
#ld: -r
#readelf: -S --wide
#...
[ ]*\[.*\][ ]+\.text.startup[ ]+PROGBITS.*[ ]+AXE[ ]+.*
[ ]*\[.*\][ ]+\.text.startup[ ]+PROGBITS.*[ ]+AX[ ]+.*
#pass

6
ld/testsuite/ld-elf/pr20528b.s Normal file
View File

@ -0,0 +1,6 @@
.text
.section .text.startup,"axe",%progbits
.globl main1
.type main1, %function
main1:
.byte 0