s390: also fix the memcheck testcase for cdsg regarding alignment

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12622

diff --git a/memcheck/tests/s390x/cdsg.c b/memcheck/tests/s390x/cdsg.c
index 00ae2a5d16229909d684656f09b67e6491f38fa2..00d352f9545a5b05ca9a5d6603eb6d04e5477821 100644 (file)
--- a/memcheck/tests/s390x/cdsg.c
+++ b/memcheck/tests/s390x/cdsg.c
@@ -4,15 +4,19 @@
 typedef struct {
    uint64_t high;
    uint64_t low;
-} quad_word;
+} __attribute__((aligned(16))) quad_word;
 
-void 
+
+/* CDSG needs quad-word alignment */
+quad_word op1, op2, op3;
+
+void
 test(quad_word op1_init, quad_word op2_init, quad_word op3_init)
 {
    int cc; // unused
-   quad_word op1 = op1_init;
-   quad_word op2 = op2_init;
-   quad_word op3 = op3_init;
+   op1 = op1_init;
+   op2 = op2_init;
+   op3 = op3_init;
 
    __asm__ volatile (
                      "lmg     %%r0,%%r1,%1\n\t"

diff --git a/memcheck/tests/s390x/cdsg.stderr.exp b/memcheck/tests/s390x/cdsg.stderr.exp
index 2ee711ba6249177482e96852061d9b42f2c36b2d..3c71e21cadd211d5daa341b71fadd0529581b5a9 100644 (file)
--- a/memcheck/tests/s390x/cdsg.stderr.exp
+++ b/memcheck/tests/s390x/cdsg.stderr.exp
@@ -1,10 +1,10 @@
 Conditional jump or move depends on uninitialised value(s)
-   at 0x........: test (cdsg.c:17)
-   by 0x........: op1_undefined (cdsg.c:35)
-   by 0x........: main (cdsg.c:60)
+   at 0x........: test (cdsg.c:21)
+   by 0x........: op1_undefined (cdsg.c:39)
+   by 0x........: main (cdsg.c:64)
 
 Conditional jump or move depends on uninitialised value(s)
-   at 0x........: test (cdsg.c:17)
-   by 0x........: op2_undefined (cdsg.c:45)
-   by 0x........: main (cdsg.c:61)
+   at 0x........: test (cdsg.c:21)
+   by 0x........: op2_undefined (cdsg.c:49)
+   by 0x........: main (cdsg.c:65)