From 212b9bc7b4cfa7702005928dc3bffb3ba3a6e19a Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 12 Jun 2018 13:22:24 +0100 Subject: [PATCH] Fix the PR22983 test so that it will work regardless of the order of the symbols in the dynamic symbol table. See email thread starting here for more details: https://sourceware.org/ml/binutils/2018-06/msg00036.html PR 22983 * testsuite/ld-plugin/lto.exp: Use individual tests to check for the presence of each expected symbol. * testsuite/ld-plugin/pr22983.1.d: New file. * testsuite/ld-plugin/pr22983.2.d: New file. * testsuite/ld-plugin/pr22983.3.d: New file. * testsuite/ld-plugin/pr22983.4.d: New file. --- ld/ChangeLog | 8 ++++++++ ld/testsuite/ld-plugin/lto.exp | 20 ++++++++++++++++++-- ld/testsuite/ld-plugin/pr22983.1.d | 6 ++++++ ld/testsuite/ld-plugin/pr22983.2.d | 6 ++++++ ld/testsuite/ld-plugin/pr22983.3.d | 6 ++++++ ld/testsuite/ld-plugin/pr22983.4.d | 5 +++++ 6 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 ld/testsuite/ld-plugin/pr22983.1.d create mode 100644 ld/testsuite/ld-plugin/pr22983.2.d create mode 100644 ld/testsuite/ld-plugin/pr22983.3.d create mode 100644 ld/testsuite/ld-plugin/pr22983.4.d diff --git a/ld/ChangeLog b/ld/ChangeLog index d8e6a3f4a28..25522c124b6 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,13 @@ 2018-06-12 Nick Clifton + PR 22983 + * testsuite/ld-plugin/lto.exp: Use individual tests to check for + the presence of each expected symbol. + * testsuite/ld-plugin/pr22983.1.d: New file. + * testsuite/ld-plugin/pr22983.2.d: New file. + * testsuite/ld-plugin/pr22983.3.d: New file. + * testsuite/ld-plugin/pr22983.4.d: New file. + * emulparams/aarch64elf.sh (OTHER_BSS_END_SYMBOLS): Make the definition of the __bss_end__ symbol conditional upon CREATE_SHLIB. diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp index c0b7b1c764f..70274b37122 100644 --- a/ld/testsuite/ld-plugin/lto.exp +++ b/ld/testsuite/ld-plugin/lto.exp @@ -572,13 +572,29 @@ run_ld_link_exec_tests $lto_run_tests if { [is_elf_format] } { run_ld_link_exec_tests $lto_run_elf_tests + + # Note - it is not guaranteed that the ordering of symbols in the dynamic + # symbol table will match the ordering of the symbols specified by the + # --dynamic-list command line option. + # + # For PR22983 we want to make sure that all four symbols specified in + # pr222983.t are present in the output, but a simple sequences of regexps + # will not work as we do not know the order of the symbols. (Readelf + # does not have a symbol sorting option and the run_cc_list_tests proc + # does not allow for the output of the dump program to piped into `sort`). + # + # So instead we run readelf four times, each time checking for the + # presence of a specific symbol from the pr22983.t file. run_cc_link_tests [list \ [list \ "Build pr22983" \ "-Wl,--dynamic-list,pr22983.t" \ "-flto" \ - {pr22983a.c pr22983b.c} \ - {{readelf {--dyn-syms --wide} pr22983.d}} \ + {pr22983a.c pr22983b.c} \ + {{readelf {--dyn-syms --wide} pr22983.1.d} \ + {readelf {--dyn-syms --wide} pr22983.2.d} \ + {readelf {--dyn-syms --wide} pr22983.3.d} \ + {readelf {--dyn-syms --wide} pr22983.4.d}} \ "pr22983" \ ] \ ] diff --git a/ld/testsuite/ld-plugin/pr22983.1.d b/ld/testsuite/ld-plugin/pr22983.1.d new file mode 100644 index 00000000000..1ab19f81453 --- /dev/null +++ b/ld/testsuite/ld-plugin/pr22983.1.d @@ -0,0 +1,6 @@ +Symbol table '\.dynsym' contains [0-9]+ entries: + +Num: +Value +Size Type +Bind +Vis +Ndx Name +#... + +[0-9]+: +[0-9a-f]+ +[0-9a-f]+ +OBJECT +GLOBAL +DEFAULT +[0-9]+ +_?var_attr_used_enabled +#pass + diff --git a/ld/testsuite/ld-plugin/pr22983.2.d b/ld/testsuite/ld-plugin/pr22983.2.d new file mode 100644 index 00000000000..0f1e6c88e6f --- /dev/null +++ b/ld/testsuite/ld-plugin/pr22983.2.d @@ -0,0 +1,6 @@ +Symbol table '\.dynsym' contains [0-9]+ entries: + +Num: +Value +Size Type +Bind +Vis +Ndx Name +#... + +[0-9]+: +[0-9a-f]+ +[0-9a-f]+ +OBJECT +GLOBAL +DEFAULT +[0-9]+ +_?var_attr_used_disabled +#pass + diff --git a/ld/testsuite/ld-plugin/pr22983.3.d b/ld/testsuite/ld-plugin/pr22983.3.d new file mode 100644 index 00000000000..1bb4f2a4f21 --- /dev/null +++ b/ld/testsuite/ld-plugin/pr22983.3.d @@ -0,0 +1,6 @@ +Symbol table '\.dynsym' contains [0-9]+ entries: + +Num: +Value +Size Type +Bind +Vis +Ndx Name +#... + +[0-9]+: +[0-9a-f]+ +[0-9a-f]+ +FUNC +GLOBAL +DEFAULT +[0-9]+ +_?func_attr_used_enabled +#pass + diff --git a/ld/testsuite/ld-plugin/pr22983.4.d b/ld/testsuite/ld-plugin/pr22983.4.d new file mode 100644 index 00000000000..655f824db77 --- /dev/null +++ b/ld/testsuite/ld-plugin/pr22983.4.d @@ -0,0 +1,5 @@ +Symbol table '\.dynsym' contains [0-9]+ entries: + +Num: +Value +Size Type +Bind +Vis +Ndx Name +#... + +[0-9]+: +[0-9a-f]+ +[0-9a-f]+ +FUNC +GLOBAL +DEFAULT +[0-9]+ +_?func_attr_used_disabled +#pass -- 2.30.2