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.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 4354197234e6f1751f656d20e2747436cba53deb..93feac910c165c2804f9747f232f482e0d2b8067 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * 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  <dje@google.com>
 
        PR breakpoints/14643.

diff --git a/gdb/testsuite/gdb.arch/i386-avx.exp b/gdb/testsuite/gdb.arch/i386-avx.exp
index 52a6e4aa8f52966ff7050a4bc11c642c72f0e510..32ba5b658de9178462f6fd8454d354a668c1b551 100644 (file)
--- 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 896faf35427df67620ca98b1cd114000a7dedd27..4132e0c0badf59e04267fb4ec4d19d313c30e22d 100644 (file)
--- 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 } {