[PATCH] Powerpc fix for gdb.base/eh_return.exp

[Carl Love <cel@us.ibm.com>]

GDB maintainers:

The following patch fixes the one testfailure in gdb.base/eh_return.exp
on Powerpc.  Basically, the output format of the disassembly for
Powerpc is a little different requiring an additional test for Powerpc
in the gdb_test_multiple statement.

The patch has been tested on a Power 10 platform and on an Intel 64-bit 
system.  No test regressions were found.

Please let me know if this patch is acceptable for gdb mainline. 
Thanks.

                Carl Love


-----------------------------------------------
Powerpc fix for gdb.base/eh_return.exp

The expect file does a disassembly of function eh2 to get the address of
the last instruction of function eh2.  The last instruction on Powerpc is
followed by three .long entries.  This requires a different pattern
matching for Intel and Power.

This patch adds the needed gdb_test_multiple match statement for the
Powerpc disassembly code.

This patch fixes the one test failure on Powerpc.
---
 gdb/testsuite/gdb.base/eh_return.exp | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gdb/testsuite/gdb.base/eh_return.exp b/gdb/testsuite/gdb.base/eh_return.exp
index df55dbc72da..041df5f2c84 100644
--- a/gdb/testsuite/gdb.base/eh_return.exp
+++ b/gdb/testsuite/gdb.base/eh_return.exp
@@ -26,7 +26,35 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
 set address -1
 
 # Get the address of the last insn in function eh2.
+# The dissassebmly on Powerpc looks like:
+#   Dump of assembler code for function eh2:
+#   0x00000000100009e0 <+0>:     lis     r2,4098
+#   ...
+#   0x0000000010000b04 <+292>:   add     r1,r1,r10
+#   0x0000000010000b08 <+296>:   blr
+#   0x0000000010000b0c <+300>:   .long 0x0
+#   0x0000000010000b10 <+304>:   .long 0x1000000
+#   0x0000000010000b14 <+308>:   .long 0x1000180
+#   End of assembler dump.
+#
+#  Powerpc needs the address for the blr instruction above
+#
+# The dissassembly on Intel looks like:
+#   Dump of assembler code for function eh2:
+#   0x00000000004012cf <+0>:     endbr64
+#   0x00000000004012d3 <+4>:     push   %rbp
+#   ...
+#   0x000000000040134d <+126>:   pop    %rcx
+#   0x000000000040134e <+127>:   jmp    *%rcx
+#   End of assembler dump.
+#
+# Intel needs the address of the last jmp instruction
+
 gdb_test_multiple "disassemble eh2" "" {
+    -re "($hex)\[^\r\n\]*blr.*" {
+	set address $expect_out(1,string)
+	pass $gdb_test_name
+    }
     -re -wrap "($hex)\[^\r\n\]*\r\nEnd of assembler dump." {
 	set address $expect_out(1,string)
 	pass $gdb_test_name
-- 
2.32.0