diff options
author | Tom de Vries <tdevries@suse.de> | 2020-07-13 14:14:47 +0200 |
---|---|---|
committer | Tom de Vries <tdevries@suse.de> | 2020-07-13 14:14:47 +0200 |
commit | 963eeee42ab212c2512b829143986fd3bb2fd93b (patch) | |
tree | 981f5c54298474c14961cc30a3564274a8d4fd91 /gdb | |
parent | cf88be6855e5bb3d43e1fd78f28aeb2ec5fc11a1 (diff) | |
download | binutils-gdb-963eeee42ab212c2512b829143986fd3bb2fd93b.tar.gz |
[gdb/testsuite] Handle missing gold linker in gdb.base/morestack.exp
When running test-case gdb.base/morestack.exp without the gold linker
installed, we run into:
...
Running src/gdb/testsuite/gdb.base/morestack.exp ...
gdb compile failed, collect2: fatal error: cannot find 'ld'
compilation terminated.
FAIL: gdb.base/morestack.exp: continue
=== gdb Summary ===
nr of expected passes 1
nr of unexpected failures 1
nr of untested testcases 1
...
The test-case needs the gold linker to run correctly (as explained in commit
b8d38ee425 "testsuite: Fix false FAIL for gdb.base/morestack.exp"), but
only prefers it, and doesn't require it.
Fix this by requiring the gold linker in the test-case. Furthermore, silence
the compilation error by introducing a caching proc have_fuse_ld_gold and
using it in this and other test-cases that use -fuse-ld=gold.
Tested on x86_64-linux.
gdb/testsuite/ChangeLog:
2020-07-13 Tom de Vries <tdevries@suse.de>
* lib/gdb.exp (have_fuse_ld_gold): New caching proc.
* gdb.base/gcore-tls-pie.exp: Use have_fuse_ld_gold.
* gdb.base/gold-gdb-index.exp: Same.
* gdb.base/morestack.exp: Same.
Diffstat (limited to 'gdb')
-rw-r--r-- | gdb/testsuite/ChangeLog | 7 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/gcore-tls-pie.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/gold-gdb-index.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/morestack.exp | 8 | ||||
-rw-r--r-- | gdb/testsuite/lib/gdb.exp | 8 |
5 files changed, 29 insertions, 2 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index ec0f8322e32..91a666ac3be 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2020-07-13 Tom de Vries <tdevries@suse.de> + + * lib/gdb.exp (have_fuse_ld_gold): New caching proc. + * gdb.base/gcore-tls-pie.exp: Use have_fuse_ld_gold. + * gdb.base/gold-gdb-index.exp: Same. + * gdb.base/morestack.exp: Same. + 2020-07-11 Daniel Xu <dxu@dxuuu.xyz> PR rust/26121 diff --git a/gdb/testsuite/gdb.base/gcore-tls-pie.exp b/gdb/testsuite/gdb.base/gcore-tls-pie.exp index 87399abfd8e..c9386c0620f 100644 --- a/gdb/testsuite/gdb.base/gcore-tls-pie.exp +++ b/gdb/testsuite/gdb.base/gcore-tls-pie.exp @@ -19,6 +19,10 @@ standard_testfile +if { [have_fuse_ld_gold] == 0} { + return -1 +} + if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug additional_flags=-fpie "ldflags=-pie -fuse-ld=gold"}]} { return -1 } diff --git a/gdb/testsuite/gdb.base/gold-gdb-index.exp b/gdb/testsuite/gdb.base/gold-gdb-index.exp index e42bf439dd5..22a733af398 100644 --- a/gdb/testsuite/gdb.base/gold-gdb-index.exp +++ b/gdb/testsuite/gdb.base/gold-gdb-index.exp @@ -17,6 +17,10 @@ standard_testfile .c gold-gdb-index-2.c +if { [have_fuse_ld_gold] == 0} { + return -1 +} + if {[prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2" \ {debug c++ additional_flags=-fuse-ld=gold \ additional_flags=-Wl,--gdb-index \ diff --git a/gdb/testsuite/gdb.base/morestack.exp b/gdb/testsuite/gdb.base/morestack.exp index 2ea826c4806..95ec9adc62b 100644 --- a/gdb/testsuite/gdb.base/morestack.exp +++ b/gdb/testsuite/gdb.base/morestack.exp @@ -21,13 +21,17 @@ if {$gcc_compiled == 0} { return -1 } +if { [have_fuse_ld_gold] == 0} { + return -1 +} + standard_testfile # -fuse-ld=gold is used for calling printf code built without -fsplit-stack # which could crash otherwise. See GCC documentation of -fsplit-stack. set opts "additional_flags=-fsplit-stack" -if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile [list $opts additional_flags=-fuse-ld=gold]] \ - && [prepare_for_testing "failed to prepare" ${testfile} $srcfile $opts] } { +if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile \ + [list $opts additional_flags=-fuse-ld=gold]] } { return -1 } diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index b0faf622a9e..78dae17b0c7 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -7456,5 +7456,13 @@ proc gdb_note { message } { verbose -- "NOTE: $message" 0 } +# Return 1 if compiler supports -fuse-ld=gold, otherwise return 0. +gdb_caching_proc have_fuse_ld_gold { + set me "have_fuse_ld_gold" + set flags "additional_flags=-fuse-ld=gold" + set src { int main() { return 0; } } + return [gdb_simple_compile $me $src executable $flags] +} + # Always load compatibility stuff. load_lib future.exp |