aboutsummaryrefslogtreecommitdiffstats
path: root/package/devel/valgrind/patches
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-10-19 22:35:27 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-10-19 22:35:27 +0000
commit35232039c0d3b21e40d447970784e464604e3e8a (patch)
tree0903d2906676f28bfc4f5d14359d93fe3e72d52e /package/devel/valgrind/patches
parent939d0869cc40371138a81768ca7d1ddad9fd255e (diff)
downloadupstream-35232039c0d3b21e40d447970784e464604e3e8a.tar.gz
upstream-35232039c0d3b21e40d447970784e464604e3e8a.tar.bz2
upstream-35232039c0d3b21e40d447970784e464604e3e8a.zip
valgrind: update to the latest version, fix musl support
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 42978
Diffstat (limited to 'package/devel/valgrind/patches')
-rw-r--r--package/devel/valgrind/patches/100-fix_configure_check.patch6
-rw-r--r--package/devel/valgrind/patches/120-no_linux_ptrace_h.patch10
-rw-r--r--package/devel/valgrind/patches/200-musl_fix.patch45
3 files changed, 48 insertions, 13 deletions
diff --git a/package/devel/valgrind/patches/100-fix_configure_check.patch b/package/devel/valgrind/patches/100-fix_configure_check.patch
index b06cc3bf71..87ef3b39fc 100644
--- a/package/devel/valgrind/patches/100-fix_configure_check.patch
+++ b/package/devel/valgrind/patches/100-fix_configure_check.patch
@@ -1,6 +1,6 @@
---- a/configure.in
-+++ b/configure.in
-@@ -260,7 +260,7 @@ case "${host_os}" in
+--- a/configure.ac
++++ b/configure.ac
+@@ -300,7 +300,7 @@ case "${host_os}" in
# Ok, this is linux. Check the kernel version
AC_MSG_CHECKING([for the kernel version])
diff --git a/package/devel/valgrind/patches/120-no_linux_ptrace_h.patch b/package/devel/valgrind/patches/120-no_linux_ptrace_h.patch
deleted file mode 100644
index f159876dbc..0000000000
--- a/package/devel/valgrind/patches/120-no_linux_ptrace_h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/coregrind/vgdb.c
-+++ b/coregrind/vgdb.c
-@@ -102,7 +102,6 @@ I_die_here : (PTRACEINVOKER) architectur
- #include <sys/user.h>
- #if defined(VGO_linux)
- # include <sys/prctl.h>
--# include <linux/ptrace.h>
- #endif
- #endif
-
diff --git a/package/devel/valgrind/patches/200-musl_fix.patch b/package/devel/valgrind/patches/200-musl_fix.patch
new file mode 100644
index 0000000000..7bb20296d3
--- /dev/null
+++ b/package/devel/valgrind/patches/200-musl_fix.patch
@@ -0,0 +1,45 @@
+--- a/coregrind/vg_preloaded.c
++++ b/coregrind/vg_preloaded.c
+@@ -56,7 +56,7 @@
+ void VG_NOTIFY_ON_LOAD(freeres)( void );
+ void VG_NOTIFY_ON_LOAD(freeres)( void )
+ {
+-# if !defined(__UCLIBC__) \
++# if !defined(__UCLIBC__) && defined(__GLIBC__) \
+ && !defined(VGPV_arm_linux_android) && !defined(VGPV_x86_linux_android) \
+ && !defined(VGPV_mips32_linux_android)
+ extern void __libc_freeres(void);
+--- a/include/pub_tool_redir.h
++++ b/include/pub_tool_redir.h
+@@ -241,7 +241,7 @@
+ /* --- Soname of the standard C library. --- */
+
+ #if defined(VGO_linux)
+-# define VG_Z_LIBC_SONAME libcZdsoZa // libc.so*
++# define VG_Z_LIBC_SONAME libcZdZa // libc.*
+
+ #elif defined(VGO_darwin) && (DARWIN_VERS <= DARWIN_10_6)
+ # define VG_Z_LIBC_SONAME libSystemZdZaZddylib // libSystem.*.dylib
+@@ -273,7 +273,11 @@
+ /* --- Soname of the pthreads library. --- */
+
+ #if defined(VGO_linux)
++# if defined(__GLIBC__) || defined(__UCLIBC__)
+ # define VG_Z_LIBPTHREAD_SONAME libpthreadZdsoZd0 // libpthread.so.0
++# else
++# define VG_Z_LIBPTHREAD_SONAME libcZdZa // libc.*
++# endif
+ #elif defined(VGO_darwin)
+ # define VG_Z_LIBPTHREAD_SONAME libSystemZdZaZddylib // libSystem.*.dylib
+ #else
+--- a/configure.ac
++++ b/configure.ac
+@@ -1031,8 +1031,6 @@ case "${GLIBC_VERSION}" in
+
+ *)
+ AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
+- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.19])
+- AC_MSG_ERROR([or Darwin or Bionic libc])
+ ;;
+ esac
+