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
-@@ -19903,7 +19903,11 @@
- HChar* fName = NULL;
+@@ -21165,6 +21165,10 @@ Long dis_ESC_0F (
+ const 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";
++ } else
+ /* This isn't entirely correct, CPUID should depend on the VEX
+ capabilities, not on the underlying CPU. See bug #324882. */
+ if ((archinfo->hwcaps & VEX_HWCAPS_AMD64_SSE3) &&
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
Summary: An open-source memory debugger
Summary(pl.UTF-8): Otwarty odpluskwiacz pamięci
Name: valgrind
-Version: 3.8.1
-Release: 3
+Version: 3.9.0
+Release: 1
License: GPL
Group: Development/Tools
Source0: http://valgrind.org/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: 288758010b271119a0ffc0183f1d6e38
+# Source0-md5: 0947de8112f946b9ce64764af7be6df2
Patch0: %{name}-native-cpuid.patch
Patch1: %{name}-ld_linux_strlen.patch
URL: http://valgrind.org/
BuildRequires: automake
BuildRequires: gcc >= 5:3.0
BuildRequires: glibc-devel >= 6:2.2
-BuildRequires: glibc-devel < 6:2.17
+BuildRequires: glibc-devel < 6:2.19
BuildRequires: libgomp-devel
BuildRequires: libstdc++-devel
Obsoletes: valgrind-callgrind
%patch0 -p1
%patch1 -p1
-sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.in
+sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.ac
%build
%{__aclocal}
DESTDIR=$RPM_BUILD_ROOT
%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/doc
-mv docs/index.pdf docs/valgrind_manual.pdf
-mv docs/index.ps docs/valgrind_manual.ps
+cp -p docs/index.pdf docs/valgrind_manual.pdf
+cp -p docs/index.ps docs/valgrind_manual.ps
%clean
rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/cg_merge
%attr(755,root,root) %{_bindir}/ms_print
%attr(755,root,root) %{_bindir}/valgrind
+%attr(755,root,root) %{_bindir}/valgrind-di-server
%attr(755,root,root) %{_bindir}/valgrind-listener
%attr(755,root,root) %{_bindir}/vgdb
%dir %{_libdir}/%{name}
%{_mandir}/man1/callgrind_annotate.1*
%{_mandir}/man1/callgrind_control.1*
%{_mandir}/man1/cg_annotate.1*
+%{_mandir}/man1/cg_diff.1*
+%{_mandir}/man1/cg_merge.1*
%{_mandir}/man1/ms_print.1*
%{_mandir}/man1/valgrind.1*
+%{_mandir}/man1/valgrind-listener.1*
+%{_mandir}/man1/vgdb.1*
%{_pkgconfigdir}/valgrind.pc