- updated to 3.11.0

- updated native-cpuid
- removed obsolete glibc,kernel-4.x patches

diff --git a/kernel-4.x.patch b/kernel-4.x.patch
deleted file mode 100644 (file)
index 0420187..0000000
--- a/kernel-4.x.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- valgrind-3.10.1/configure.ac~      2015-05-10 12:56:39.000000000 +0200
-+++ valgrind-3.10.1/configure.ac       2015-05-10 12:57:15.434577885 +0200
-@@ -303,7 +303,7 @@
-         kernel=`uname -r`
- 
-         case "${kernel}" in
--             2.6.*|3.*) 
-+             2.6.*|3.*|4.*) 
-                   AC_MSG_RESULT([2.6.x/3.x family (${kernel})])
-                   AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x or Linux 3.x])
-                   ;;

diff --git a/valgrind-glibc.patch b/valgrind-glibc.patch
deleted file mode 100644 (file)
index 3d6c37d..0000000
--- a/valgrind-glibc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- valgrind-3.10.1/configure.ac.orig  2015-05-07 20:25:25.286786881 +0200
-+++ valgrind-3.10.1/configure.ac       2015-05-07 20:48:33.833395275 +0200
-@@ -1018,6 +1018,13 @@
-       DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-       DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-       ;;
-+     2.21)
-+      AC_MSG_RESULT(2.21 family)
-+      AC_DEFINE([GLIBC_2_21], 1, [Define to 1 if you're using glibc 2.21.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])

diff --git a/valgrind-native-cpuid.patch b/valgrind-native-cpuid.patch
index 4e92dfea6835f31c73a648b6dca96c1d2cd4fdbc..5b43717bbbad1b838f2ae1ce811d41730c8b854f 100644 (file)
--- a/valgrind-native-cpuid.patch
+++ b/valgrind-native-cpuid.patch
@@ -10,14 +10,12 @@ diff -uNr valgrind-3.6.0.orig/coregrind/m_main.c valgrind-3.6.0/coregrind/m_main
  
        else if VG_INT_CLO(arg, "--log-fd", tmp_log_fd) {
           log_to = VgLogTo_Fd;
-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
-@@ -161,7 +161,8 @@
- extern void  amd64g_dirtyhelper_CPUID_baseline ( VexGuestAMD64State* st );
- extern void  amd64g_dirtyhelper_CPUID_sse3_and_cx16 ( VexGuestAMD64State* st );
+--- valgrind-3.11.0/VEX/priv/guest_amd64_defs.h.orig   2015-11-15 19:07:11.062949101 +0100
++++ valgrind-3.11.0/VEX/priv/guest_amd64_defs.h        2015-11-15 19:09:09.992944110 +0100
+@@ -169,6 +169,7 @@
  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_avx2 ( VexGuestAMD64State* st );
 +extern void  amd64g_dirtyhelper_CPUID_native ( VexGuestAMD64State* st );
  
  extern void  amd64g_dirtyhelper_FINIT ( VexGuestAMD64State* );
@@ -46,13 +44,12 @@ diff -uNr valgrind-3.6.0.orig/VEX/priv/guest_amd64_helpers.c valgrind-3.6.0/VEX/
  ULong amd64g_calculate_RCR ( ULong arg, 
                               ULong rot_amt, 
                               ULong rflags_in, 
-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
-@@ -21165,6 +21165,10 @@ Long dis_ESC_0F (
-       const HChar*   fName = NULL;
-       void*    fAddr = NULL;
+--- valgrind-3.11.0/VEX/priv/guest_amd64_toIR.c.orig   2015-11-15 19:07:11.129615765 +0100
++++ valgrind-3.11.0/VEX/priv/guest_amd64_toIR.c        2015-11-15 19:13:47.379599136 +0100
+@@ -21920,6 +21920,10 @@
+ 
        if (haveF2orF3(pfx)) goto decode_failure;
+ 
 +      if (vex_control.iropt_native_cpuid) {
 +         fName = "amd64g_dirtyhelper_CPUID_native";
 +         fAddr = &amd64g_dirtyhelper_CPUID_native;

diff --git a/valgrind.spec b/valgrind.spec
index 97ef2a01670dcbccb9abcaed6c94821e1eac6567..a800fffe8dfe51469b85b71f013e161ad5c54731 100644 (file)
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -7,16 +7,14 @@
 Summary:       An open-source memory debugger
 Summary(pl.UTF-8):     Otwarty odpluskwiacz pamięci
 Name:          valgrind
-Version:       3.10.1
-Release:       2
+Version:       3.11.0
+Release:       1
 License:       GPL v2+
 Group:         Development/Tools
 Source0:       http://valgrind.org/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: 60ddae962bc79e7c95cfc4667245707f
+# Source0-md5: 4ea62074da73ae82e0162d6550d3f129
 Patch0:                %{name}-native-cpuid.patch
 Patch1:                %{name}-ld_linux_strlen.patch
-Patch2:                %{name}-glibc.patch
-Patch3:                kernel-4.x.patch
 URL:           http://valgrind.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake >= 1:1.10
@@ -33,6 +31,7 @@ ExclusiveArch:        %{ix86} %{x8664} arm ppc ppc64 s390x x32
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _noautostrip    .*/vgpreload.*\\.so
+%define                filterout_c     -fstack-protector-strong
 # ld portion broken
 %undefine      with_ccache
 
@@ -56,8 +55,6 @@ pracować.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.ac