From 6c28e0746d6849cb7a7b2dc2b9ce4d97d603c3d9 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@fedoraproject.org>
Date: Dec 12 2018 23:22:02 +0000
Subject: Add valgrind-3.14.0-jm-vmx-constraints.patch


---

diff --git a/valgrind-3.14.0-jm-vmx-constraints.patch b/valgrind-3.14.0-jm-vmx-constraints.patch
new file mode 100644
index 0000000..8b3027f
--- /dev/null
+++ b/valgrind-3.14.0-jm-vmx-constraints.patch
@@ -0,0 +1,332 @@
+commit a0d97e88ec6d71239d30a5a4b2b129e094150873
+Author: Mark Wielaard <mark@klomp.org>
+Date:   Thu Dec 6 20:52:22 2018 +0100
+
+    Bug 401822 Fix asm constraints for ppc64 jm-vmx jm-insns.c test.
+    
+    The mfvscr and vor instructions in jm-insns.c had a "=vr" constraint.
+    This should have been an "=v" constraint. This resolved assembler
+    warnings and the testcase failing on ppc64le with gcc 8.2 and
+    binutils 2.30.
+
+diff --git a/none/tests/ppc32/jm-insns.c b/none/tests/ppc32/jm-insns.c
+index e1a7da9..be02425 100644
+--- a/none/tests/ppc32/jm-insns.c
++++ b/none/tests/ppc32/jm-insns.c
+@@ -6269,7 +6269,7 @@ static void test_av_int_one_arg (const char* name, test_func_t func,
+    for (i=0; i<nb_viargs; i++) {
+       /* Save flags */
+       __asm__ __volatile__ ("mfcr   %0" : "=r"  (tmpcr));
+-      __asm__ __volatile__ ("mfvscr %0" : "=vr" (tmpvscr));
++      __asm__ __volatile__ ("mfvscr %0" : "=v" (tmpvscr));
+ 
+       vec_in  = (vector unsigned int)viargs[i];
+       vec_out = (vector unsigned int){ 0,0,0,0 };
+@@ -6287,11 +6287,11 @@ static void test_av_int_one_arg (const char* name, test_func_t func,
+       (*func)();
+       
+       // retrieve output <- r17
+-      __asm__ __volatile__ ("vor %0,17,17" : "=vr" (vec_out));
++      __asm__ __volatile__ ("vor %0,17,17" : "=v" (vec_out));
+ 
+       // get CR,VSCR flags
+       __asm__ __volatile__ ("mfcr   %0" : "=r" (flags));
+-      __asm__ __volatile__ ("mfvscr %0" : "=vr" (vscr));
++      __asm__ __volatile__ ("mfvscr %0" : "=v" (vscr));
+       
+       /* Restore flags */
+       __asm__ __volatile__ ("mtcr   %0" : : "r"  (tmpcr));
+@@ -6333,7 +6333,7 @@ static void test_av_int_two_args (const char* name, test_func_t func,
+          
+          /* Save flags */
+          __asm__ __volatile__ ("mfcr   %0" : "=r"  (tmpcr));
+-         __asm__ __volatile__ ("mfvscr %0" : "=vr" (tmpvscr));
++         __asm__ __volatile__ ("mfvscr %0" : "=v" (tmpvscr));
+ 
+          // reset VSCR and CR
+          vscr = (vector unsigned int){ 0,0,0,DEFAULT_VSCR };
+@@ -6349,11 +6349,11 @@ static void test_av_int_two_args (const char* name, test_func_t func,
+          (*func)();
+ 
+          // retrieve output <- r17
+-         __asm__ __volatile__ ("vor %0,17,17" : "=vr" (vec_out));
++         __asm__ __volatile__ ("vor %0,17,17" : "=v" (vec_out));
+          
+          // get CR,VSCR flags
+          __asm__ __volatile__ ("mfcr   %0" : "=r" (flags));
+-         __asm__ __volatile__ ("mfvscr %0" : "=vr" (vscr));
++         __asm__ __volatile__ ("mfvscr %0" : "=v" (vscr));
+          
+          /* Restore flags */
+          __asm__ __volatile__ ("mtcr   %0" : : "r"  (tmpcr));
+@@ -6401,7 +6401,7 @@ static void test_av_int_three_args (const char* name, test_func_t func,
+             
+             /* Save flags */
+             __asm__ __volatile__ ("mfcr   %0" : "=r"  (tmpcr));
+-            __asm__ __volatile__ ("mfvscr %0" : "=vr" (tmpvscr));
++            __asm__ __volatile__ ("mfvscr %0" : "=v" (tmpvscr));
+ 
+             // reset VSCR and CR
+             vscr = (vector unsigned int){ 0,0,0,DEFAULT_VSCR };
+@@ -6418,11 +6418,11 @@ static void test_av_int_three_args (const char* name, test_func_t func,
+             (*func)();
+             
+             // retrieve output <- r17
+-            __asm__ __volatile__ ("vor %0,17,17" : "=vr" (vec_out));
++            __asm__ __volatile__ ("vor %0,17,17" : "=v" (vec_out));
+             
+             // get CR,VSCR flags
+             __asm__ __volatile__ ("mfcr   %0" : "=r" (flags));
+-            __asm__ __volatile__ ("mfvscr %0" : "=vr" (vscr));
++            __asm__ __volatile__ ("mfvscr %0" : "=v" (vscr));
+             
+             /* Restore flags */
+             __asm__ __volatile__ ("mtcr   %0" : : "r"  (tmpcr));
+@@ -6475,7 +6475,7 @@ static void vs128_cb (const char* name, test_func_t func,
+          
+          /* Save flags */
+          __asm__ __volatile__ ("mfcr   %0" : "=r"  (tmpcr));
+-         __asm__ __volatile__ ("mfvscr %0" : "=vr" (tmpvscr));
++         __asm__ __volatile__ ("mfvscr %0" : "=v" (tmpvscr));
+ 
+          // reset VSCR and CR
+          vscr = (vector unsigned int){ 0,0,0,DEFAULT_VSCR };
+@@ -6491,11 +6491,11 @@ static void vs128_cb (const char* name, test_func_t func,
+          (*func)();
+          
+          // retrieve output <- r17
+-         __asm__ __volatile__ ("vor %0,17,17" : "=vr" (vec_out));
++         __asm__ __volatile__ ("vor %0,17,17" : "=v" (vec_out));
+          
+          // get CR,VSCR flags
+          __asm__ __volatile__ ("mfcr   %0" : "=r" (flags));
+-         __asm__ __volatile__ ("mfvscr %0" : "=vr" (vscr));
++         __asm__ __volatile__ ("mfvscr %0" : "=v" (vscr));
+          
+          /* Restore flags */
+          __asm__ __volatile__ ("mtcr   %0" : : "r"  (tmpcr));
+@@ -6548,7 +6548,7 @@ static void vsplt_cb (const char* name, test_func_t func_IN,
+ 
+          /* Save flags */
+          __asm__ __volatile__ ("mfcr   %0" : "=r"  (tmpcr));
+-         __asm__ __volatile__ ("mfvscr %0" : "=vr" (tmpvscr));
++         __asm__ __volatile__ ("mfvscr %0" : "=v" (tmpvscr));
+ 
+          // reset VSCR and CR
+          vscr = (vector unsigned int){ 0,0,0,DEFAULT_VSCR };
+@@ -6563,11 +6563,11 @@ static void vsplt_cb (const char* name, test_func_t func_IN,
+          (*func)();
+          
+          // retrieve output <- r17
+-         __asm__ __volatile__ ("vor %0,17,17" : "=vr" (vec_out));
++         __asm__ __volatile__ ("vor %0,17,17" : "=v" (vec_out));
+          
+          // get CR,VSCR flags
+          __asm__ __volatile__ ("mfcr   %0" : "=r" (flags));
+-         __asm__ __volatile__ ("mfvscr %0" : "=vr" (vscr));
++         __asm__ __volatile__ ("mfvscr %0" : "=v" (vscr));
+          
+          /* Restore flags */
+          __asm__ __volatile__ ("mtcr   %0" : : "r"  (tmpcr));
+@@ -6615,7 +6615,7 @@ static void vspltis_cb (const char* name, test_func_t func_IN,
+       
+       /* Save flags */
+       __asm__ __volatile__ ("mfcr   %0" : "=r"  (tmpcr));
+-      __asm__ __volatile__ ("mfvscr %0" : "=vr" (tmpvscr));
++      __asm__ __volatile__ ("mfvscr %0" : "=v" (tmpvscr));
+       
+       // reset VSCR and CR
+       vscr = (vector unsigned int){ 0,0,0,DEFAULT_VSCR };
+@@ -6627,11 +6627,11 @@ static void vspltis_cb (const char* name, test_func_t func_IN,
+       (*func)();
+       
+       // retrieve output <- r17
+-      __asm__ __volatile__ ("vor %0,17,17" : "=vr" (vec_out));
++      __asm__ __volatile__ ("vor %0,17,17" : "=v" (vec_out));
+       
+       // get CR,VSCR flags
+       __asm__ __volatile__ ("mfcr   %0" : "=r" (flags));
+-      __asm__ __volatile__ ("mfvscr %0" : "=vr" (vscr));
++      __asm__ __volatile__ ("mfvscr %0" : "=v" (vscr));
+       
+       /* Restore flags */
+       __asm__ __volatile__ ("mtcr   %0" : : "r"  (tmpcr));
+@@ -6677,7 +6677,7 @@ static void vsldoi_cb (const char* name, test_func_t func_IN,
+             
+             /* Save flags */
+             __asm__ __volatile__ ("mfcr   %0" : "=r"  (tmpcr));
+-            __asm__ __volatile__ ("mfvscr %0" : "=vr" (tmpvscr));
++            __asm__ __volatile__ ("mfvscr %0" : "=v" (tmpvscr));
+             
+             // reset VSCR and CR
+             vscr = (vector unsigned int){ 0,0,0,DEFAULT_VSCR };
+@@ -6693,11 +6693,11 @@ static void vsldoi_cb (const char* name, test_func_t func_IN,
+             (*func)();
+          
+             // retrieve output <- r17
+-            __asm__ __volatile__ ("vor %0,17,17" : "=vr" (vec_out));
++            __asm__ __volatile__ ("vor %0,17,17" : "=v" (vec_out));
+             
+             // get CR,VSCR flags
+             __asm__ __volatile__ ("mfcr   %0" : "=r" (flags));
+-            __asm__ __volatile__ ("mfvscr %0" : "=vr" (vscr));
++            __asm__ __volatile__ ("mfvscr %0" : "=v" (vscr));
+             
+             /* Restore flags */
+             __asm__ __volatile__ ("mtcr   %0" : : "r"  (tmpcr));
+@@ -6750,7 +6750,7 @@ static void lvs_cb (const char *name, test_func_t func,
+ 
+       /* Save flags */
+       __asm__ __volatile__ ("mfcr   %0" : "=r"  (tmpcr));
+-      __asm__ __volatile__ ("mfvscr %0" : "=vr" (tmpvscr));
++      __asm__ __volatile__ ("mfvscr %0" : "=v" (tmpvscr));
+       
+       // reset VSCR and CR
+       vscr = (vector unsigned int){ 0,0,0,DEFAULT_VSCR };
+@@ -6762,11 +6762,11 @@ static void lvs_cb (const char *name, test_func_t func,
+       (*func)();
+       
+       // retrieve output <- r17
+-      __asm__ __volatile__ ("vor %0,17,17" : "=vr" (vec_out));
++      __asm__ __volatile__ ("vor %0,17,17" : "=v" (vec_out));
+          
+       // get CR,VSCR flags
+       __asm__ __volatile__ ("mfcr   %0" : "=r" (flags));
+-      __asm__ __volatile__ ("mfvscr %0" : "=vr" (vscr));
++      __asm__ __volatile__ ("mfvscr %0" : "=v" (vscr));
+       
+       /* Restore flags */
+       __asm__ __volatile__ ("mtcr   %0" : : "r"  (tmpcr));
+@@ -6870,7 +6870,7 @@ static void test_av_int_ld_two_regs (const char *name,
+          
+          /* Save flags */
+          __asm__ __volatile__ ("mfcr   %0" : "=r"  (tmpcr));
+-         __asm__ __volatile__ ("mfvscr %0" : "=vr" (tmpvscr));
++         __asm__ __volatile__ ("mfvscr %0" : "=v" (tmpvscr));
+          
+          // reset VSCR and CR
+          vscr = (vector unsigned int){ 0,0,0,DEFAULT_VSCR };
+@@ -6882,11 +6882,11 @@ static void test_av_int_ld_two_regs (const char *name,
+          (*func)();
+          
+          // retrieve output <- r17
+-         __asm__ __volatile__ ("vor %0,17,17" : "=vr" (vec_out));
++         __asm__ __volatile__ ("vor %0,17,17" : "=v" (vec_out));
+          
+          // get CR,VSCR flags
+          __asm__ __volatile__ ("mfcr   %0" : "=r" (flags));
+-         __asm__ __volatile__ ("mfvscr %0" : "=vr" (vscr));
++         __asm__ __volatile__ ("mfvscr %0" : "=v" (vscr));
+          
+          /* Restore flags */
+          __asm__ __volatile__ ("mtcr   %0" : : "r"  (tmpcr));
+@@ -6956,7 +6956,7 @@ static void test_av_int_st_three_regs (const char *name,
+ 
+          /* Save flags */
+          __asm__ __volatile__ ("mfcr   %0" : "=r"  (tmpcr));
+-         __asm__ __volatile__ ("mfvscr %0" : "=vr" (tmpvscr));
++         __asm__ __volatile__ ("mfvscr %0" : "=v" (tmpvscr));
+          
+          // reset VSCR and CR
+          vscr = (vector unsigned int){ 0,0,0,DEFAULT_VSCR };
+@@ -6974,7 +6974,7 @@ static void test_av_int_st_three_regs (const char *name,
+          
+          // get CR,VSCR flags
+          __asm__ __volatile__ ("mfcr   %0" : "=r" (flags));
+-         __asm__ __volatile__ ("mfvscr %0" : "=vr" (vscr));
++         __asm__ __volatile__ ("mfvscr %0" : "=v" (vscr));
+          
+          /* Restore flags */
+          __asm__ __volatile__ ("mtcr   %0" : : "r"  (tmpcr));
+@@ -7037,7 +7037,7 @@ static void test_av_float_one_arg (const char* name, test_func_t func,
+       
+       /* Save flags */
+       __asm__ __volatile__ ("mfcr   %0" : "=r"  (tmpcr));
+-      __asm__ __volatile__ ("mfvscr %0" : "=vr" (tmpvscr));
++      __asm__ __volatile__ ("mfvscr %0" : "=v" (tmpvscr));
+ 
+       // reset VSCR and CR
+       vscr = (vector unsigned int){ 0,0,0,DEFAULT_VSCR };
+@@ -7052,11 +7052,11 @@ static void test_av_float_one_arg (const char* name, test_func_t func,
+       (*func)();
+       
+       // retrieve output <- r17
+-      __asm__ __volatile__ ("vor %0,17,17" : "=vr" (vec_out));
++      __asm__ __volatile__ ("vor %0,17,17" : "=v" (vec_out));
+       
+       // get CR,VSCR flags
+       __asm__ __volatile__ ("mfcr   %0" : "=r" (flags));
+-      __asm__ __volatile__ ("mfvscr %0" : "=vr" (vscr));
++      __asm__ __volatile__ ("mfvscr %0" : "=v" (vscr));
+       
+       /* Restore flags */
+       __asm__ __volatile__ ("mtcr   %0" : : "r"  (tmpcr));
+@@ -7099,7 +7099,7 @@ static void test_av_float_two_args (const char* name, test_func_t func,
+ 
+          /* Save flags */
+          __asm__ __volatile__ ("mfcr   %0" : "=r"  (tmpcr));
+-         __asm__ __volatile__ ("mfvscr %0" : "=vr" (tmpvscr));
++         __asm__ __volatile__ ("mfvscr %0" : "=v" (tmpvscr));
+ 
+          // reset VSCR and CR
+          vscr = (vector unsigned int){ 0,0,0,DEFAULT_VSCR };
+@@ -7115,11 +7115,11 @@ static void test_av_float_two_args (const char* name, test_func_t func,
+          (*func)();
+ 
+          // retrieve output <- r17
+-         __asm__ __volatile__ ("vor %0,17,17" : "=vr" (vec_out));
++         __asm__ __volatile__ ("vor %0,17,17" : "=v" (vec_out));
+ 
+          // get CR,VSCR flags
+          __asm__ __volatile__ ("mfcr   %0" : "=r" (flags));
+-         __asm__ __volatile__ ("mfvscr %0" : "=vr" (vscr));
++         __asm__ __volatile__ ("mfvscr %0" : "=v" (vscr));
+ 
+          /* Restore flags */
+          __asm__ __volatile__ ("mtcr   %0" : : "r"  (tmpcr));
+@@ -7168,7 +7168,7 @@ static void test_av_float_three_args (const char* name, test_func_t func,
+             
+             /* Save flags */
+             __asm__ __volatile__ ("mfcr   %0" : "=r"  (tmpcr));
+-            __asm__ __volatile__ ("mfvscr %0" : "=vr" (tmpvscr));
++            __asm__ __volatile__ ("mfvscr %0" : "=v" (tmpvscr));
+ 
+             // reset VSCR and CR
+             vscr = (vector unsigned int){ 0,0,0,DEFAULT_VSCR };
+@@ -7185,11 +7185,11 @@ static void test_av_float_three_args (const char* name, test_func_t func,
+             (*func)();
+ 
+             // retrieve output <- r17
+-            __asm__ __volatile__ ("vor %0,17,17" : "=vr" (vec_out));
++            __asm__ __volatile__ ("vor %0,17,17" : "=v" (vec_out));
+ 
+             // get CR,VSCR flags
+             __asm__ __volatile__ ("mfcr   %0" : "=r" (flags));
+-            __asm__ __volatile__ ("mfvscr %0" : "=vr" (vscr));
++            __asm__ __volatile__ ("mfvscr %0" : "=v" (vscr));
+ 
+             /* Restore flags */
+             __asm__ __volatile__ ("mtcr   %0" : : "r"  (tmpcr));
+@@ -7276,7 +7276,7 @@ static void vcvt_cb (const char* name, test_func_t func_IN,
+          
+          /* Save flags */
+          __asm__ __volatile__ ("mfcr   %0" : "=r"  (tmpcr));
+-         __asm__ __volatile__ ("mfvscr %0" : "=vr" (tmpvscr));
++         __asm__ __volatile__ ("mfvscr %0" : "=v" (tmpvscr));
+ 
+          // reset VSCR and CR
+          vscr = (vector unsigned int){ 0,0,0,DEFAULT_VSCR };
+@@ -7291,11 +7291,11 @@ static void vcvt_cb (const char* name, test_func_t func_IN,
+          (*func)();
+          
+          // retrieve output <- r17
+-         __asm__ __volatile__ ("vor %0,17,17" : "=vr" (vec_out));
++         __asm__ __volatile__ ("vor %0,17,17" : "=v" (vec_out));
+          
+          // get CR,VSCR flags
+          __asm__ __volatile__ ("mfcr   %0" : "=r" (flags));
+-         __asm__ __volatile__ ("mfvscr %0" : "=vr" (vscr));
++         __asm__ __volatile__ ("mfvscr %0" : "=v" (vscr));
+          
+          /* Restore flags */
+          __asm__ __volatile__ ("mtcr   %0" : : "r"  (tmpcr));
diff --git a/valgrind.spec b/valgrind.spec
index 9641768..4750e4d 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -145,6 +145,9 @@ Patch23: valgrind-3.14.0-ppc64-lxvb16x.patch
 Patch24: valgrind-3.14.0-set_AV_CR6.patch
 Patch25: valgrind-3.14.0-undef_malloc_args.patch
 
+# KDE#401822 none/tests/ppc64/jm-vmx fails and produces assembler warnings
+Patch26: valgrind-3.14.0-jm-vmx-constraints.patch
+
 %if %{build_multilib}
 # Ensure glibc{,-devel} is installed for both multilib arches
 BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
@@ -302,6 +305,7 @@ Valgrind User Manual for details.
 %patch23 -p1
 %patch24 -p1
 %patch25 -p1
+%patch26 -p1
 
 %build
 CC=gcc
@@ -545,6 +549,7 @@ fi
 - Add valgrind-3.14.0-ppc64-lxvb16x.patch
 - Add valgrind-3.14.0-set_AV_CR6.patch
 - Add valgrind-3.14.0-undef_malloc_args.patch
+- Add valgrind-3.14.0-jm-vmx-constraints.patch
 
 * Sat Dec  1 2018 Mark Wielaard <mjw@fedoraproject.org> - 3.14.0.5
 - Add valgrind-3.14.0-wcsncmp.patch (#1645971)