linux arm regtest: update memcheck partiallydefinedeq

On my rpi 5 this only gives 2 errors, like s390.
Haven't dug into the asm.

diff --git a/memcheck/tests/partiallydefinedeq.c b/memcheck/tests/partiallydefinedeq.c
index 79fd69854b5ef99435cc6441f21ad98a3cc57f2e..8974f6431f0a2ba6ec5d53fce10c900f405b14e8 100644 (file)
--- a/memcheck/tests/partiallydefinedeq.c
+++ b/memcheck/tests/partiallydefinedeq.c
@@ -64,16 +64,18 @@ int main ( void )
 // and so never appears as a literal, and so the instrumenter
 // never spots it and so doesn't use the expensive scheme (for foo).
 // Hence also on ARM we get 3 errors, not 2.
+// PJF 2024 this no longer seems to be the case.
+//
 //
 // s390x is even more complicated: Depending on the architecture
 // level we have the 0x80808080 either in the literal pool (3 errors)
 // or with the extended immediate facility in an instruction (2 errors).
 static __attribute__((noinline)) void bar ( void )
 {
-#if defined(__powerpc__) || defined(__powerpc64__) || defined(__arm__)
-  fprintf(stderr, "Currently running on ppc32/64/arm: this test should give 3 errors, not 2.\n");
+#if defined(__powerpc__) || defined(__powerpc64__)
+  fprintf(stderr, "Currently running on ppc32/64: this test should give 3 errors, not 2.\n");
 #endif
-#if defined(__s390__)
-  fprintf(stderr, "On s390 we might see 2 or 3 errors.\n");
+#if defined(__s390__) || defined(__arm__)
+  fprintf(stderr, "On s390/arm we might see 2 or 3 errors.\n");
 #endif
 }

diff --git a/memcheck/tests/partiallydefinedeq.stderr.exp2 b/memcheck/tests/partiallydefinedeq.stderr.exp2
index 8a331fe61f2f46a1afb3b5920afc6ecc493b57b7..dbee8affbd1350a889e77fe8fb63a7c0bbf32a42 100644 (file)
--- a/memcheck/tests/partiallydefinedeq.stderr.exp2
+++ b/memcheck/tests/partiallydefinedeq.stderr.exp2
@@ -1,5 +1,5 @@
 
-Currently running on ppc32/64/arm: this test should give 3 errors, not 2.
+Currently running on ppc32/64: this test should give 3 errors, not 2.
 Conditional jump or move depends on uninitialised value(s)
    at 0x........: foo (partiallydefinedeq.c:15)
    by 0x........: main (partiallydefinedeq.c:37)

diff --git a/memcheck/tests/partiallydefinedeq.stderr.exp3 b/memcheck/tests/partiallydefinedeq.stderr.exp3
index e467626fe77e97628c941007da014ad99bf2c56f..dc56cd5041b2338c312755bb013585ada4a575bb 100644 (file)
--- a/memcheck/tests/partiallydefinedeq.stderr.exp3
+++ b/memcheck/tests/partiallydefinedeq.stderr.exp3
@@ -1,5 +1,5 @@
 
-On s390 we might see 2 or 3 errors.
+On s390/arm we might see 2 or 3 errors.
 Conditional jump or move depends on uninitialised value(s)
    at 0x........: foo (partiallydefinedeq.c:15)
    by 0x........: main (partiallydefinedeq.c:37)

diff --git a/memcheck/tests/partiallydefinedeq.stderr.exp4 b/memcheck/tests/partiallydefinedeq.stderr.exp4
index c980ded550a38343271faedb3430f22477879001..9fd53d6685c991503b1d4d37858cca9032f43f90 100644 (file)
--- a/memcheck/tests/partiallydefinedeq.stderr.exp4
+++ b/memcheck/tests/partiallydefinedeq.stderr.exp4
@@ -1,5 +1,5 @@
 
-On s390 we might see 2 or 3 errors.
+On s390/arm we might see 2 or 3 errors.
 Conditional jump or move depends on uninitialised value(s)
    at 0x........: foo (partiallydefinedeq.c:15)
    by 0x........: main (partiallydefinedeq.c:37)