From 4e84a8f8bbeab52fa7048873655e582ceb92534d Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 17 Apr 2019 09:08:46 -0700 Subject: [PATCH] x86: Also check x86 linker_def for non-shared definition Since elf_x86_linker_defined sets linker_def in elf_x86_link_hash_entry for linker defined symbols, SYMBOL_DEFINED_NON_SHARED_P should also check linker_def in elf_x86_link_hash_entry. bfd/ PR ld/24458 * elfxx-x86.h (SYMBOL_DEFINED_NON_SHARED_P): Also check x86 linker_def. ld/ PR ld/24458 * testsuite/ld-x86-64/x86-64.exp: Run PR ld/24458 tests. * testsuite/ld-x86-64/pr24458.s: New file. * testsuite/ld-x86-64/pr24458a-x32.d: Likewise. * testsuite/ld-x86-64/pr24458a.d: Likewise. * testsuite/ld-x86-64/pr24458b-x32.d: Likewise. * testsuite/ld-x86-64/pr24458b.d: Likewise. * testsuite/ld-x86-64/pr24458c-x32.d: Likewise. * testsuite/ld-x86-64/pr24458c.d: Likewise. --- bfd/ChangeLog | 6 ++++++ bfd/elfxx-x86.h | 1 + ld/ChangeLog | 12 ++++++++++++ ld/testsuite/ld-x86-64/pr24458.s | 5 +++++ ld/testsuite/ld-x86-64/pr24458a-x32.d | 10 ++++++++++ ld/testsuite/ld-x86-64/pr24458a.d | 10 ++++++++++ ld/testsuite/ld-x86-64/pr24458b-x32.d | 10 ++++++++++ ld/testsuite/ld-x86-64/pr24458b.d | 10 ++++++++++ ld/testsuite/ld-x86-64/pr24458c-x32.d | 10 ++++++++++ ld/testsuite/ld-x86-64/pr24458c.d | 10 ++++++++++ ld/testsuite/ld-x86-64/x86-64.exp | 6 ++++++ 11 files changed, 90 insertions(+) create mode 100644 ld/testsuite/ld-x86-64/pr24458.s create mode 100644 ld/testsuite/ld-x86-64/pr24458a-x32.d create mode 100644 ld/testsuite/ld-x86-64/pr24458a.d create mode 100644 ld/testsuite/ld-x86-64/pr24458b-x32.d create mode 100644 ld/testsuite/ld-x86-64/pr24458b.d create mode 100644 ld/testsuite/ld-x86-64/pr24458c-x32.d create mode 100644 ld/testsuite/ld-x86-64/pr24458c.d diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 834b84f75f9..2d1c14faff9 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2019-04-17 H.J. Lu + + PR ld/24458 + * elfxx-x86.h (SYMBOL_DEFINED_NON_SHARED_P): Also check x86 + linker_def. + 2019-04-15 Thomas Preud'homme * reloc.c (BFD_RELOC_ARM_T32_VLDR_VSTR_OFF_IMM): New internal diff --git a/bfd/elfxx-x86.h b/bfd/elfxx-x86.h index 013ac4b761e..57d6d6e4087 100644 --- a/bfd/elfxx-x86.h +++ b/bfd/elfxx-x86.h @@ -167,6 +167,7 @@ ((H)->def_regular \ || (H)->root.linker_def \ || (H)->root.ldscript_def \ + || ((struct elf_x86_link_hash_entry *) (H))->linker_def \ || ELF_COMMON_DEF_P (H)) /* TRUE if relative relocation should be generated. GOT reference to diff --git a/ld/ChangeLog b/ld/ChangeLog index 32abe86a73b..0fae659df45 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,15 @@ +2019-04-17 H.J. Lu + + PR ld/24458 + * testsuite/ld-x86-64/x86-64.exp: Run PR ld/24458 tests. + * testsuite/ld-x86-64/pr24458.s: New file. + * testsuite/ld-x86-64/pr24458a-x32.d: Likewise. + * testsuite/ld-x86-64/pr24458a.d: Likewise. + * testsuite/ld-x86-64/pr24458b-x32.d: Likewise. + * testsuite/ld-x86-64/pr24458b.d: Likewise. + * testsuite/ld-x86-64/pr24458c-x32.d: Likewise. + * testsuite/ld-x86-64/pr24458c.d: Likewise. + 2019-04-17 Jozef Lawrynowicz * config/tc-msp430.c (msp430_make_init_symbols): Define __crt0_init_bss diff --git a/ld/testsuite/ld-x86-64/pr24458.s b/ld/testsuite/ld-x86-64/pr24458.s new file mode 100644 index 00000000000..7dbd47af63f --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr24458.s @@ -0,0 +1,5 @@ + .text + .globl _start + .type _start, @function +_start: + movq __ehdr_start(%rip), %rax diff --git a/ld/testsuite/ld-x86-64/pr24458a-x32.d b/ld/testsuite/ld-x86-64/pr24458a-x32.d new file mode 100644 index 00000000000..ae3994a5574 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr24458a-x32.d @@ -0,0 +1,10 @@ +#source: pr24458.s +#as: --x32 -mx86-used-note=yes +#ld: -m elf32_x86_64 +#readelf: -n + +Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: x86 ISA used: + x86 feature used: x86 diff --git a/ld/testsuite/ld-x86-64/pr24458a.d b/ld/testsuite/ld-x86-64/pr24458a.d new file mode 100644 index 00000000000..9e2e8b09798 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr24458a.d @@ -0,0 +1,10 @@ +#source: pr24458.s +#as: --64 -mx86-used-note=yes +#ld: -m elf_x86_64 +#readelf: -n + +Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: x86 ISA used: + x86 feature used: x86 diff --git a/ld/testsuite/ld-x86-64/pr24458b-x32.d b/ld/testsuite/ld-x86-64/pr24458b-x32.d new file mode 100644 index 00000000000..57d10ab11ef --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr24458b-x32.d @@ -0,0 +1,10 @@ +#source: pr24458.s +#as: --x32 -mx86-used-note=yes +#ld: -pie -m elf32_x86_64 +#readelf: -n + +Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: x86 ISA used: + x86 feature used: x86 diff --git a/ld/testsuite/ld-x86-64/pr24458b.d b/ld/testsuite/ld-x86-64/pr24458b.d new file mode 100644 index 00000000000..bdcc79a3418 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr24458b.d @@ -0,0 +1,10 @@ +#source: pr24458.s +#as: --64 -mx86-used-note=yes +#ld: -pie -m elf_x86_64 +#readelf: -n + +Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: x86 ISA used: + x86 feature used: x86 diff --git a/ld/testsuite/ld-x86-64/pr24458c-x32.d b/ld/testsuite/ld-x86-64/pr24458c-x32.d new file mode 100644 index 00000000000..4d766364045 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr24458c-x32.d @@ -0,0 +1,10 @@ +#source: pr24458.s +#as: --x32 -mx86-used-note=yes +#ld: -shared -m elf32_x86_64 +#readelf: -n + +Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: x86 ISA used: + x86 feature used: x86 diff --git a/ld/testsuite/ld-x86-64/pr24458c.d b/ld/testsuite/ld-x86-64/pr24458c.d new file mode 100644 index 00000000000..e2998316818 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr24458c.d @@ -0,0 +1,10 @@ +#source: pr24458.s +#as: --64 -mx86-used-note=yes +#ld: -shared -m elf_x86_64 +#readelf: -n + +Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: x86 ISA used: + x86 feature used: x86 diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp index 408e52a9f26..7ebc4613eed 100644 --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -450,6 +450,12 @@ run_dump_test "pr24322a" run_dump_test "pr24322a-x32" run_dump_test "pr24322b" run_dump_test "pr24322b-x32" +run_dump_test "pr24458a" +run_dump_test "pr24458a-x32" +run_dump_test "pr24458b" +run_dump_test "pr24458b-x32" +run_dump_test "pr24458c" +run_dump_test "pr24458c-x32" if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} { return -- 2.30.2