dev-util/valgrind: remove older patches

Package-Manager: portage-2.2.26

10 files changed, 0 insertions, 865 deletions

diff --git a/dev-util/valgrind/files/valgrind-3.10.0-non-exec-stack.patch b/dev-util/valgrind/files/valgrind-3.10.0-non-exec-stack.patch
deleted file mode 100644
index d4ae13d45cf1..000000000000
--- a/dev-util/valgrind/files/valgrind-3.10.0-non-exec-stack.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-diff -Naur valgrind-3.10.0.orig/coregrind/Makefile.am valgrind-3.10.0/coregrind/Makefile.am
---- valgrind-3.10.0.orig/coregrind/Makefile.am	2014-09-08 08:28:30.000000000 -0400
-+++ valgrind-3.10.0/coregrind/Makefile.am	2014-09-12 20:54:25.720389938 -0400
-@@ -333,18 +333,6 @@
- 	m_demangle/demangle.c \
- 	m_demangle/dyn-string.c \
- 	m_demangle/safe-ctype.c \
--	m_dispatch/dispatch-x86-linux.S \
--	m_dispatch/dispatch-amd64-linux.S \
--	m_dispatch/dispatch-ppc32-linux.S \
--	m_dispatch/dispatch-ppc64be-linux.S \
--	m_dispatch/dispatch-ppc64le-linux.S \
--	m_dispatch/dispatch-arm-linux.S \
--	m_dispatch/dispatch-arm64-linux.S \
--	m_dispatch/dispatch-s390x-linux.S \
--	m_dispatch/dispatch-mips32-linux.S \
--	m_dispatch/dispatch-mips64-linux.S \
--	m_dispatch/dispatch-x86-darwin.S \
--	m_dispatch/dispatch-amd64-darwin.S \
- 	m_gdbserver/inferiors.c \
- 	m_gdbserver/m_gdbserver.c \
- 	m_gdbserver/regcache.c \
-@@ -368,8 +356,6 @@
- 	m_initimg/initimg-pathscan.c \
- 	m_mach/mach_basics.c \
- 	m_mach/mach_msg.c \
--	m_mach/mach_traps-x86-darwin.S \
--	m_mach/mach_traps-amd64-darwin.S \
- 	m_replacemalloc/replacemalloc_core.c \
- 	m_scheduler/scheduler.c \
- 	m_scheduler/sema.c \
-@@ -386,18 +372,6 @@
- 	m_sigframe/sigframe-mips64-linux.c \
- 	m_sigframe/sigframe-x86-darwin.c \
- 	m_sigframe/sigframe-amd64-darwin.c \
--	m_syswrap/syscall-x86-linux.S \
--	m_syswrap/syscall-amd64-linux.S \
--	m_syswrap/syscall-ppc32-linux.S \
--	m_syswrap/syscall-ppc64be-linux.S \
--	m_syswrap/syscall-ppc64le-linux.S \
--	m_syswrap/syscall-arm-linux.S \
--	m_syswrap/syscall-arm64-linux.S \
--	m_syswrap/syscall-s390x-linux.S \
--	m_syswrap/syscall-mips32-linux.S \
--	m_syswrap/syscall-mips64-linux.S \
--	m_syswrap/syscall-x86-darwin.S \
--	m_syswrap/syscall-amd64-darwin.S \
- 	m_syswrap/syswrap-main.c \
- 	m_syswrap/syswrap-generic.c \
- 	m_syswrap/syswrap-linux.c \
-@@ -420,6 +394,29 @@
- 	m_ume/main.c \
- 	m_ume/script.c
- 
-+COREGRIND_SOURCES_COMMON += \
-+	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S \
-+	m_syswrap/syscall-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S
-+
-+if VGCONF_HAVE_PLATFORM_SEC
-+COREGRIND_SOURCES_COMMON += \
-+	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S \
-+	m_syswrap/syscall-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S
-+endif
-+
-+if VGCONF_OS_IS_DARWIN
-+COREGRIND_SOURCES_COMMON += \
-+	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-darwin.S \
-+	m_syswrap/syscall-@VGCONF_ARCH_PRI@-darwin.S \
-+	m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S
-+if VGCONF_HAVE_PLATFORM_SEC
-+COREGRIND_SOURCES_COMMON += \
-+	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-darwin.S \
-+	m_syswrap/syscall-@VGCONF_ARCH_SEC@-darwin.S \
-+	m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
-+endif
-+endif
-+
- libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
-     $(COREGRIND_SOURCES_COMMON)
- nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
-diff -Naur valgrind-3.10.0.orig/coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.10.0/coregrind/m_dispatch/dispatch-amd64-linux.S
---- valgrind-3.10.0.orig/coregrind/m_dispatch/dispatch-amd64-linux.S	2014-09-08 08:28:46.000000000 -0400
-+++ valgrind-3.10.0/coregrind/m_dispatch/dispatch-amd64-linux.S	2014-09-12 20:49:14.681385751 -0400
-@@ -249,11 +249,11 @@
- 
- .size VG_(disp_run_translations), .-VG_(disp_run_translations)
- 
-+#endif // defined(VGP_amd64_linux)
-+
- /* Let the linker know we don't need an executable stack */
- .section .note.GNU-stack,"",@progbits
- 
--#endif // defined(VGP_amd64_linux)
--
- /*--------------------------------------------------------------------*/
- /*--- end                                                          ---*/
- /*--------------------------------------------------------------------*/
-diff -Naur valgrind-3.10.0.orig/coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.10.0/coregrind/m_dispatch/dispatch-x86-linux.S
---- valgrind-3.10.0.orig/coregrind/m_dispatch/dispatch-x86-linux.S	2014-09-08 08:28:46.000000000 -0400
-+++ valgrind-3.10.0/coregrind/m_dispatch/dispatch-x86-linux.S	2014-09-12 20:49:14.681385751 -0400
-@@ -240,11 +240,11 @@
- 
- .size VG_(disp_run_translations), .-VG_(disp_run_translations)
- 
-+#endif // defined(VGP_x86_linux)
-+
- /* Let the linker know we don't need an executable stack */
- .section .note.GNU-stack,"",@progbits
- 
--#endif // defined(VGP_x86_linux)
--
- /*--------------------------------------------------------------------*/
- /*--- end                                                          ---*/
- /*--------------------------------------------------------------------*/
-diff -Naur valgrind-3.10.0.orig/coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.10.0/coregrind/m_syswrap/syscall-amd64-linux.S
---- valgrind-3.10.0.orig/coregrind/m_syswrap/syscall-amd64-linux.S	2014-09-08 08:28:45.000000000 -0400
-+++ valgrind-3.10.0/coregrind/m_syswrap/syscall-amd64-linux.S	2014-09-12 20:49:14.681385751 -0400
-@@ -205,11 +205,11 @@
- ML_(blksys_finished):	.quad 5b
- .previous
- 
-+#endif // defined(VGP_amd64_linux)
-+
- /* Let the linker know we don't need an executable stack */
- .section .note.GNU-stack,"",@progbits
- 
--#endif // defined(VGP_amd64_linux)
--
- /*--------------------------------------------------------------------*/
- /*--- end                                                          ---*/
- /*--------------------------------------------------------------------*/
-diff -Naur valgrind-3.10.0.orig/coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.10.0/coregrind/m_syswrap/syscall-x86-linux.S
---- valgrind-3.10.0.orig/coregrind/m_syswrap/syscall-x86-linux.S	2014-09-08 08:28:45.000000000 -0400
-+++ valgrind-3.10.0/coregrind/m_syswrap/syscall-x86-linux.S	2014-09-12 20:49:14.681385751 -0400
-@@ -165,11 +165,11 @@
- ML_(blksys_finished):	.long 5b
- .previous
- 	
-+#endif // defined(VGP_x86_linux)
-+
- /* Let the linker know we don't need an executable stack */
- .section .note.GNU-stack,"",@progbits
- 
--#endif // defined(VGP_x86_linux)
--
- /*--------------------------------------------------------------------*/
- /*--- end                                                          ---*/
- /*--------------------------------------------------------------------*/
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-automake-1.11.2.patch b/dev-util/valgrind/files/valgrind-3.7.0-automake-1.11.2.patch
deleted file mode 100644
index b0b57bf3a098..000000000000
--- a/dev-util/valgrind/files/valgrind-3.7.0-automake-1.11.2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Gregorio Guidi <gregorio.guidi@gmail.com>
-
-Retain the old behavior of the build system even with automake 1.11.2.
-
-Reported-by: Oleg Bulatov <dmage@bk.ru>
-X-Gentoo-Bug: 397429
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=397429
-X-KDE-Bug: 290719
-X-KDE-Bug-URL: https://bugs.kde.org/show_bug.cgi?id=290719
-Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-
-diff -Nur valgrind-3.7.0.orig/coregrind/Makefile.am valgrind-3.7.0/coregrind/Makefile.am
---- valgrind-3.7.0.orig/coregrind/Makefile.am	2011-10-27 12:55:06.000000000 +0200
-+++ valgrind-3.7.0/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)
-diff -Nur valgrind-3.7.0.orig/Makefile.am valgrind-3.7.0/Makefile.am
---- valgrind-3.7.0.orig/Makefile.am	2011-10-26 23:24:45.000000000 +0200
-+++ valgrind-3.7.0/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/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch b/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch
deleted file mode 100644
index feabf069354a..000000000000
--- a/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: configure.in
-===================================================================
---- configure.in	(revision 12273)
-+++ configure.in	(revision 12274)
-@@ -98,18 +98,21 @@
- # We don't want gcc < 3.0
- AC_MSG_CHECKING([for a supported version of gcc])
- 
--# Try to get the gcc version, sed-ing out some unexpected stuff
--# that appears with the default gcc on OSX 10.6 and 10.7 respectively.
--# Without this, the version number comes out as 686, 10 or 11 :-(
-+# Obtain the compiler version.
- # 
--# i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3)
--# i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)
-+# A few examples of how the ${CC} --version output looks like:
- #
-+# Arch Linux: i686-pc-linux-gnu-gcc (GCC) 4.6.2
-+# Debian Linux: gcc (Debian 4.3.2-1.1) 4.3.2
-+# openSUSE: gcc (SUSE Linux) 4.5.1 20101208 [gcc-4_5-branch revision 167585]
-+# Exherbo Linux: x86_64-pc-linux-gnu-gcc (Exherbo gcc-4.6.2) 4.6.2
-+# OS/X 10.6: i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3)
-+# OS/X 10.7: i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)
-+# Clang: clang version 2.9 (tags/RELEASE_29/final)
-+#
- [gcc_version=`${CC} --version \
--             | head -n 1 \
--             | $SED 's/i686-apple-darwin10//' \
--             | $SED 's/i686-apple-darwin11//' \
--             | $SED 's/^[^0-9]*\([0-9.]*\).*$/\1/'`]
-+             | $SED -n -e 's/[^ ]*gcc[^ ]* ([^)]*) \([0-9.]*\).*$/\1/p' \
-+                       -e 's/[^ ]*clang version \([0-9.]*\).*$/\1/p'`]
- 
- is_clang="notclang"
- if test "x`${CC} --version | head -n 1 | $SED 's/\(clang\) version.*/\1/'`" = "xclang" ; then
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-glibc-2.15.patch b/dev-util/valgrind/files/valgrind-3.7.0-glibc-2.15.patch
deleted file mode 100644
index f5098a43cf8e..000000000000
--- a/dev-util/valgrind/files/valgrind-3.7.0-glibc-2.15.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur valgrind-3.7.0.orig//configure.in valgrind-3.7.0/configure.in
---- valgrind-3.7.0.orig//configure.in	2012-01-14 17:49:13.000000000 -0500
-+++ valgrind-3.7.0/configure.in	2012-01-14 18:13:45.000000000 -0500
-@@ -778,6 +778,13 @@
- 	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}"
-+	;;
-      darwin)
- 	AC_MSG_RESULT(Darwin)
- 	AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
-@@ -791,7 +798,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.15])
- 	AC_MSG_ERROR([or Darwin libc])
- 	;;
- esac
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack-v2.patch b/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack-v2.patch
deleted file mode 100644
index 90c0bf111146..000000000000
--- a/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack-v2.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-diff -Naur valgrind-3.7.0.orig//coregrind/Makefile.am valgrind-3.7.0/coregrind/Makefile.am
---- valgrind-3.7.0.orig//coregrind/Makefile.am	2011-11-10 20:02:47.000000000 -0500
-+++ valgrind-3.7.0/coregrind/Makefile.am	2011-11-10 20:03:00.000000000 -0500
-@@ -292,14 +292,6 @@
- 	m_demangle/demangle.c \
- 	m_demangle/dyn-string.c \
- 	m_demangle/safe-ctype.c \
--	m_dispatch/dispatch-x86-linux.S \
--	m_dispatch/dispatch-amd64-linux.S \
--	m_dispatch/dispatch-ppc32-linux.S \
--	m_dispatch/dispatch-ppc64-linux.S \
--	m_dispatch/dispatch-arm-linux.S \
--	m_dispatch/dispatch-s390x-linux.S \
--	m_dispatch/dispatch-x86-darwin.S \
--	m_dispatch/dispatch-amd64-darwin.S \
- 	m_gdbserver/m_gdbserver.c \
- 	m_gdbserver/inferiors.c \
- 	m_gdbserver/m_gdbserver.c \
-@@ -322,8 +314,6 @@
- 	m_initimg/initimg-pathscan.c \
- 	m_mach/mach_basics.c \
- 	m_mach/mach_msg.c \
--	m_mach/mach_traps-x86-darwin.S \
--	m_mach/mach_traps-amd64-darwin.S \
- 	m_replacemalloc/replacemalloc_core.c \
- 	m_scheduler/scheduler.c \
- 	m_scheduler/sema.c \
-@@ -335,14 +325,6 @@
- 	m_sigframe/sigframe-s390x-linux.c \
- 	m_sigframe/sigframe-x86-darwin.c \
- 	m_sigframe/sigframe-amd64-darwin.c \
--	m_syswrap/syscall-x86-linux.S \
--	m_syswrap/syscall-amd64-linux.S \
--	m_syswrap/syscall-ppc32-linux.S \
--	m_syswrap/syscall-ppc64-linux.S \
--	m_syswrap/syscall-arm-linux.S \
--	m_syswrap/syscall-s390x-linux.S \
--	m_syswrap/syscall-x86-darwin.S \
--	m_syswrap/syscall-amd64-darwin.S \
- 	m_syswrap/syswrap-main.c \
- 	m_syswrap/syswrap-generic.c \
- 	m_syswrap/syswrap-linux.c \
-@@ -361,6 +343,29 @@
- 	m_ume/main.c \
- 	m_ume/script.c
- 
-+COREGRIND_SOURCES_COMMON += \
-+	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S \
-+	m_syswrap/syscall-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S
-+
-+if VGCONF_HAVE_PLATFORM_SEC
-+COREGRIND_SOURCES_COMMON += \
-+	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S \
-+	m_syswrap/syscall-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S
-+endif
-+
-+if VGCONF_OS_IS_DARWIN
-+COREGRIND_SOURCES_COMMON += \
-+	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-darwin.S \
-+	m_syswrap/syscall-@VGCONF_ARCH_PRI@-darwin.S \
-+	m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S
-+if VGCONF_HAVE_PLATFORM_SEC
-+COREGRIND_SOURCES_COMMON += \
-+	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-darwin.S \
-+	m_syswrap/syscall-@VGCONF_ARCH_SEC@-darwin.S \
-+	m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
-+endif
-+endif
-+
- libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
-     $(COREGRIND_SOURCES_COMMON)
- nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
-diff -Naur valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.7.0/coregrind/m_dispatch/dispatch-amd64-linux.S
---- valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-amd64-linux.S	2011-10-26 17:24:42.000000000 -0400
-+++ valgrind-3.7.0/coregrind/m_dispatch/dispatch-amd64-linux.S	2011-11-10 20:07:40.000000000 -0500
-@@ -349,11 +349,11 @@
- 	ret
- .size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation)
- 
-+#endif // defined(VGP_amd64_linux)
-+
- /* Let the linker know we don't need an executable stack */
- .section .note.GNU-stack,"",@progbits
- 
--#endif // defined(VGP_amd64_linux)
--
- /*--------------------------------------------------------------------*/
- /*--- end                                                          ---*/
- /*--------------------------------------------------------------------*/
-diff -Naur valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.7.0/coregrind/m_dispatch/dispatch-x86-linux.S
---- valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-x86-linux.S	2011-10-26 17:24:42.000000000 -0400
-+++ valgrind-3.7.0/coregrind/m_dispatch/dispatch-x86-linux.S	2011-11-10 20:04:07.000000000 -0500
-@@ -320,12 +320,11 @@
- 	ret
- .size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation)
- 
--			
-+#endif // defined(VGP_x86_linux)
-+
- /* Let the linker know we don't need an executable stack */
- .section .note.GNU-stack,"",@progbits
- 
--#endif // defined(VGP_x86_linux)
--
- /*--------------------------------------------------------------------*/
- /*--- end                                                          ---*/
- /*--------------------------------------------------------------------*/
-diff -Naur valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.7.0/coregrind/m_syswrap/syscall-amd64-linux.S
---- valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-amd64-linux.S	2011-11-10 20:02:47.000000000 -0500
-+++ valgrind-3.7.0/coregrind/m_syswrap/syscall-amd64-linux.S	2011-11-10 20:03:00.000000000 -0500
-@@ -205,11 +205,11 @@
- ML_(blksys_finished):	.quad 5b
- .previous
- 
-+#endif // defined(VGP_amd64_linux)
-+
- /* Let the linker know we don't need an executable stack */
- .section .note.GNU-stack,"",@progbits
- 
--#endif // defined(VGP_amd64_linux)
--
- /*--------------------------------------------------------------------*/
- /*--- end                                                          ---*/
- /*--------------------------------------------------------------------*/
-diff -Naur valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.7.0/coregrind/m_syswrap/syscall-x86-linux.S
---- valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-x86-linux.S	2011-11-10 20:02:47.000000000 -0500
-+++ valgrind-3.7.0/coregrind/m_syswrap/syscall-x86-linux.S	2011-11-10 20:03:00.000000000 -0500
-@@ -164,12 +164,12 @@
- ML_(blksys_committed):	.long 4b
- ML_(blksys_finished):	.long 5b
- .previous
--	
--/* Let the linker know we don't need an executable stack */
--.section .note.GNU-stack,"",@progbits
- 
- #endif // defined(VGP_x86_linux)
- 
-+/* Let the linker know we don't need an executable stack */
-+.section .note.GNU-stack,"",@progbits
-+
- /*--------------------------------------------------------------------*/
- /*--- end                                                          ---*/
- /*--------------------------------------------------------------------*/
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack.patch b/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack.patch
deleted file mode 100644
index d6cc26dab112..000000000000
--- a/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff -Naur valgrind-3.7.0.orig//coregrind/Makefile.am valgrind-3.7.0/coregrind/Makefile.am
---- valgrind-3.7.0.orig//coregrind/Makefile.am	2011-11-10 20:02:47.000000000 -0500
-+++ valgrind-3.7.0/coregrind/Makefile.am	2011-11-10 20:03:00.000000000 -0500
-@@ -292,14 +292,6 @@
- 	m_demangle/demangle.c \
- 	m_demangle/dyn-string.c \
- 	m_demangle/safe-ctype.c \
--	m_dispatch/dispatch-x86-linux.S \
--	m_dispatch/dispatch-amd64-linux.S \
--	m_dispatch/dispatch-ppc32-linux.S \
--	m_dispatch/dispatch-ppc64-linux.S \
--	m_dispatch/dispatch-arm-linux.S \
--	m_dispatch/dispatch-s390x-linux.S \
--	m_dispatch/dispatch-x86-darwin.S \
--	m_dispatch/dispatch-amd64-darwin.S \
- 	m_gdbserver/m_gdbserver.c \
- 	m_gdbserver/inferiors.c \
- 	m_gdbserver/m_gdbserver.c \
-@@ -322,8 +314,6 @@
- 	m_initimg/initimg-pathscan.c \
- 	m_mach/mach_basics.c \
- 	m_mach/mach_msg.c \
--	m_mach/mach_traps-x86-darwin.S \
--	m_mach/mach_traps-amd64-darwin.S \
- 	m_replacemalloc/replacemalloc_core.c \
- 	m_scheduler/scheduler.c \
- 	m_scheduler/sema.c \
-@@ -335,14 +325,6 @@
- 	m_sigframe/sigframe-s390x-linux.c \
- 	m_sigframe/sigframe-x86-darwin.c \
- 	m_sigframe/sigframe-amd64-darwin.c \
--	m_syswrap/syscall-x86-linux.S \
--	m_syswrap/syscall-amd64-linux.S \
--	m_syswrap/syscall-ppc32-linux.S \
--	m_syswrap/syscall-ppc64-linux.S \
--	m_syswrap/syscall-arm-linux.S \
--	m_syswrap/syscall-s390x-linux.S \
--	m_syswrap/syscall-x86-darwin.S \
--	m_syswrap/syscall-amd64-darwin.S \
- 	m_syswrap/syswrap-main.c \
- 	m_syswrap/syswrap-generic.c \
- 	m_syswrap/syswrap-linux.c \
-@@ -361,6 +343,24 @@
- 	m_ume/main.c \
- 	m_ume/script.c
- 
-+COREGRIND_SOURCES_COMMON += \
-+	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S \
-+	m_syswrap/syscall-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S
-+
-+if VGCONF_HAVE_PLATFORM_SEC
-+COREGRIND_SOURCES_COMMON += \
-+	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S \
-+	m_syswrap/syscall-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S
-+endif
-+
-+if VGCONF_OS_IS_DARWIN
-+COREGRIND_SOURCES_COMMON += \
-+	m_start-@VGCONF_ARCH_PRI@-darwin.S \
-+	m_start-@VGCONF_ARCH_SEC@-darwin.S \
-+	m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S \
-+	m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
-+endif
-+
- libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
-     $(COREGRIND_SOURCES_COMMON)
- nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
-diff -Naur valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.7.0/coregrind/m_dispatch/dispatch-amd64-linux.S
---- valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-amd64-linux.S	2011-10-26 17:24:42.000000000 -0400
-+++ valgrind-3.7.0/coregrind/m_dispatch/dispatch-amd64-linux.S	2011-11-10 20:07:40.000000000 -0500
-@@ -349,11 +349,11 @@
- 	ret
- .size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation)
- 
-+#endif // defined(VGP_amd64_linux)
-+
- /* Let the linker know we don't need an executable stack */
- .section .note.GNU-stack,"",@progbits
- 
--#endif // defined(VGP_amd64_linux)
--
- /*--------------------------------------------------------------------*/
- /*--- end                                                          ---*/
- /*--------------------------------------------------------------------*/
-diff -Naur valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.7.0/coregrind/m_dispatch/dispatch-x86-linux.S
---- valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-x86-linux.S	2011-10-26 17:24:42.000000000 -0400
-+++ valgrind-3.7.0/coregrind/m_dispatch/dispatch-x86-linux.S	2011-11-10 20:04:07.000000000 -0500
-@@ -320,12 +320,11 @@
- 	ret
- .size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation)
- 
--			
-+#endif // defined(VGP_x86_linux)
-+
- /* Let the linker know we don't need an executable stack */
- .section .note.GNU-stack,"",@progbits
- 
--#endif // defined(VGP_x86_linux)
--
- /*--------------------------------------------------------------------*/
- /*--- end                                                          ---*/
- /*--------------------------------------------------------------------*/
-diff -Naur valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.7.0/coregrind/m_syswrap/syscall-amd64-linux.S
---- valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-amd64-linux.S	2011-11-10 20:02:47.000000000 -0500
-+++ valgrind-3.7.0/coregrind/m_syswrap/syscall-amd64-linux.S	2011-11-10 20:03:00.000000000 -0500
-@@ -205,11 +205,11 @@
- ML_(blksys_finished):	.quad 5b
- .previous
- 
-+#endif // defined(VGP_amd64_linux)
-+
- /* Let the linker know we don't need an executable stack */
- .section .note.GNU-stack,"",@progbits
- 
--#endif // defined(VGP_amd64_linux)
--
- /*--------------------------------------------------------------------*/
- /*--- end                                                          ---*/
- /*--------------------------------------------------------------------*/
-diff -Naur valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.7.0/coregrind/m_syswrap/syscall-x86-linux.S
---- valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-x86-linux.S	2011-11-10 20:02:47.000000000 -0500
-+++ valgrind-3.7.0/coregrind/m_syswrap/syscall-x86-linux.S	2011-11-10 20:03:00.000000000 -0500
-@@ -164,12 +164,12 @@
- ML_(blksys_committed):	.long 4b
- ML_(blksys_finished):	.long 5b
- .previous
--	
--/* Let the linker know we don't need an executable stack */
--.section .note.GNU-stack,"",@progbits
- 
- #endif // defined(VGP_x86_linux)
- 
-+/* Let the linker know we don't need an executable stack */
-+.section .note.GNU-stack,"",@progbits
-+
- /*--------------------------------------------------------------------*/
- /*--- end                                                          ---*/
- /*--------------------------------------------------------------------*/
diff --git a/dev-util/valgrind/files/valgrind-3.8.0-non-exec-stack.patch b/dev-util/valgrind/files/valgrind-3.8.0-non-exec-stack.patch
deleted file mode 100644
index 66c97764d31b..000000000000
--- a/dev-util/valgrind/files/valgrind-3.8.0-non-exec-stack.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-diff -Naur valgrind-3.8.0.orig//coregrind/Makefile.am valgrind-3.8.0/coregrind/Makefile.am
---- valgrind-3.8.0.orig//coregrind/Makefile.am	2012-08-05 03:47:20.000000000 -0400
-+++ valgrind-3.8.0/coregrind/Makefile.am	2012-08-18 04:14:35.000000000 -0400
-@@ -297,15 +297,6 @@
- 	m_demangle/demangle.c \
- 	m_demangle/dyn-string.c \
- 	m_demangle/safe-ctype.c \
--	m_dispatch/dispatch-x86-linux.S \
--	m_dispatch/dispatch-amd64-linux.S \
--	m_dispatch/dispatch-ppc32-linux.S \
--	m_dispatch/dispatch-ppc64-linux.S \
--	m_dispatch/dispatch-arm-linux.S \
--	m_dispatch/dispatch-s390x-linux.S \
--	m_dispatch/dispatch-mips32-linux.S \
--	m_dispatch/dispatch-x86-darwin.S \
--	m_dispatch/dispatch-amd64-darwin.S \
- 	m_gdbserver/inferiors.c \
- 	m_gdbserver/m_gdbserver.c \
- 	m_gdbserver/regcache.c \
-@@ -327,8 +318,6 @@
- 	m_initimg/initimg-pathscan.c \
- 	m_mach/mach_basics.c \
- 	m_mach/mach_msg.c \
--	m_mach/mach_traps-x86-darwin.S \
--	m_mach/mach_traps-amd64-darwin.S \
- 	m_replacemalloc/replacemalloc_core.c \
- 	m_scheduler/scheduler.c \
- 	m_scheduler/sema.c \
-@@ -343,15 +332,6 @@
- 	m_sigframe/sigframe-mips32-linux.c \
- 	m_sigframe/sigframe-x86-darwin.c \
- 	m_sigframe/sigframe-amd64-darwin.c \
--	m_syswrap/syscall-x86-linux.S \
--	m_syswrap/syscall-amd64-linux.S \
--	m_syswrap/syscall-ppc32-linux.S \
--	m_syswrap/syscall-ppc64-linux.S \
--	m_syswrap/syscall-arm-linux.S \
--	m_syswrap/syscall-s390x-linux.S \
--	m_syswrap/syscall-mips32-linux.S \
--	m_syswrap/syscall-x86-darwin.S \
--	m_syswrap/syscall-amd64-darwin.S \
- 	m_syswrap/syswrap-main.c \
- 	m_syswrap/syswrap-generic.c \
- 	m_syswrap/syswrap-linux.c \
-@@ -371,6 +351,29 @@
- 	m_ume/main.c \
- 	m_ume/script.c
- 
-+COREGRIND_SOURCES_COMMON += \
-+	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S \
-+	m_syswrap/syscall-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S
-+
-+if VGCONF_HAVE_PLATFORM_SEC
-+COREGRIND_SOURCES_COMMON += \
-+	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S \
-+	m_syswrap/syscall-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S
-+endif
-+
-+if VGCONF_OS_IS_DARWIN
-+COREGRIND_SOURCES_COMMON += \
-+	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-darwin.S \
-+	m_syswrap/syscall-@VGCONF_ARCH_PRI@-darwin.S \
-+	m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S
-+if VGCONF_HAVE_PLATFORM_SEC
-+COREGRIND_SOURCES_COMMON += \
-+	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-darwin.S \
-+	m_syswrap/syscall-@VGCONF_ARCH_SEC@-darwin.S \
-+	m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
-+endif
-+endif
-+
- libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
-     $(COREGRIND_SOURCES_COMMON)
- nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
-diff -Naur valgrind-3.8.0.orig//coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.8.0/coregrind/m_dispatch/dispatch-amd64-linux.S
---- valgrind-3.8.0.orig//coregrind/m_dispatch/dispatch-amd64-linux.S	2012-08-05 12:04:11.000000000 -0400
-+++ valgrind-3.8.0/coregrind/m_dispatch/dispatch-amd64-linux.S	2012-08-18 04:15:57.000000000 -0400
-@@ -249,11 +249,11 @@
- 
- .size VG_(disp_run_translations), .-VG_(disp_run_translations)
- 
-+#endif // defined(VGP_amd64_linux)
-+
- /* Let the linker know we don't need an executable stack */
- .section .note.GNU-stack,"",@progbits
- 
--#endif // defined(VGP_amd64_linux)
--
- /*--------------------------------------------------------------------*/
- /*--- end                                                          ---*/
- /*--------------------------------------------------------------------*/
-diff -Naur valgrind-3.8.0.orig//coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.8.0/coregrind/m_dispatch/dispatch-x86-linux.S
---- valgrind-3.8.0.orig//coregrind/m_dispatch/dispatch-x86-linux.S	2012-08-05 12:04:11.000000000 -0400
-+++ valgrind-3.8.0/coregrind/m_dispatch/dispatch-x86-linux.S	2012-08-18 04:16:44.000000000 -0400
-@@ -240,11 +240,11 @@
- 
- .size VG_(disp_run_translations), .-VG_(disp_run_translations)
- 
-+#endif // defined(VGP_x86_linux)
-+
- /* Let the linker know we don't need an executable stack */
- .section .note.GNU-stack,"",@progbits
- 
--#endif // defined(VGP_x86_linux)
--
- /*--------------------------------------------------------------------*/
- /*--- end                                                          ---*/
- /*--------------------------------------------------------------------*/
-diff -Naur valgrind-3.8.0.orig//coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.8.0/coregrind/m_syswrap/syscall-amd64-linux.S
---- valgrind-3.8.0.orig//coregrind/m_syswrap/syscall-amd64-linux.S	2012-08-05 12:04:11.000000000 -0400
-+++ valgrind-3.8.0/coregrind/m_syswrap/syscall-amd64-linux.S	2012-08-18 04:17:21.000000000 -0400
-@@ -205,11 +205,11 @@
- ML_(blksys_finished):	.quad 5b
- .previous
- 
-+#endif // defined(VGP_amd64_linux)
-+
- /* Let the linker know we don't need an executable stack */
- .section .note.GNU-stack,"",@progbits
- 
--#endif // defined(VGP_amd64_linux)
--
- /*--------------------------------------------------------------------*/
- /*--- end                                                          ---*/
- /*--------------------------------------------------------------------*/
-diff -Naur valgrind-3.8.0.orig//coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.8.0/coregrind/m_syswrap/syscall-x86-linux.S
---- valgrind-3.8.0.orig//coregrind/m_syswrap/syscall-x86-linux.S	2012-08-05 12:04:11.000000000 -0400
-+++ valgrind-3.8.0/coregrind/m_syswrap/syscall-x86-linux.S	2012-08-18 04:17:59.000000000 -0400
-@@ -165,11 +165,11 @@
- ML_(blksys_finished):	.long 5b
- .previous
- 	
-+#endif // defined(VGP_x86_linux)
-+
- /* Let the linker know we don't need an executable stack */
- .section .note.GNU-stack,"",@progbits
- 
--#endif // defined(VGP_x86_linux)
--
- /*--------------------------------------------------------------------*/
- /*--- end                                                          ---*/
- /*--------------------------------------------------------------------*/
diff --git a/dev-util/valgrind/files/valgrind-3.8.1-gcc-4.8-memmove.patch b/dev-util/valgrind/files/valgrind-3.8.1-gcc-4.8-memmove.patch
deleted file mode 100644
index 453a67859ee7..000000000000
--- a/dev-util/valgrind/files/valgrind-3.8.1-gcc-4.8-memmove.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: coregrind/m_main.c
-===================================================================
---- coregrind/m_main.c	(revision 13287)
-+++ coregrind/m_main.c	(revision 13288)
-@@ -2636,8 +2636,8 @@
- 
-    From this derive two requirements:
- 
--   1. gcc may emit calls to memcpy and memset to deal with structure
--      assignments etc.  Since we have chosen to ignore all the
-+   1. gcc may emit calls to memcpy, memmove and memset to deal with
-+      structure assignments etc.  Since we have chosen to ignore all the
-       "normal" supporting libraries, we have to provide our own
-       implementations of them.  No problem.
- 
-@@ -2651,6 +2651,10 @@
- void* memcpy(void *dest, const void *src, SizeT n) {
-    return VG_(memcpy)(dest,src,n);
- }
-+void* memmove(void *dest, const void *src, SizeT n);
-+void* memmove(void *dest, const void *src, SizeT n) {
-+   return VG_(memmove)(dest,src,n);
-+}
- void* memset(void *s, int c, SizeT n);
- void* memset(void *s, int c, SizeT n) {
-   return VG_(memset)(s,c,n);
diff --git a/dev-util/valgrind/files/valgrind-3.8.1-glibc-2.17.patch b/dev-util/valgrind/files/valgrind-3.8.1-glibc-2.17.patch
deleted file mode 100644
index 605b80a038e6..000000000000
--- a/dev-util/valgrind/files/valgrind-3.8.1-glibc-2.17.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Nuar valgrind-3.8.1.orig/configure.in valgrind-3.8.1/configure.in
---- valgrind-3.8.1.orig/configure.in	2012-09-18 15:17:32.000000000 -0400
-+++ valgrind-3.8.1/configure.in	2013-02-19 13:00:26.000000000 -0500
-@@ -906,6 +906,13 @@
- 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- 	;;
-+     2.17)
-+	AC_MSG_RESULT(2.17 family)
-+	AC_DEFINE([GLIBC_2_17], 1, [Define to 1 if you're using glibc 2.17.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])
-@@ -919,7 +926,7 @@
- 
-      *)
- 	AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
--	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.16])
-+	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.17])
- 	AC_MSG_ERROR([or Darwin libc])
- 	;;
- esac
diff --git a/dev-util/valgrind/files/valgrind-3.9.0-non-exec-stack.patch b/dev-util/valgrind/files/valgrind-3.9.0-non-exec-stack.patch
deleted file mode 100644
index 41be42aca003..000000000000
--- a/dev-util/valgrind/files/valgrind-3.9.0-non-exec-stack.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-diff -Naur valgrind-3.9.0.orig/coregrind/Makefile.am valgrind-3.9.0/coregrind/Makefile.am
---- valgrind-3.9.0.orig/coregrind/Makefile.am	2013-10-23 06:50:13.000000000 -0400
-+++ valgrind-3.9.0/coregrind/Makefile.am	2013-11-02 19:41:26.984017770 -0400
-@@ -309,16 +309,6 @@
- 	m_demangle/demangle.c \
- 	m_demangle/dyn-string.c \
- 	m_demangle/safe-ctype.c \
--	m_dispatch/dispatch-x86-linux.S \
--	m_dispatch/dispatch-amd64-linux.S \
--	m_dispatch/dispatch-ppc32-linux.S \
--	m_dispatch/dispatch-ppc64-linux.S \
--	m_dispatch/dispatch-arm-linux.S \
--	m_dispatch/dispatch-s390x-linux.S \
--	m_dispatch/dispatch-mips32-linux.S \
--	m_dispatch/dispatch-mips64-linux.S \
--	m_dispatch/dispatch-x86-darwin.S \
--	m_dispatch/dispatch-amd64-darwin.S \
- 	m_gdbserver/inferiors.c \
- 	m_gdbserver/m_gdbserver.c \
- 	m_gdbserver/regcache.c \
-@@ -341,8 +331,6 @@
- 	m_initimg/initimg-pathscan.c \
- 	m_mach/mach_basics.c \
- 	m_mach/mach_msg.c \
--	m_mach/mach_traps-x86-darwin.S \
--	m_mach/mach_traps-amd64-darwin.S \
- 	m_replacemalloc/replacemalloc_core.c \
- 	m_scheduler/scheduler.c \
- 	m_scheduler/sema.c \
-@@ -358,16 +346,6 @@
- 	m_sigframe/sigframe-mips64-linux.c \
- 	m_sigframe/sigframe-x86-darwin.c \
- 	m_sigframe/sigframe-amd64-darwin.c \
--	m_syswrap/syscall-x86-linux.S \
--	m_syswrap/syscall-amd64-linux.S \
--	m_syswrap/syscall-ppc32-linux.S \
--	m_syswrap/syscall-ppc64-linux.S \
--	m_syswrap/syscall-arm-linux.S \
--	m_syswrap/syscall-s390x-linux.S \
--	m_syswrap/syscall-mips32-linux.S \
--	m_syswrap/syscall-mips64-linux.S \
--	m_syswrap/syscall-x86-darwin.S \
--	m_syswrap/syscall-amd64-darwin.S \
- 	m_syswrap/syswrap-main.c \
- 	m_syswrap/syswrap-generic.c \
- 	m_syswrap/syswrap-linux.c \
-@@ -389,6 +367,29 @@
- 	m_ume/main.c \
- 	m_ume/script.c
- 
-+COREGRIND_SOURCES_COMMON += \
-+	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S \
-+	m_syswrap/syscall-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S
-+
-+if VGCONF_HAVE_PLATFORM_SEC
-+COREGRIND_SOURCES_COMMON += \
-+	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S \
-+	m_syswrap/syscall-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S
-+endif
-+
-+if VGCONF_OS_IS_DARWIN
-+COREGRIND_SOURCES_COMMON += \
-+	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-darwin.S \
-+	m_syswrap/syscall-@VGCONF_ARCH_PRI@-darwin.S \
-+	m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S
-+if VGCONF_HAVE_PLATFORM_SEC
-+COREGRIND_SOURCES_COMMON += \
-+	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-darwin.S \
-+	m_syswrap/syscall-@VGCONF_ARCH_SEC@-darwin.S \
-+	m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
-+endif
-+endif
-+
- libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
-     $(COREGRIND_SOURCES_COMMON)
- nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
-diff -Naur valgrind-3.9.0.orig/coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.9.0/coregrind/m_dispatch/dispatch-amd64-linux.S
---- valgrind-3.9.0.orig/coregrind/m_dispatch/dispatch-amd64-linux.S	2013-10-23 06:50:09.000000000 -0400
-+++ valgrind-3.9.0/coregrind/m_dispatch/dispatch-amd64-linux.S	2013-11-02 19:31:54.688991721 -0400
-@@ -249,11 +249,11 @@
- 
- .size VG_(disp_run_translations), .-VG_(disp_run_translations)
- 
-+#endif // defined(VGP_amd64_linux)
-+
- /* Let the linker know we don't need an executable stack */
- .section .note.GNU-stack,"",@progbits
- 
--#endif // defined(VGP_amd64_linux)
--
- /*--------------------------------------------------------------------*/
- /*--- end                                                          ---*/
- /*--------------------------------------------------------------------*/
-diff -Naur valgrind-3.9.0.orig/coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.9.0/coregrind/m_dispatch/dispatch-x86-linux.S
---- valgrind-3.9.0.orig/coregrind/m_dispatch/dispatch-x86-linux.S	2013-10-23 06:50:09.000000000 -0400
-+++ valgrind-3.9.0/coregrind/m_dispatch/dispatch-x86-linux.S	2013-11-02 19:31:54.688991721 -0400
-@@ -240,11 +240,11 @@
- 
- .size VG_(disp_run_translations), .-VG_(disp_run_translations)
- 
-+#endif // defined(VGP_x86_linux)
-+
- /* Let the linker know we don't need an executable stack */
- .section .note.GNU-stack,"",@progbits
- 
--#endif // defined(VGP_x86_linux)
--
- /*--------------------------------------------------------------------*/
- /*--- end                                                          ---*/
- /*--------------------------------------------------------------------*/
-diff -Naur valgrind-3.9.0.orig/coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.9.0/coregrind/m_syswrap/syscall-amd64-linux.S
---- valgrind-3.9.0.orig/coregrind/m_syswrap/syscall-amd64-linux.S	2013-10-23 06:50:12.000000000 -0400
-+++ valgrind-3.9.0/coregrind/m_syswrap/syscall-amd64-linux.S	2013-11-02 19:31:54.689991721 -0400
-@@ -205,11 +205,11 @@
- ML_(blksys_finished):	.quad 5b
- .previous
- 
-+#endif // defined(VGP_amd64_linux)
-+
- /* Let the linker know we don't need an executable stack */
- .section .note.GNU-stack,"",@progbits
- 
--#endif // defined(VGP_amd64_linux)
--
- /*--------------------------------------------------------------------*/
- /*--- end                                                          ---*/
- /*--------------------------------------------------------------------*/
-diff -Naur valgrind-3.9.0.orig/coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.9.0/coregrind/m_syswrap/syscall-x86-linux.S
---- valgrind-3.9.0.orig/coregrind/m_syswrap/syscall-x86-linux.S	2013-10-23 06:50:12.000000000 -0400
-+++ valgrind-3.9.0/coregrind/m_syswrap/syscall-x86-linux.S	2013-11-02 19:31:54.689991721 -0400
-@@ -165,11 +165,11 @@
- ML_(blksys_finished):	.long 5b
- .previous
- 	
-+#endif // defined(VGP_x86_linux)
-+
- /* Let the linker know we don't need an executable stack */
- .section .note.GNU-stack,"",@progbits
- 
--#endif // defined(VGP_x86_linux)
--
- /*--------------------------------------------------------------------*/
- /*--- end                                                          ---*/
- /*--------------------------------------------------------------------*/