Commit f6becb01 authored by H.J. Lu's avatar H.J. Lu

x86: Remove x86 ISA properties with empty bits

There is no need to generate x86 ISA properties with empty bits in
linker output.

bfd/

	PR ld/23372
	* elfxx-x86.c (_bfd_x86_elf_merge_gnu_properties): Remove x86
	ISA properties with empty bits.

ld/

	PR ld/23372
	* testsuite/ld-i386/i386.exp: Run pr23372a and pr23372b.
	* testsuite/ld-i386/pr23372a.d: New file.
	* testsuite/ld-i386/pr23372a.s: Likewise.
	* testsuite/ld-i386/pr23372b.d: Likewise.
	* testsuite/ld-i386/pr23372b.s: Likewise.
	* testsuite/ld-i386/pr23372c.s: Likewise.
	* testsuite/ld-x86-64/pr23372a-x32.d: Likewise.
	* testsuite/ld-x86-64/pr23372a.d: Likewise.
	* testsuite/ld-x86-64/pr23372a.s: Likewise.
	* testsuite/ld-x86-64/pr23372b-x32.d: Likewise.
	* testsuite/ld-x86-64/pr23372b.d: Likewise.
	* testsuite/ld-x86-64/pr23372b.s: Likewise.
	* testsuite/ld-x86-64/pr23372c.s: Likewise.
	* testsuite/ld-x86-64/x86-64.exp: Run pr23372a, pr23372a-x32,
	pr23372b and pr23372b-x32.

