From bdb5404946bc009d72a4e3d3c1ed4c00b8215d89 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Fri, 26 Aug 2011 09:20:44 +0000 Subject: [PATCH] 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. --- gdb/testsuite/ChangeLog | 8 ++++++++ gdb/testsuite/gdb.trace/backtrace.exp | 4 ++-- gdb/testsuite/gdb.trace/collection.exp | 4 ++-- gdb/testsuite/gdb.trace/report.exp | 4 ++-- gdb/testsuite/gdb.trace/unavailable.exp | 8 ++++---- 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 13e4958841e..bb152a850f0 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2011-08-26 Jan Kratochvil + + * 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 PR c++/12266 diff --git a/gdb/testsuite/gdb.trace/backtrace.exp b/gdb/testsuite/gdb.trace/backtrace.exp index 17b97590188..9b72d491e52 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 c6f7fd1e6f8..4917ea847da 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 7e929fff46f..8bb678095c6 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 d10263f73da..fce65cacb35 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 1a88b61d4b3..6227f23d9da 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" -- 2.30.2