From bd52f6f48c614498c6cf53d976538059d5ac1bf5 Mon Sep 17 00:00:00 2001
From: Tom de Vries <tdevries@suse.de>
Date: Sat, 7 Jun 2025 13:59:52 +0200
Subject: [PATCH] [gdb/testsuite] Fix gdb.ada/dyn-bit-offset.exp on s390x

On s390x-linux, with test-case gdb.ada/dyn-bit-offset.exp and gcc 7.5.0 I get:
...
(gdb) print spr^M
$1 = (discr => 3, array_field => (-5, -6, -7), field => -6, another_field => -6)^M
(gdb) FAIL: $exp: print spr
print spr.field^M
$2 = -6^M
(gdb) FAIL: $exp: print spr.field
...

On x86_64-linux, with the same compiler version I get:
...
(gdb) print spr^M
$1 = (discr => 3, array_field => (-5, -6, -7), field => -4, another_field => -4)^M
(gdb) XFAIL: $exp: print spr
print spr.field^M
$2 = -4^M
(gdb) PASS: $exp: print spr.field
...

In both cases, we're hitting the same compiler problem, but it manifests
differently on little and big endian.

Make sure the values seen for both little and big endian trigger xfails
for both tests.

Printing spr.field gives the expected value -4 for x86_64, but that's an
accident.  Change the actual spr.field value to -5, to make sure
that we get the same number of xfails on x86_64 and s390x.

Finally, make the xfails conditional on the compiler version.

Tested using gcc 7.5.0 on both x86_64-linux and s390x-linux.

Approved-By: Andrew Burgess <aburgess@redhat.com>

PR testsuite/33042
https://sourceware.org/bugzilla/show_bug.cgi?id=33042
---
 gdb/testsuite/gdb.ada/dyn-bit-offset.exp      | 43 ++++++++++++++++---
 gdb/testsuite/gdb.ada/dyn-bit-offset/exam.adb |  2 +-
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/gdb/testsuite/gdb.ada/dyn-bit-offset.exp b/gdb/testsuite/gdb.ada/dyn-bit-offset.exp
index 19d16b17f49..f8a43637668 100644
--- a/gdb/testsuite/gdb.ada/dyn-bit-offset.exp
+++ b/gdb/testsuite/gdb.ada/dyn-bit-offset.exp
@@ -28,19 +28,52 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable $flags] != ""} {
     return -1
 }
 
+# GCC needs to have fixes:
+# - 809b46d2ccc ("Partially lift restriction from loc_list_from_tree_1")
+# - d7f24e37d4b ("Fix oversight about big-endian targets in latest change")
+set have_xfail [gnat_version_compare <= {16 1}]
+
 clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/exam.adb]
 runto "exam.adb:$bp_location"
 
+set re_pass \
+    [string_to_regexp \
+	 " = (discr => 3, array_field => (-5, -6, -7), field => -5, another_field => -6)"]
+set re_xfail_le \
+    [string_to_regexp \
+	 " = (discr => 3, array_field => (-5, -6, -7), field => -4, another_field => -4)"]
+set re_xfail_be \
+    [string_to_regexp \
+	 " = (discr => 3, array_field => (-5, -6, -7), field => -6, another_field => -6)"]
+
 gdb_test_multiple "print spr" "" {
-    -re -wrap " = \\(discr => 3, array_field => \\(-5, -6, -7\\), field => -4, another_field => -6\\)" {
+    -re -wrap $re_pass {
 	pass $gdb_test_name
     }
-    -re -wrap " = \\(discr => 3, array_field => \\(-5, -6, -7\\), field => -4, another_field => -4\\)" {
-	# A known GCC bug.
-	xfail $gdb_test_name
+    -re -wrap $re_xfail_le|$re_xfail_be {
+	if { $have_xfail } {
+	    xfail $gdb_test_name
+	} else {
+	    fail $gdb_test_name
+	}
     }
 }
 
-gdb_test "print spr.field" " = -4"
+set re_pass " = -5"
+set re_xfail_le " = -4"
+set re_xfail_be " = -6"
+
+gdb_test_multiple "print spr.field" "" {
+    -re -wrap $re_pass {
+	pass $gdb_test_name
+    }
+    -re -wrap $re_xfail_le|$re_xfail_be {
+	if { $have_xfail } {
+	    xfail $gdb_test_name
+	} else {
+	    fail $gdb_test_name
+	}
+    }
+}
diff --git a/gdb/testsuite/gdb.ada/dyn-bit-offset/exam.adb b/gdb/testsuite/gdb.ada/dyn-bit-offset/exam.adb
index a882afd1944..5c7f70b6f34 100644
--- a/gdb/testsuite/gdb.ada/dyn-bit-offset/exam.adb
+++ b/gdb/testsuite/gdb.ada/dyn-bit-offset/exam.adb
@@ -36,7 +36,7 @@ procedure Exam is
    pragma No_Component_Reordering (Some_Packed_Record);
 
    SPR : Some_Packed_Record := (Discr => 3,
-                                Field => -4,
+                                Field => -5,
                                 Another_Field => -6,
                                 Array_Field => (-5, -6, -7));
 
-- 
2.39.5