(cherry picked from commit 56ad703d)
parent e55992d4
2018-07-09 H.J. Lu <hongjiu.lu@intel.com>
PR ld/23372
* elfxx-x86.c (_bfd_x86_elf_merge_gnu_properties): Remove x86
ISA properties with empty bits.
2018-07-06 Alan Modra <amodra@gmail.com>
* elf32-arm.c (elf32_arm_nabi_write_core_note): Don't use
......
......@@ -2412,13 +2412,34 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info,
{
number = aprop->u.number;
aprop->u.number = number | bprop->u.number;
updated = number != (unsigned int) aprop->u.number;
/* Remove the property if ISA bits are empty. */
if (aprop->u.number == 0)
{
aprop->pr_kind = property_remove;
updated = TRUE;
}
else
updated = number != (unsigned int) aprop->u.number;
}
else
{
/* Return TRUE if APROP is NULL to indicate that BPROP should
be added to ABFD. */
updated = aprop == NULL;
/* Only one of APROP and BPROP can be NULL. */
if (aprop != NULL)
{
if (aprop->u.number == 0)
{
/* Remove APROP if ISA bits are empty. */
aprop->pr_kind = property_remove;
updated = TRUE;
}
}
else
{
/* Return TRUE if APROP is NULL and ISA bits of BPROP
aren't empty to indicate that BPROP should be added
to ABFD. */
updated = bprop->u.number != 0;
}
}
break;
......
2018-07-09 H.J. Lu <hongjiu.lu@intel.com>
PR ld/23372
* testsuite/ld-i386/i386.exp: Run pr23372a and pr23372b.
* testsuite/ld-i386/pr23372a.d: New file.
* testsuite/ld-i386/pr23372a.s: Likewise.
* testsuite/ld-i386/pr23372b.d: Likewise.
* testsuite/ld-i386/pr23372b.s: Likewise.
* testsuite/ld-i386/pr23372c.s: Likewise.
* testsuite/ld-x86-64/pr23372a-x32.d: Likewise.
* testsuite/ld-x86-64/pr23372a.d: Likewise.
* testsuite/ld-x86-64/pr23372a.s: Likewise.
* testsuite/ld-x86-64/pr23372b-x32.d: Likewise.
* testsuite/ld-x86-64/pr23372b.d: Likewise.
* testsuite/ld-x86-64/pr23372b.s: Likewise.
* testsuite/ld-x86-64/pr23372c.s: Likewise.
* testsuite/ld-x86-64/x86-64.exp: Run pr23372a, pr23372a-x32,
pr23372b and pr23372b-x32.
2018-07-05 Jim Wilson <jimw@sifive.com>
* configure.tgt (riscv-*-*): Add as an alias for riscv32*-*-*.
......
......@@ -460,6 +460,8 @@ run_dump_test "pr22782"
run_dump_test "pr22929"
run_dump_test "pr23189"
run_dump_test "pr23194"
run_dump_test "pr23372a"
run_dump_test "pr23372b"
if { !([istarget "i?86-*-linux*"]
|| [istarget "i?86-*-gnu*"]
......
#source: pr23372a.s
#source: pr23372b.s
#as: --32
#ld: -r -m elf_i386
#readelf: -n
.section ".note.gnu.property", "a"
.p2align 2
.long 1f - 0f /* name length. */
.long 4f - 1f /* data length. */
/* NT_GNU_PROPERTY_TYPE_0 */
.long 5 /* note type. */
0:
.asciz "GNU" /* vendor name. */
1:
.p2align 2
/* GNU_PROPERTY_X86_ISA_1_USED */
.long 0xc0000000 /* pr_type. */
.long 3f - 2f /* pr_datasz. */
2:
.long 0x0
3:
.p2align 2
4:
#source: pr23372a.s
#source: pr23372c.s
#as: --32
#ld: -r -m elf_i386
#readelf: -n
.section ".note.gnu.property", "a"
.p2align 2
.long 1f - 0f /* name length. */
.long 4f - 1f /* data length. */
/* NT_GNU_PROPERTY_TYPE_0 */
.long 5 /* note type. */
0:
.asciz "GNU" /* vendor name. */
1:
.p2align 2
/* GNU_PROPERTY_X86_ISA_1_USED */
.long 0xc0000000 /* pr_type. */
.long 3f - 2f /* pr_datasz. */
2:
.long 0x0
3:
.p2align 2
4:
.section ".note.gnu.property", "a"
.p2align 2
.long 1f - 0f /* name length. */
.long 4f - 1f /* data length. */
/* NT_GNU_PROPERTY_TYPE_0 */
.long 5 /* note type. */
0:
.asciz "GNU" /* vendor name. */
1:
.p2align 2
/* GNU_PROPERTY_X86_ISA_1_NEEDED */
.long 0xc0000001 /* pr_type. */
.long 3f - 2f /* pr_datasz. */
2:
.long 0x0
3:
.p2align 2
4:
#source: pr23372a.s
#source: pr23372b.s
#as: --x32
#ld: -r -m elf32_x86_64
#readelf: -n
#source: pr23372a.s
#source: pr23372b.s
#as: --64 -defsym __64_bit__=1
#ld: -r -m elf_x86_64
#readelf: -n
.section ".note.gnu.property", "a"
.ifdef __64_bit__
.p2align 3
.else
.p2align 2
.endif
.long 1f - 0f /* name length. */
.long 4f - 1f /* data length. */
/* NT_GNU_PROPERTY_TYPE_0 */
.long 5 /* note type. */
0:
.asciz "GNU" /* vendor name. */
1:
.ifdef __64_bit__
.p2align 3
.else
.p2align 2
.endif
/* GNU_PROPERTY_X86_ISA_1_USED */
.long 0xc0000000 /* pr_type. */
.long 3f - 2f /* pr_datasz. */
2:
.long 0x0
3:
.ifdef __64_bit__
.p2align 3
.else
.p2align 2
.endif
4:
#source: pr23372a.s
#source: pr23372c.s
#as: --x32
#ld: -r -m elf32_x86_64
#readelf: -n
#source: pr23372a.s
#source: pr23372c.s
#as: --64 -defsym __64_bit__=1
#ld: -r -m elf_x86_64
#readelf: -n
.section ".note.gnu.property", "a"
.ifdef __64_bit__
.p2align 3
.else
.p2align 2
.endif
.long 1f - 0f /* name length. */
.long 4f - 1f /* data length. */
/* NT_GNU_PROPERTY_TYPE_0 */
.long 5 /* note type. */
0:
.asciz "GNU" /* vendor name. */
1:
.ifdef __64_bit__
.p2align 3
.else
.p2align 2
.endif
/* GNU_PROPERTY_X86_ISA_1_USED */
.long 0xc0000000 /* pr_type. */
.long 3f - 2f /* pr_datasz. */
2:
.long 0x0
3:
.ifdef __64_bit__
.p2align 3
.else
.p2align 2
.endif
4:
.section ".note.gnu.property", "a"
.ifdef __64_bit__
.p2align 3
.else
.p2align 2
.endif
.long 1f - 0f /* name length. */
.long 4f - 1f /* data length. */
/* NT_GNU_PROPERTY_TYPE_0 */
.long 5 /* note type. */
0:
.asciz "GNU" /* vendor name. */
1:
.ifdef __64_bit__
.p2align 3
.else
.p2align 2
.endif
/* GNU_PROPERTY_X86_ISA_1_NEEDED */
.long 0xc0000001 /* pr_type. */
.long 3f - 2f /* pr_datasz. */
2:
.long 0x0
3:
.ifdef __64_bit__
.p2align 3
.else
.p2align 2
.endif
4:
......@@ -399,6 +399,10 @@ run_dump_test "pr23189"
run_dump_test "pr23194"
run_dump_test "pr23324a"
run_dump_test "pr23324b"
run_dump_test "pr23372a"
run_dump_test "pr23372a-x32"
run_dump_test "pr23372b"
run_dump_test "pr23372b-x32"
if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} {
return
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment