x86: Merge X86_ISA_1_USED/X86_ISA_1_NEEDED properties
authorH.J. Lu <hjl.tools@gmail.com>
Fri, 12 May 2017 15:07:21 +0000 (08:07 -0700)
committerH.J. Lu <hjl.tools@gmail.com>
Fri, 12 May 2017 15:07:43 +0000 (08:07 -0700)
commit73caa85d4a97eb991e581ccba3ff4eccce5e2e1d
tree60468868e4dce229990e7cc6499dc717419ae2a0
parent6830f270e7b6676e7a77c1b8080941e35003d918
x86: Merge X86_ISA_1_USED/X86_ISA_1_NEEDED properties

If there are more than GNU property note in an input, we should merge
X86_ISA_1_USED and X86_ISA_1_NEEDED properties.

bfd/

* elf32-i386.c (elf_i386_parse_gnu_properties): Merge
GNU_PROPERTY_X86_ISA_1_USED and GNU_PROPERTY_X86_ISA_1_NEEDED
properties.
* elf64-x86-64.c (elf_x86_64_parse_gnu_properties): Likewise.

ld/

* testsuite/ld-i386/i386.exp: Run property-x86-3.
* testsuite/ld-x86-64/x86-64.exp: Likewise.
* testsuite/ld-i386/property-x86-3.d: New file.
* testsuite/ld-i386/property-x86-3.s: Likewise.
* testsuite/ld-x86-64/property-x86-3.d: Likewise.
* testsuite/ld-x86-64/property-x86-3.s: Likewise.
bfd/ChangeLog
bfd/elf32-i386.c
bfd/elf64-x86-64.c
ld/ChangeLog
ld/testsuite/ld-i386/i386.exp
ld/testsuite/ld-i386/property-x86-3.d [new file with mode: 0644]
ld/testsuite/ld-i386/property-x86-3.s [new file with mode: 0644]
ld/testsuite/ld-x86-64/property-x86-3.d [new file with mode: 0644]
ld/testsuite/ld-x86-64/property-x86-3.s [new file with mode: 0644]
ld/testsuite/ld-x86-64/x86-64.exp