63c246
diff -ur valgrind-3.14.0.orig/VEX/priv/guest_s390_helpers.c valgrind-3.14.0/VEX/priv/guest_s390_helpers.c
63c246
--- valgrind-3.14.0.orig/VEX/priv/guest_s390_helpers.c	2019-01-10 17:00:57.203206690 +0100
63c246
+++ valgrind-3.14.0/VEX/priv/guest_s390_helpers.c	2019-01-10 17:06:23.335253900 +0100
63c246
@@ -2469,7 +2469,7 @@
63c246
 /*--- Dirty helper for vector instructions                 ---*/
63c246
 /*------------------------------------------------------------*/
63c246
 
63c246
-#if defined(VGA_s390x)
63c246
+#if defined(VGA_s390x) && 0 /* disable for old binutils */
63c246
 ULong
63c246
 s390x_dirtyhelper_vec_op(VexGuestS390XState *guest_state,
63c246
                          const ULong serialized)
63c246
diff -ur valgrind-3.14.0.orig/none/tests/s390x/Makefile.am valgrind-3.14.0/none/tests/s390x/Makefile.am
63c246
--- valgrind-3.14.0.orig/none/tests/s390x/Makefile.am	2019-01-10 17:00:57.411202894 +0100
63c246
+++ valgrind-3.14.0/none/tests/s390x/Makefile.am	2019-01-10 17:10:28.963776813 +0100
63c246
@@ -18,8 +18,7 @@
63c246
 	     spechelper-cr  spechelper-clr  \
63c246
 	     spechelper-ltr spechelper-or   \
63c246
 	     spechelper-icm-1  spechelper-icm-2 spechelper-tmll \
63c246
-	     spechelper-tm laa vector lsc2 ppno vector_string vector_integer \
63c246
-	     vector_float
63c246
+	     spechelper-tm laa 
63c246
 
63c246
 if BUILD_DFP_TESTS
63c246
   INSN_TESTS += dfp-1 dfp-2 dfp-3 dfp-4 dfptest dfpext dfpconv srnmt pfpo
63c246
@@ -68,8 +67,3 @@
63c246
 fixbr_CFLAGS     = $(AM_CFLAGS) @FLAG_MLONG_DOUBLE_128@
63c246
 fpext_CFLAGS     = $(AM_CFLAGS) @FLAG_MLONG_DOUBLE_128@
63c246
 ex_clone_LDADD   = -lpthread
63c246
-vector_CFLAGS    = $(AM_CFLAGS) -march=z13
63c246
-lsc2_CFLAGS       = -march=z13 -DS390_TESTS_NOCOLOR
63c246
-vector_string_CFLAGS = $(AM_CFLAGS) -march=z13 -DS390_TEST_COUNT=5
63c246
-vector_integer_CFLAGS    = $(AM_CFLAGS) -march=z13 -DS390_TEST_COUNT=4
63c246
-vector_float_CFLAGS    = $(AM_CFLAGS) -march=z13 -DS390_TEST_COUNT=4