From 5beaf0853dfe83f2c7dd1330ae498181462382ba Mon Sep 17 00:00:00 2001 From: Kacper Kornet Date: Tue, 21 Aug 2012 21:30:49 +0200 Subject: [PATCH] Up to 3.8.0 Remove automake-1.11.2, debuginfo and glibc patches which were applied upstream. --- valgrind-automake-1.11.2.patch | 25 ------------------------- valgrind-debuginfo.patch | 13 ------------- valgrind-glibc.patch | 32 -------------------------------- valgrind-native-cpuid.patch | 29 +++++++++++++++-------------- valgrind.spec | 18 ++++++------------ 5 files changed, 21 insertions(+), 96 deletions(-) delete mode 100644 valgrind-automake-1.11.2.patch delete mode 100644 valgrind-debuginfo.patch delete mode 100644 valgrind-glibc.patch diff --git a/valgrind-automake-1.11.2.patch b/valgrind-automake-1.11.2.patch deleted file mode 100644 index 2ef48a2..0000000 --- a/valgrind-automake-1.11.2.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://bugs.kde.org/show_bug.cgi?id=290719 ---- coregrind/Makefile.am 2011-10-27 12:55:06.000000000 +0200 -+++ coregrind/Makefile.am 2012-01-06 17:23:48.717115986 +0100 -@@ -495,7 +495,8 @@ - m_gdbserver/powerpc-altivec64l.xml - - # so as to make sure these get copied into the install tree --pkglib_DATA = $(GDBSERVER_XML_FILES) -+vgdatadir = $(pkglibdir) -+vgdata_DATA = $(GDBSERVER_XML_FILES) - - # so as to make sure these get copied into the tarball - EXTRA_DIST += $(GDBSERVER_XML_FILES) ---- Makefile.am 2011-10-26 23:24:45.000000000 +0200 -+++ Makefile.am 2012-01-06 17:23:17.445114847 +0100 -@@ -61,7 +61,8 @@ - # default.supp, as it is built from the base .supp files at compile-time. - dist_noinst_DATA = $(SUPP_FILES) - --pkglib_DATA = default.supp -+vgdatadir = $(pkglibdir) -+vgdata_DATA = default.supp - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = valgrind.pc diff --git a/valgrind-debuginfo.patch b/valgrind-debuginfo.patch deleted file mode 100644 index bab4da9..0000000 --- a/valgrind-debuginfo.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- coregrind/m_debuginfo/readelf.c~ 2011-10-26 23:24:44.000000000 +0200 -+++ coregrind/m_debuginfo/readelf.c 2011-12-10 16:02:00.557983343 +0100 -@@ -1198,7 +1198,9 @@ - VG_(sprintf)(debugpath, "%s/.debug/%s", objdir, debugname); - if ((addr = open_debug_file(debugpath, NULL, crc, &size)) == 0) { - VG_(sprintf)(debugpath, "/usr/lib/debug%s/%s", objdir, debugname); -- addr = open_debug_file(debugpath, NULL, crc, &size); -+ if ((addr = open_debug_file(debugpath, NULL, crc, &size)) == 0) { -+ addr = open_debug_file(debugname, NULL, crc, size); -+ } - } - } - diff --git a/valgrind-glibc.patch b/valgrind-glibc.patch deleted file mode 100644 index 2dcbe2b..0000000 --- a/valgrind-glibc.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- configure.in.orig 2011-11-05 12:13:30.000000000 +0100 -+++ configure.in 2012-07-21 10:52:16.246714671 +0200 -@@ -775,6 +775,20 @@ - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.15) -+ AC_MSG_RESULT(2.15 family) -+ AC_DEFINE([GLIBC_2_15], 1, [Define to 1 if you're using glibc 2.15.x]) -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; -+ 2.16) -+ AC_MSG_RESULT(2.16 family) -+ AC_DEFINE([GLIBC_2_16], 1, [Define to 1 if you're using glibc 2.16.x]) -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; - darwin) - AC_MSG_RESULT(Darwin) - AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin]) -@@ -788,7 +802,7 @@ - - *) - AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) -- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.14]) -+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.16]) - AC_MSG_ERROR([or Darwin libc]) - ;; - esac diff --git a/valgrind-native-cpuid.patch b/valgrind-native-cpuid.patch index df4bf8d..9fccee2 100644 --- a/valgrind-native-cpuid.patch +++ b/valgrind-native-cpuid.patch @@ -13,10 +13,11 @@ diff -uNr valgrind-3.6.0.orig/coregrind/m_main.c valgrind-3.6.0/coregrind/m_main diff -uNr valgrind-3.6.0.orig/VEX/priv/guest_amd64_defs.h valgrind-3.6.0/VEX/priv/guest_amd64_defs.h --- valgrind-3.6.0.orig/VEX/priv/guest_amd64_defs.h 2010-10-20 22:19:51.000000000 +0200 +++ valgrind-3.6.0/VEX/priv/guest_amd64_defs.h 2011-01-17 20:38:57.815124615 +0100 -@@ -147,6 +147,7 @@ +@@ -161,7 +161,8 @@ extern void amd64g_dirtyhelper_CPUID_baseline ( VexGuestAMD64State* st ); extern void amd64g_dirtyhelper_CPUID_sse3_and_cx16 ( VexGuestAMD64State* st ); extern void amd64g_dirtyhelper_CPUID_sse42_and_cx16 ( VexGuestAMD64State* st ); + extern void amd64g_dirtyhelper_CPUID_avx_and_cx16 ( VexGuestAMD64State* st ); +extern void amd64g_dirtyhelper_CPUID_native ( VexGuestAMD64State* st ); extern void amd64g_dirtyhelper_FINIT ( VexGuestAMD64State* ); @@ -48,19 +49,19 @@ diff -uNr valgrind-3.6.0.orig/VEX/priv/guest_amd64_helpers.c valgrind-3.6.0/VEX/ diff -uNr valgrind-3.6.0.orig/VEX/priv/guest_amd64_toIR.c valgrind-3.6.0/VEX/priv/guest_amd64_toIR.c --- valgrind-3.6.0.orig/VEX/priv/guest_amd64_toIR.c 2011-01-17 20:35:34.380376775 +0100 +++ valgrind-3.6.0/VEX/priv/guest_amd64_toIR.c 2011-01-17 20:36:00.891571709 +0100 -@@ -17620,7 +17620,11 @@ - HChar* fName = NULL; - void* fAddr = NULL; - if (haveF2orF3(pfx)) goto decode_failure; -- if (archinfo->hwcaps == (VEX_HWCAPS_AMD64_SSE3 -+ if (vex_control.iropt_native_cpuid) { -+ fName = "amd64g_dirtyhelper_CPUID_native"; -+ fAddr = &amd64g_dirtyhelper_CPUID_native; -+ } -+ else if (archinfo->hwcaps == (VEX_HWCAPS_AMD64_SSE3 - |VEX_HWCAPS_AMD64_CX16)) { - //fName = "amd64g_dirtyhelper_CPUID_sse3_and_cx16"; - //fAddr = &amd64g_dirtyhelper_CPUID_sse3_and_cx16; +@@ -19903,7 +19903,11 @@ + HChar* fName = NULL; + void* fAddr = NULL; + if (haveF2orF3(pfx)) goto decode_failure; +- if (archinfo->hwcaps == (VEX_HWCAPS_AMD64_SSE3 ++ if (vex_control.iropt_native_cpuid) { ++ fName = "amd64g_dirtyhelper_CPUID_native"; ++ fAddr = &amd64g_dirtyhelper_CPUID_native; ++ } ++ else if (archinfo->hwcaps == (VEX_HWCAPS_AMD64_SSE3 + |VEX_HWCAPS_AMD64_CX16 + |VEX_HWCAPS_AMD64_AVX)) { + fName = "amd64g_dirtyhelper_CPUID_avx_and_cx16"; diff -uNr valgrind-3.6.0.orig/VEX/pub/libvex.h valgrind-3.6.0/VEX/pub/libvex.h --- valgrind-3.6.0.orig/VEX/pub/libvex.h 2010-10-20 22:19:52.000000000 +0200 +++ valgrind-3.6.0/VEX/pub/libvex.h 2011-01-17 20:41:02.906490947 +0100 diff --git a/valgrind.spec b/valgrind.spec index 3fdf1ea..e79f5ae 100644 --- a/valgrind.spec +++ b/valgrind.spec @@ -3,17 +3,14 @@ Summary: An open-source memory debugger Summary(pl.UTF-8): Otwarty odpluskwiacz pamięci Name: valgrind -Version: 3.7.0 -Release: 4 +Version: 3.8.0 +Release: 0.1 License: GPL Group: Development/Tools Source0: http://valgrind.org/downloads/%{name}-%{version}.tar.bz2 -# Source0-md5: a855fda56edf05614f099dca316d1775 -Patch0: %{name}-debuginfo.patch -Patch1: %{name}-native-cpuid.patch -Patch2: %{name}-automake-1.11.2.patch -Patch3: %{name}-ld_linux_strlen.patch -Patch4: %{name}-glibc.patch +# Source0-md5: ec04dfd1256307432b2a7b520398c526 +Patch0: %{name}-native-cpuid.patch +Patch1: %{name}-ld_linux_strlen.patch URL: http://valgrind.org/ BuildRequires: autoconf BuildRequires: automake @@ -51,11 +48,8 @@ pracować. %prep %setup -q -%patch0 +%patch0 -p1 %patch1 -p1 -%patch2 -p0 -%patch3 -p1 -%patch4 -p0 sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.in -- 2.44.0