From 3c5fce9bc29b216af7d10f8d6e4d8c3f11a48359 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 21 Apr 2017 12:00:55 -0700 Subject: [PATCH] Require --no-dynamic-linker with -static -E/--dynamic-list When -static -E/--dynamic-list are passed to linker, linker may create executable with dynamic sections which aren't supported by run-time. We require --no-dynamic-linker together with -static -E/--dynamic-list before adding dynamic symbol table to static executable. bfd/ PR ld/19617 PR ld/21086 * elflink.c (elf_link_add_object_symbols): Require --no-dynamic-linker with -E/--dynamic-list when creating dynamic sections. ld/ PR ld/19617 PR ld/21086 * testsuite/ld-elf/pr19617a.d: Pass --no-dynamic-linker to ld. * testsuite/ld-elf/pr19617b.d: Likewise. * testsuite/ld-elf/pr19617c.d: Likewise. *testsuite/ld-i386/pr19636-4d.d: Likewise. * testsuite/ld-elf/readelf.exp: Pass --no-dynamic-linker to ld with --export-dynamic. * testsuite/ld-elf/shared.exp: Pass --no-dynamic-linker to ld with -E. --- bfd/ChangeLog | 8 ++++++++ bfd/elflink.c | 1 + ld/ChangeLog | 13 +++++++++++++ ld/testsuite/ld-elf/pr19617a.d | 2 +- ld/testsuite/ld-elf/pr19617b.d | 2 +- ld/testsuite/ld-elf/pr19617c.d | 2 +- ld/testsuite/ld-elf/pr21086.c | 8 ++++++++ ld/testsuite/ld-elf/pr21086.list | 3 +++ ld/testsuite/ld-elf/readelf.exp | 2 +- ld/testsuite/ld-elf/shared.exp | 4 ++-- ld/testsuite/ld-i386/pr19636-4d.d | 2 +- 11 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 ld/testsuite/ld-elf/pr21086.c create mode 100644 ld/testsuite/ld-elf/pr21086.list diff --git a/bfd/ChangeLog b/bfd/ChangeLog index ac80a44..4576020 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2017-04-21 H.J. Lu + + PR ld/19617 + PR ld/21086 + * elflink.c (elf_link_add_object_symbols): Require + --no-dynamic-linker with -E/--dynamic-list when creating + dynamic sections. + 2017-04-20 Maciej W. Rozycki * elflink.c (_bfd_elf_symbol_refs_local_p): Always return TRUE diff --git a/bfd/elflink.c b/bfd/elflink.c index 330fad7..0d42c4c 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -3851,6 +3851,7 @@ elf_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info) if (!just_syms && (bfd_link_pic (info) || (!bfd_link_relocatable (info) + && info->nointerp && (info->export_dynamic || info->dynamic))) && is_elf_hash_table (htab) && info->output_bfd->xvec == abfd->xvec diff --git a/ld/ChangeLog b/ld/ChangeLog index fb88dc7..86d9e51 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,16 @@ +2017-04-21 H.J. Lu + + PR ld/19617 + PR ld/21086 + * testsuite/ld-elf/pr19617a.d: Pass --no-dynamic-linker to ld. + * testsuite/ld-elf/pr19617b.d: Likewise. + * testsuite/ld-elf/pr19617c.d: Likewise. + *testsuite/ld-i386/pr19636-4d.d: Likewise. + * testsuite/ld-elf/readelf.exp: Pass --no-dynamic-linker to ld + with --export-dynamic. + * testsuite/ld-elf/shared.exp: Pass --no-dynamic-linker to ld + with -E. + 2017-04-20 H.J. Lu PR ld/21402 diff --git a/ld/testsuite/ld-elf/pr19617a.d b/ld/testsuite/ld-elf/pr19617a.d index 784aacb..132021f 100644 --- a/ld/testsuite/ld-elf/pr19617a.d +++ b/ld/testsuite/ld-elf/pr19617a.d @@ -1,5 +1,5 @@ #source: pr19617.s -#ld: -E +#ld: -E --no-dynamic-linker #readelf : --dyn-syms --wide #target: *-*-linux* *-*-gnu* *-*-solaris* diff --git a/ld/testsuite/ld-elf/pr19617b.d b/ld/testsuite/ld-elf/pr19617b.d index e1dcb71..4d1886f 100644 --- a/ld/testsuite/ld-elf/pr19617b.d +++ b/ld/testsuite/ld-elf/pr19617b.d @@ -1,5 +1,5 @@ #source: pr19617.s -#ld: --dynamic-list-data +#ld: --dynamic-list-data --no-dynamic-linker #readelf : --dyn-syms --wide #target: *-*-linux* *-*-gnu* *-*-solaris* diff --git a/ld/testsuite/ld-elf/pr19617c.d b/ld/testsuite/ld-elf/pr19617c.d index 00e2e7e..9ac8fc1 100644 --- a/ld/testsuite/ld-elf/pr19617c.d +++ b/ld/testsuite/ld-elf/pr19617c.d @@ -1,5 +1,5 @@ #source: pr19617.s -#ld: --dynamic-list-data +#ld: --dynamic-list-data --no-dynamic-linker #readelf : --dyn-syms --wide #target: *-*-linux* *-*-gnu* *-*-solaris* diff --git a/ld/testsuite/ld-elf/pr21086.c b/ld/testsuite/ld-elf/pr21086.c new file mode 100644 index 0000000..8fb892c --- /dev/null +++ b/ld/testsuite/ld-elf/pr21086.c @@ -0,0 +1,8 @@ +#include + +int +main () +{ + printf ("PASS\n"); + return 0; +} diff --git a/ld/testsuite/ld-elf/pr21086.list b/ld/testsuite/ld-elf/pr21086.list new file mode 100644 index 0000000..a4e712f --- /dev/null +++ b/ld/testsuite/ld-elf/pr21086.list @@ -0,0 +1,3 @@ +{ + main; +}; diff --git a/ld/testsuite/ld-elf/readelf.exp b/ld/testsuite/ld-elf/readelf.exp index 92ca1c5..6831c19 100644 --- a/ld/testsuite/ld-elf/readelf.exp +++ b/ld/testsuite/ld-elf/readelf.exp @@ -43,7 +43,7 @@ if [check_shared_lib_support] { run_ld_link_tests [list \ [list \ "readelf version information" \ - "$LFLAGS -e 0 --export-dynamic -T ver_def.ld\ + "$LFLAGS --no-dynamic-linker -e 0 --export-dynamic -T ver_def.ld\ --version-script=ver_def.ver" \ "" "" \ {ver_def.s} \ diff --git a/ld/testsuite/ld-elf/shared.exp b/ld/testsuite/ld-elf/shared.exp index 4859170..0fd41ff 100644 --- a/ld/testsuite/ld-elf/shared.exp +++ b/ld/testsuite/ld-elf/shared.exp @@ -104,13 +104,13 @@ if { [check_gc_sections_available] } { "pr20828-v.so"] \ [list \ "PR ld/20828 forcibly exported symbol version without section GC" \ - "$LFLAGS -e foo -E -T pr20828-v.ld" "" "" \ + "$LFLAGS --no-dynamic-linker -e foo -E -T pr20828-v.ld" "" "" \ {pr20828-v.s} \ {{objdump -p pr20828-v.od}} \ "pr20828-v-1"] \ [list \ "PR ld/20828 forcibly exported symbol version with section GC" \ - "$LFLAGS -e foo --gc-sections -E -T pr20828-v.ld" "" "" \ + "$LFLAGS --no-dynamic-linker -e foo --gc-sections -E -T pr20828-v.ld" "" "" \ {pr20828-v.s} \ {{objdump -p pr20828-v.od}} \ "pr20828-v-2"]] diff --git a/ld/testsuite/ld-i386/pr19636-4d.d b/ld/testsuite/ld-i386/pr19636-4d.d index a9487f0..e3db609 100644 --- a/ld/testsuite/ld-i386/pr19636-4d.d +++ b/ld/testsuite/ld-i386/pr19636-4d.d @@ -1,6 +1,6 @@ #source: pr19636-4.s #as: --32 -#ld: -E --defsym foobar=0x100 -m elf_i386 +#ld: -E --defsym foobar=0x100 -m elf_i386 --no-dynamic-linker #readelf : --dyn-syms --wide Symbol table '\.dynsym' contains [0-9]+ entries: -- 2.7.4