[binutils-gdb] PowerPC, fix test gdb.arch/altivec-regs.exp

[binutils-gdb] PowerPC, fix test gdb.arch/altivec-regs.exp

[Carl Love]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=5992fb8541f1c108681468bb48640f0c7dec1709

commit 5992fb8541f1c108681468bb48640f0c7dec1709
Author: Carl Love <cel@us.ibm.com>
Date:   Tue Mar 7 13:34:44 2023 -0600

    PowerPC, fix test gdb.arch/altivec-regs.exp
    
    The test fails on Power 10 with the RHEL9 distro.  It also fails on
    Power 9.
    
    The test set a the breakpoint in main that stops at line:
    a = 9; /* start here */.  The test then sets a break point at the same
    line where it wants to start the test and does a continue.  GDB does not
    stop again on the same line where it is stopped, but rather continues to
    the end of the program.
    
    Initialize variable A to zero so the break on main will stop before setting
    a break point on line a = 9; /* start here */.
    
    Make the match on the breakpoint number generic.
    
    Patch has been tested on Power 10 with RHEL 9, Power 10 with Ubuntu 22.04,
    and Power 9 with Fedora 36 with no regression failures.

Diff:
---
 gdb/testsuite/gdb.arch/altivec-regs.c   | 2 +-
 gdb/testsuite/gdb.arch/altivec-regs.exp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gdb/testsuite/gdb.arch/altivec-regs.c b/gdb/testsuite/gdb.arch/altivec-regs.c
index 1411f15e358..a838b28b9b5 100644
--- a/gdb/testsuite/gdb.arch/altivec-regs.c
+++ b/gdb/testsuite/gdb.arch/altivec-regs.c
@@ -18,7 +18,7 @@ main ()
   vector unsigned int y; 
   vector unsigned int x; 
   vector unsigned int z; 
-  int a;
+  int a = 0;
 
   #ifdef _AIX
   /* On AIX, the debugger cannot access vector registers before they
diff --git a/gdb/testsuite/gdb.arch/altivec-regs.exp b/gdb/testsuite/gdb.arch/altivec-regs.exp
index b771a4df76f..ece207be48e 100644
--- a/gdb/testsuite/gdb.arch/altivec-regs.exp
+++ b/gdb/testsuite/gdb.arch/altivec-regs.exp
@@ -122,7 +122,7 @@ send_gdb "info vector\n"
 gdb_expect_list "info vector" ".*$gdb_prompt $" $pattern_list
 
 gdb_test "break vector_fun" \
- "Breakpoint 2 at.*altivec-regs.c, line \[0-9\]+\\." \
+ "Breakpoint $decimal at.*altivec-regs.c, line \[0-9\]+\\." \
  "set breakpoint at vector_fun"
 
 # Actually it is nuch easier to see these results printed in hex.
@@ -131,7 +131,7 @@ gdb_test "set output-radix 16" \
   "set output radix to hex"
 
 gdb_test "continue" \
-  "Breakpoint 2, vector_fun .a=.0xfefefefe, 0xfefefefe, 0xfefefefe, 0xfefefefe., b=.0x1010101, 0x1010101, 0x1010101, 0x1010101.*altivec-regs.c.*vec_splat_u8.2..;" \
+  "Breakpoint $decimal, vector_fun .a=.0xfefefefe, 0xfefefefe, 0xfefefefe, 0xfefefefe., b=.0x1010101, 0x1010101, 0x1010101, 0x1010101.*altivec-regs.c.*vec_splat_u8.2..;" \
   "continue to vector_fun"
 
 # Do a next over the assignment to vector 'a'.