espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-29 08:24:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

elf: Remove the property after reporting its removal

Browse Source 
commit d2ef37ebd9f771d06edf1fdea37970f60b242b2d
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Fri Dec 7 08:30:30 2018 -0800

    elf: Report property change when merging properties

failed to remove the property after reporting it has been removed.  This
patch corrects it.

bfd/

	PR ld/24721
	* elf-properties.c (elf_merge_gnu_property_list): Remove the
	property after reporting property removal.

ld/

	PR ld/24721
	* testsuite/ld-x86-64/x86-64.exp: Run PR ld/24721 tests.
	* testsuite/ld-x86-64/pr24721-x32.d: New file.
	* testsuite/ld-x86-64/pr24721.d: Likewise.
	* testsuite/ld-x86-64/pr24721.map: Likewise.
	* testsuite/ld-x86-64/pr24721a.s: Likewise.
	* testsuite/ld-x86-64/pr24721b.s: Likewise.
This commit is contained in:
H.J. Lu
2019-06-24 11:08:40 -07:00
parent 164e3873cf
commit f93ab3a0b8
9 changed files with 77 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bfd/ChangeLog
View File

@ -1,3 +1,9 @@
2019-06-24 H.J. Lu <hongjiu.lu@intel.com>
PR ld/24721
* elf-properties.c (elf_merge_gnu_property_list): Remove the
property after reporting property removal.
2019-06-23 Alan Modra <amodra@gmail.com>
PR 24704

10
bfd/elf-properties.c
View File

@ -322,12 +322,10 @@ elf_merge_gnu_property_list (struct bfd_link_info *info, bfd *first_pbfd,
(bfd_vma) p->property.pr_type, first_pbfd, abfd);
}
}
else
{
/* Remove this property. */
*lastp = p->next;
continue;
}
/* Remove this property. */
*lastp = p->next;
continue;
}
else if (number_p)
{

10
ld/ChangeLog
View File

@ -1,3 +1,13 @@
2019-06-24 H.J. Lu <hongjiu.lu@intel.com>
PR ld/24721
* testsuite/ld-x86-64/x86-64.exp: Run PR ld/24721 tests.
* testsuite/ld-x86-64/pr24721-x32.d: New file.
* testsuite/ld-x86-64/pr24721.d: Likewise.
* testsuite/ld-x86-64/pr24721.map: Likewise.
* testsuite/ld-x86-64/pr24721a.s: Likewise.
* testsuite/ld-x86-64/pr24721b.s: Likewise.
2019-06-23 Alan Modra <amodra@gmail.com>
PR 24704

6
ld/testsuite/ld-x86-64/pr24721-x32.d Normal file
View File

@ -0,0 +1,6 @@
#source: pr24721a.s
#source: pr24721b.s
#as: --x32 -mx86-used-note=no
#ld: -r -m elf32_x86_64 -Map tmpdir/pr24721.map
#readelf: -n
#map: pr24721.map

6
ld/testsuite/ld-x86-64/pr24721.d Normal file
View File

@ -0,0 +1,6 @@
#source: pr24721a.s
#source: pr24721b.s
#as: --64 -defsym __64_bit__=1 -mx86-used-note=no
#ld: -r -melf_x86_64 -Map tmpdir/pr24721.map
#readelf: -n
#map: pr24721.map

3
ld/testsuite/ld-x86-64/pr24721.map Normal file
View File

@ -0,0 +1,3 @@
#...
Removed property 0xc0000002 to merge tmpdir/pr24721a.o \(0x1\) and tmpdir/pr24721b.o \(not found\)
#pass

34
ld/testsuite/ld-x86-64/pr24721a.s Normal file
View File

@ -0,0 +1,34 @@
.text
.globl foo
.type foo,@function
.p2align 4
foo:
ret
.section ".note.gnu.property", "a"
.ifdef __64_bit__
.p2align 3
.else
.p2align 2
.endif
.long 1f - 0f /* name length */
.long 5f - 2f /* data length */
.long 5 /* note type */
0: .asciz "GNU" /* vendor name */
1:
.ifdef __64_bit__
.p2align 3
.else
.p2align 2
.endif
2: .long 0xc0000002 /* pr_type. */
.long 4f - 3f /* pr_datasz. */
3:
.long 0x1
4:
.ifdef __64_bit__
.p2align 3
.else
.p2align 2
.endif
5:

6
ld/testsuite/ld-x86-64/pr24721b.s Normal file
View File

@ -0,0 +1,6 @@
.text
.globl bar
.type bar,@function
.p2align 4
bar:
ret

2
ld/testsuite/ld-x86-64/x86-64.exp
View File

@ -456,6 +456,8 @@ run_dump_test "pr24458b"
run_dump_test "pr24458b-x32"
run_dump_test "pr24458c"
run_dump_test "pr24458c-x32"
run_dump_test "pr24721"
run_dump_test "pr24721-x32"
if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} {
return