diff options
author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2011-08-26 09:20:44 +0000 |
---|---|---|
committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2011-08-26 09:20:44 +0000 |
commit | bdb5404946bc009d72a4e3d3c1ed4c00b8215d89 (patch) | |
tree | cfc69f33cf24dfffa953bbcfad8352fcea8757a0 | |
parent | a0dc6b134cacd7d77cd9a9e7aef2206ba1eb5b96 (diff) | |
download | gdb-bdb5404946bc009d72a4e3d3c1ed4c00b8215d89.zip gdb-bdb5404946bc009d72a4e3d3c1ed4c00b8215d89.tar.gz gdb-bdb5404946bc009d72a4e3d3c1ed4c00b8215d89.tar.bz2 |
gdb/testsuite/
* gdb.trace/backtrace.exp: Use is_lp64_target to check 64bit target.
* gdb.trace/collection.exp: Likewise.
* gdb.trace/report.exp: Likewise.
* gdb.trace/unavailable.exp: Likewise.
* gdb.trace/while-dyn.exp: Likewise.
-rw-r--r-- | gdb/testsuite/ChangeLog | 8 | ||||
-rw-r--r-- | gdb/testsuite/gdb.trace/backtrace.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.trace/collection.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.trace/report.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.trace/unavailable.exp | 8 | ||||
-rw-r--r-- | gdb/testsuite/gdb.trace/while-dyn.exp | 4 |
6 files changed, 20 insertions, 12 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 13e4958..bb152a8 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2011-08-26 Jan Kratochvil <jan.kratochvil@redhat.com> + + * gdb.trace/backtrace.exp: Use is_lp64_target to check 64bit target. + * gdb.trace/collection.exp: Likewise. + * gdb.trace/report.exp: Likewise. + * gdb.trace/unavailable.exp: Likewise. + * gdb.trace/while-dyn.exp: Likewise. + 2011-08-18 Keith Seitz <keiths@redhat.com> PR c++/12266 diff --git a/gdb/testsuite/gdb.trace/backtrace.exp b/gdb/testsuite/gdb.trace/backtrace.exp index 17b9759..9b72d49 100644 --- a/gdb/testsuite/gdb.trace/backtrace.exp +++ b/gdb/testsuite/gdb.trace/backtrace.exp @@ -150,10 +150,10 @@ gdb_trace_setactions "8.6: setup TP to collect regs, args, and locals" \ "$tdp4" \ "collect \$regs, \$args, \$locs" "^$" -if [istarget "x86_64-*"] then { +if {([istarget "x86_64-*"] || [istarget "i?86-*"]) && [is_lp64_target]} then { set fpreg "\$rbp" set spreg "\$rsp" -} elseif [istarget "i?86-*"] then { +} elseif {[istarget "x86_64-*"] || [istarget "i?86-*"]} then { set fpreg "\$ebp" set spreg "\$esp" } else { diff --git a/gdb/testsuite/gdb.trace/collection.exp b/gdb/testsuite/gdb.trace/collection.exp index c6f7fd1..4917ea8 100644 --- a/gdb/testsuite/gdb.trace/collection.exp +++ b/gdb/testsuite/gdb.trace/collection.exp @@ -45,11 +45,11 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ set ws "\[\r\n\t \]+" set cr "\[\r\n\]+" -if [istarget "x86_64-*"] then { +if {([istarget "x86_64-*"] || [istarget "i?86-*"]) && [is_lp64_target]} then { set fpreg "rbp" set spreg "rsp" set pcreg "rip" -} elseif [istarget "i?86-*"] then { +} elseif {[istarget "x86_64-*"] || [istarget "i?86-*"]} then { set fpreg "ebp" set spreg "esp" set pcreg "eip" diff --git a/gdb/testsuite/gdb.trace/report.exp b/gdb/testsuite/gdb.trace/report.exp index 7e929ff..8bb6780 100644 --- a/gdb/testsuite/gdb.trace/report.exp +++ b/gdb/testsuite/gdb.trace/report.exp @@ -159,11 +159,11 @@ gdb_trace_setactions "9.x: setup TP to collect locals" \ "$tdp4" \ "collect \$locs" "^$" -if [istarget "x86_64-*"] then { +if {([istarget "x86_64-*"] || [istarget "i?86-*"]) && [is_lp64_target]} then { set fpreg "rbp" set spreg "rsp" set pcreg "rip" -} elseif [istarget "i?86-*"] then { +} elseif {[istarget "x86_64-*"] || [istarget "i?86-*"]} then { set fpreg "ebp" set spreg "esp" set pcreg "eip" diff --git a/gdb/testsuite/gdb.trace/unavailable.exp b/gdb/testsuite/gdb.trace/unavailable.exp index d10263f..fce65ca 100644 --- a/gdb/testsuite/gdb.trace/unavailable.exp +++ b/gdb/testsuite/gdb.trace/unavailable.exp @@ -30,11 +30,11 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ set ws "\[\r\n\t \]+" set cr "\[\r\n\]+" -if [istarget "x86_64-*"] then { +if {([istarget "x86_64-*"] || [istarget "i?86-*"]) && [is_lp64_target]} then { set fpreg "rbp" set spreg "rsp" set pcreg "rip" -} elseif [istarget "i?86-*"] then { +} elseif {[istarget "x86_64-*"] || [istarget "i?86-*"]} then { set fpreg "ebp" set spreg "esp" set pcreg "eip" @@ -295,12 +295,12 @@ proc gdb_unavailable_registers_test { } { # Test reading uncollected pseudo-registers. The set of which # depends on target. - if [istarget "x86_64-*"] then { + if {$pcreg == "rip"} then { # Check the raw register first. test_register_unavailable "\$rax" test_register_unavailable "\$eax" test_register_unavailable "\$ax" - } elseif [istarget "i?86-*"] then { + } elseif {$pcreg == "eip"} then { # Check the raw register first. test_register_unavailable "\$eax" test_register_unavailable "\$ax" diff --git a/gdb/testsuite/gdb.trace/while-dyn.exp b/gdb/testsuite/gdb.trace/while-dyn.exp index 1a88b61..6227f23 100644 --- a/gdb/testsuite/gdb.trace/while-dyn.exp +++ b/gdb/testsuite/gdb.trace/while-dyn.exp @@ -52,9 +52,9 @@ if { ![gdb_target_supports_trace] } then { # test while-stepping dynamically (live target) # -if [istarget "x86_64-*"] then { +if {([istarget "x86_64-*"] || [istarget "i?86-*"]) && [is_lp64_target]} then { set fpreg "\$rbp" -} elseif [istarget "i?86-*"] then { +} elseif {[istarget "x86_64-*"] || [istarget "i?86-*"]} then { set fpreg "\$ebp" } else { set fpreg "\$fp" |