summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com>2017-08-09 11:11:30 +0200
committerAnthony G. Basile <blueness@gentoo.org>2017-08-09 08:18:29 -0400
commitd3cbd9d03ed37de94df83f45a4535ce3f7391542 (patch)
tree266925b9375455640f00434d508ee866a483717f /dev-util/valgrind
parentnet-libs/mbedtls: remove unused patches (diff)
downloadgentoo-d3cbd9d03ed37de94df83f45a4535ce3f7391542.tar.gz
gentoo-d3cbd9d03ed37de94df83f45a4535ce3f7391542.tar.bz2
gentoo-d3cbd9d03ed37de94df83f45a4535ce3f7391542.zip
dev-util/valgrind: remove unused patches
Diffstat (limited to 'dev-util/valgrind')
-rw-r--r--dev-util/valgrind/files/valgrind-3.10.1-glibc-2.21.patch17
-rw-r--r--dev-util/valgrind/files/valgrind-3.10.1-glibc-2.22.patch17
-rw-r--r--dev-util/valgrind/files/valgrind-3.10.1-linux-4.patch29
-rw-r--r--dev-util/valgrind/files/valgrind-3.10.1-non-exec-stack.patch148
-rw-r--r--dev-util/valgrind/files/valgrind-3.11.0-non-exec-stack.patch154
-rw-r--r--dev-util/valgrind/files/valgrind-3.6.0-local-labels.patch24
-rw-r--r--dev-util/valgrind/files/valgrind-3.9.0-glibc-2.19.patch37
7 files changed, 0 insertions, 426 deletions
diff --git a/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.21.patch b/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.21.patch
deleted file mode 100644
index 286e431b0dd6..000000000000
--- a/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.21.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur valgrind-3.10.1.orig/configure.ac valgrind-3.10.1/configure.ac
---- valgrind-3.10.1.orig/configure.ac 2014-11-25 14:41:13.000000000 -0500
-+++ valgrind-3.10.1/configure.ac 2015-07-28 22:35:22.315604804 -0400
-@@ -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/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.22.patch b/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.22.patch
deleted file mode 100644
index aa44aec4a571..000000000000
--- a/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.22.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur valgrind-3.10.1.orig/configure.ac valgrind-3.10.1/configure.ac
---- valgrind-3.10.1.orig/configure.ac 2016-04-16 04:24:22.285314910 -0400
-+++ valgrind-3.10.1/configure.ac 2016-04-16 04:39:03.437329726 -0400
-@@ -1032,6 +1032,13 @@
- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- ;;
-+ 2.22)
-+ AC_MSG_RESULT(2.22 family)
-+ AC_DEFINE([GLIBC_2_22], 1, [Define to 1 if you're using glibc 2.22.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/dev-util/valgrind/files/valgrind-3.10.1-linux-4.patch b/dev-util/valgrind/files/valgrind-3.10.1-linux-4.patch
deleted file mode 100644
index 63918c2c1d0e..000000000000
--- a/dev-util/valgrind/files/valgrind-3.10.1-linux-4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ecb3746d69820905c076b89e1be7042f52ceaa5f Mon Sep 17 00:00:00 2001
-From: Janne Grunau <j@jannau.net>
-Date: Thu, 19 Mar 2015 22:44:51 +0100
-Subject: [PATCH 1/1] configure: support linux 4.*
-
-There is nothing special in linux 4.0. Handle it as another 3.* (or
-another 2.6.*) release. Compare changeset 14955 in valgrind's
-subversion repository. Valgrind trunk also drops support for linux 2.4
-but there is no need to do that for realeased software.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0fd2a41..33c7954 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -303,7 +303,7 @@ case "${host_os}" in
- 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])
- ;;
---
-2.3.3
-
diff --git a/dev-util/valgrind/files/valgrind-3.10.1-non-exec-stack.patch b/dev-util/valgrind/files/valgrind-3.10.1-non-exec-stack.patch
deleted file mode 100644
index e25de99e7902..000000000000
--- a/dev-util/valgrind/files/valgrind-3.10.1-non-exec-stack.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-diff -Naur valgrind-3.10.1.orig/coregrind/Makefile.am valgrind-3.10.1/coregrind/Makefile.am
---- valgrind-3.10.1.orig/coregrind/Makefile.am 2014-11-25 14:41:19.000000000 -0500
-+++ valgrind-3.10.1/coregrind/Makefile.am 2014-11-26 13:36:44.113678744 -0500
-@@ -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.1.orig/coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.10.1/coregrind/m_dispatch/dispatch-amd64-linux.S
---- valgrind-3.10.1.orig/coregrind/m_dispatch/dispatch-amd64-linux.S 2014-11-25 14:41:20.000000000 -0500
-+++ valgrind-3.10.1/coregrind/m_dispatch/dispatch-amd64-linux.S 2014-11-26 13:30:11.840660890 -0500
-@@ -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.1.orig/coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.10.1/coregrind/m_dispatch/dispatch-x86-linux.S
---- valgrind-3.10.1.orig/coregrind/m_dispatch/dispatch-x86-linux.S 2014-11-25 14:41:20.000000000 -0500
-+++ valgrind-3.10.1/coregrind/m_dispatch/dispatch-x86-linux.S 2014-11-26 13:30:11.840660890 -0500
-@@ -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.1.orig/coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.10.1/coregrind/m_syswrap/syscall-amd64-linux.S
---- valgrind-3.10.1.orig/coregrind/m_syswrap/syscall-amd64-linux.S 2014-11-25 14:41:20.000000000 -0500
-+++ valgrind-3.10.1/coregrind/m_syswrap/syscall-amd64-linux.S 2014-11-26 13:30:11.840660890 -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.10.1.orig/coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.10.1/coregrind/m_syswrap/syscall-x86-linux.S
---- valgrind-3.10.1.orig/coregrind/m_syswrap/syscall-x86-linux.S 2014-11-25 14:41:20.000000000 -0500
-+++ valgrind-3.10.1/coregrind/m_syswrap/syscall-x86-linux.S 2014-11-26 13:30:11.840660890 -0500
-@@ -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.11.0-non-exec-stack.patch b/dev-util/valgrind/files/valgrind-3.11.0-non-exec-stack.patch
deleted file mode 100644
index b5c151a8ed96..000000000000
--- a/dev-util/valgrind/files/valgrind-3.11.0-non-exec-stack.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-diff -Naur valgrind-3.11.0.orig/coregrind/Makefile.am valgrind-3.11.0/coregrind/Makefile.am
---- valgrind-3.11.0.orig/coregrind/Makefile.am 2015-09-08 09:23:26.000000000 -0400
-+++ valgrind-3.11.0/coregrind/Makefile.am 2015-09-26 06:52:04.226983707 -0400
-@@ -354,21 +354,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-tilegx-linux.S \
-- m_dispatch/dispatch-x86-darwin.S \
-- m_dispatch/dispatch-amd64-darwin.S \
-- m_dispatch/dispatch-x86-solaris.S \
-- m_dispatch/dispatch-amd64-solaris.S \
- m_gdbserver/inferiors.c \
- m_gdbserver/m_gdbserver.c \
- m_gdbserver/regcache.c \
-@@ -394,8 +379,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/sched-lock.c \
- m_scheduler/sched-lock-generic.c \
-@@ -415,21 +398,6 @@
- m_sigframe/sigframe-x86-darwin.c \
- m_sigframe/sigframe-amd64-darwin.c \
- m_sigframe/sigframe-solaris.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-tilegx-linux.S \
-- m_syswrap/syscall-x86-darwin.S \
-- m_syswrap/syscall-amd64-darwin.S \
-- m_syswrap/syscall-x86-solaris.S \
-- m_syswrap/syscall-amd64-solaris.S \
- m_syswrap/syswrap-main.c \
- m_syswrap/syswrap-generic.c \
- m_syswrap/syswrap-linux.c \
-@@ -456,6 +424,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.11.0.orig/coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.11.0/coregrind/m_dispatch/dispatch-amd64-linux.S
---- valgrind-3.11.0.orig/coregrind/m_dispatch/dispatch-amd64-linux.S 2015-09-08 09:23:26.000000000 -0400
-+++ valgrind-3.11.0/coregrind/m_dispatch/dispatch-amd64-linux.S 2015-09-26 06:46:20.103000200 -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.11.0.orig/coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.11.0/coregrind/m_dispatch/dispatch-x86-linux.S
---- valgrind-3.11.0.orig/coregrind/m_dispatch/dispatch-x86-linux.S 2015-09-08 09:23:26.000000000 -0400
-+++ valgrind-3.11.0/coregrind/m_dispatch/dispatch-x86-linux.S 2015-09-26 06:46:20.103000200 -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.11.0.orig/coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.11.0/coregrind/m_syswrap/syscall-amd64-linux.S
---- valgrind-3.11.0.orig/coregrind/m_syswrap/syscall-amd64-linux.S 2015-09-08 09:23:26.000000000 -0400
-+++ valgrind-3.11.0/coregrind/m_syswrap/syscall-amd64-linux.S 2015-09-26 06:46:20.103000200 -0400
-@@ -244,11 +244,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.11.0.orig/coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.11.0/coregrind/m_syswrap/syscall-x86-linux.S
---- valgrind-3.11.0.orig/coregrind/m_syswrap/syscall-x86-linux.S 2015-09-08 09:23:26.000000000 -0400
-+++ valgrind-3.11.0/coregrind/m_syswrap/syscall-x86-linux.S 2015-09-26 06:46:20.103000200 -0400
-@@ -184,11 +184,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.6.0-local-labels.patch b/dev-util/valgrind/files/valgrind-3.6.0-local-labels.patch
deleted file mode 100644
index 68e682255611..000000000000
--- a/dev-util/valgrind/files/valgrind-3.6.0-local-labels.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- coregrind/m_libcassert.c 2010-10-21 04:19:45.000000000 +0800
-+++ coregrind/m_libcassert.c 2010-10-24 20:23:17.800001876 +0800
-@@ -81,8 +81,8 @@
- { UInt cia, r1, lr; \
- __asm__ __volatile__( \
- "mflr 0;" /* r0 = lr */ \
-- "bl m_libcassert_get_ip;" /* lr = pc */ \
-- "m_libcassert_get_ip:\n" \
-+ "bl 0f;" /* lr = pc */ \
-+ "0:\n" \
- "mflr %0;" /* %0 = pc */ \
- "mtlr 0;" /* restore lr */ \
- "mr %1,1;" /* %1 = r1 */ \
-@@ -100,8 +100,8 @@
- { ULong cia, r1, lr; \
- __asm__ __volatile__( \
- "mflr 0;" /* r0 = lr */ \
-- "bl .m_libcassert_get_ip;" /* lr = pc */ \
-- ".m_libcassert_get_ip:\n" \
-+ "bl 0f;" /* lr = pc */ \
-+ "0:\n" \
- "mflr %0;" /* %0 = pc */ \
- "mtlr 0;" /* restore lr */ \
- "mr %1,1;" /* %1 = r1 */ \
diff --git a/dev-util/valgrind/files/valgrind-3.9.0-glibc-2.19.patch b/dev-util/valgrind/files/valgrind-3.9.0-glibc-2.19.patch
deleted file mode 100644
index 79a3283c9c13..000000000000
--- a/dev-util/valgrind/files/valgrind-3.9.0-glibc-2.19.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur valgrind-3.9.0-orig/configure valgrind-3.9.0/configure
---- valgrind-3.9.0-orig/configure 2013-11-01 09:33:32.000000000 +1000
-+++ valgrind-3.9.0/configure 2014-02-08 09:28:06.063248544 +1000
-@@ -6689,6 +6689,16 @@
- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- ;;
-+ 2.19)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.19 family" >&5
-+$as_echo "2.19 family" >&6; }
-+
-+$as_echo "#define GLIBC_2_19 1" >>confdefs.h
-+
-+ 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)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
- $as_echo "Darwin" >&6; }
-diff -Naur valgrind-3.9.0-orig/configure.ac valgrind-3.9.0/configure.ac
---- valgrind-3.9.0-orig/configure.ac 2013-11-01 09:28:16.000000000 +1000
-+++ valgrind-3.9.0/configure.ac 2014-02-08 09:27:38.870385366 +1000
-@@ -918,6 +918,13 @@
- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- ;;
-+ 2.19)
-+ AC_MSG_RESULT(2.19 family)
-+ AC_DEFINE([GLIBC_2_19], 1, [Define to 1 if you're using glibc 2.19.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])