diff --git a/valgrind-3.8.1-s390_tsearch_supp.patch b/valgrind-3.8.1-s390_tsearch_supp.patch new file mode 100644 index 0000000..04c78ca --- /dev/null +++ b/valgrind-3.8.1-s390_tsearch_supp.patch @@ -0,0 +1,19 @@ +--- valgrind-3.8.1/glibc-2.X.supp.in.orig 2012-10-15 14:10:24.646984028 +0200 ++++ valgrind-3.8.1/glibc-2.X.supp.in 2012-10-15 14:13:58.505147375 +0200 +@@ -213,6 +213,16 @@ + obj:/*libc-@GLIBC_VERSION@*.so + } + ++## ---------------------------------------------------------------------## ++# Workaround for Bug 308427 - s390 memcheck reports tsearch conditional ++# jump or move depends on uninitialized value. ++{ ++ s390x-tsearch-node_t-red ++ Memcheck:Cond ++ fun:tsearch ++ obj:/*libc-@GLIBC_VERSION@*.so ++} ++ + ##----------------------------------------------------------------------## + # MontaVista Linux 4.0.1 on ppc32 + { diff --git a/valgrind.spec b/valgrind.spec index 459c640..a0a7a44 100644 --- a/valgrind.spec +++ b/valgrind.spec @@ -117,6 +117,10 @@ Patch26: valgrind-3.8.1-gdbserver_exit.patch # KDE#164485 - VG_N_SEGNAMES and VG_N_SEGMENTS are (still) too small Patch27: valgrind-3.8.1-aspacemgr_VG_N_SEGs.patch +# KDE#308427 - s390 memcheck reports tsearch conditional jump or move +# depends on uninitialized value [workaround, suppression] +Patch28: valgrind-3.8.1-s390_tsearch_supp.patch + Obsoletes: valgrind-callgrind %ifarch x86_64 ppc64 # Ensure glibc{,-devel} is installed for both multilib arches @@ -242,6 +246,9 @@ touch ./none/tests/amd64/bmi.stderr.exp %patch25 -p1 %patch26 -p1 %patch27 -p1 +%ifarch s390x +%patch28 -p1 +%endif # To suppress eventual automake warnings/errors rm -f gdbserver_tests/filter_gdb.orig @@ -391,7 +398,7 @@ echo ===============END TESTING=============== %endif %changelog -* Sat Oct 13 2012 Mark Wielaard +* Mon Oct 15 2012 Mark Wielaard - Add valgrind-3.8.1-x86_amd64_features-avx.patch (KDE#307285) - Add valgrind-3.8.1-gdbserver_tests-syscall-template-source.patch (KDE#307155) - Add valgrind-3.8.1-overlap_memcpy_filter.patch (KDE#307290) @@ -401,6 +408,7 @@ echo ===============END TESTING=============== - Add valgrind-3.8.1-filter_gdb.patch (KDE#308321) - Add valgrind-3.8.1-gdbserver_exit.patch (#862795, KDE#308341) - Add valgrind-3.8.1-aspacemgr_VG_N_SEGs.patch (#730303, KDE#164485) +- Add valgrind-3.8.1-s390_tsearch_supp.patch (#816244, KDE#308427) * Fri Sep 20 2012 Mark Wielaard 3.8.1-2 - Add valgrind-3.8.1-gdbserver_tests-mcinvoke-ppc64.patch