From 31224d9db8c26f298f30796479309e8611fc43d5 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 11 Oct 2012 17:40:30 +0000 Subject: [PATCH] Check is_amd64_regs_target to to set nr_regs * gdb.arch/i386-avx.exp: Check is_amd64_regs_target instead of is_ilp32_target to set nr_regs. * gdb.arch/i386-sse.exp: Likewise. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.arch/i386-avx.exp | 6 +++--- gdb/testsuite/gdb.arch/i386-sse.exp | 6 +++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 4354197234e..93feac910c1 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2012-10-11 H.J. Lu + + * gdb.arch/i386-avx.exp: Check is_amd64_regs_target instead of + is_ilp32_target to set nr_regs. + * gdb.arch/i386-sse.exp: Likewise. + 2012-10-11 Doug Evans PR breakpoints/14643. diff --git a/gdb/testsuite/gdb.arch/i386-avx.exp b/gdb/testsuite/gdb.arch/i386-avx.exp index 52a6e4aa8f5..32ba5b658de 100644 --- a/gdb/testsuite/gdb.arch/i386-avx.exp +++ b/gdb/testsuite/gdb.arch/i386-avx.exp @@ -73,10 +73,10 @@ gdb_test "break [gdb_get_line_number "first breakpoint here"]" \ "set first breakpoint in main" gdb_continue_to_breakpoint "continue to first breakpoint in main" -if [is_ilp32_target] { - set nr_regs 8 -} else { +if [is_amd64_regs_target] { set nr_regs 16 +} else { + set nr_regs 8 } for { set r 0 } { $r < $nr_regs } { incr r } { diff --git a/gdb/testsuite/gdb.arch/i386-sse.exp b/gdb/testsuite/gdb.arch/i386-sse.exp index 896faf35427..4132e0c0bad 100644 --- a/gdb/testsuite/gdb.arch/i386-sse.exp +++ b/gdb/testsuite/gdb.arch/i386-sse.exp @@ -73,10 +73,10 @@ gdb_test "break [gdb_get_line_number "first breakpoint here"]" \ "set first breakpoint in main" gdb_continue_to_breakpoint "continue to first breakpoint in main" -if [is_ilp32_target] { - set nr_regs 8 -} else { +if [is_amd64_regs_target] { set nr_regs 16 +} else { + set nr_regs 8 } for { set r 0 } { $r < $nr_regs } { incr r } { -- 2.30.2