diff options
| -rw-r--r-- | package/valgrind/Makefile | 8 | ||||
| -rw-r--r-- | package/valgrind/patches/patch-Makefile_am | 10 | ||||
| -rw-r--r-- | package/valgrind/patches/patch-configure_ac | 96 | ||||
| -rw-r--r-- | package/valgrind/patches/patch-coregrind_Makefile_am | 10 | ||||
| -rw-r--r-- | package/valgrind/patches/patch-coregrind_m_redir_c | 35 | ||||
| -rw-r--r-- | package/valgrind/patches/patch-coregrind_vg_preloaded_c | 11 | ||||
| -rw-r--r-- | package/valgrind/patches/patch-include_pub_tool_redir_h | 20 |
7 files changed, 42 insertions, 148 deletions
diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile index bd7d33490..b0f7626a3 100644 --- a/package/valgrind/Makefile +++ b/package/valgrind/Makefile @@ -4,10 +4,10 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= valgrind -PKG_VERSION:= 3.9.0 -PKG_RELEASE:= 2 -PKG_HASH:= e6af71a06bc2534541b07743e1d58dc3caf744f38205ca3e5b5a0bdf372ed6f0 -PKG_DESCR:= memory management debugging +PKG_VERSION:= 3.11.0 +PKG_RELEASE:= 1 +PKG_HASH:= 6c396271a8c1ddd5a6fb9abe714ea1e8a86fce85b30ab26b4266aeb4c2413b42 +PKG_DESCR:= memory management debugging tool PKG_SECTION:= app/debug PKG_URL:= http://valgrind.org/ PKG_SITES:= http://valgrind.org/downloads/ diff --git a/package/valgrind/patches/patch-Makefile_am b/package/valgrind/patches/patch-Makefile_am deleted file mode 100644 index 9dd9e396b..000000000 --- a/package/valgrind/patches/patch-Makefile_am +++ /dev/null @@ -1,10 +0,0 @@ ---- valgrind-3.9.0.orig/Makefile.am 2013-10-23 12:50:02.000000000 +0200 -+++ valgrind-3.9.0/Makefile.am 2013-11-03 15:52:11.000000000 +0100 -@@ -4,7 +4,6 @@ AUTOMAKE_OPTIONS = foreign 1.10 dist-bzi - include $(top_srcdir)/Makefile.all.am - - TOOLS = memcheck \ -- cachegrind \ - callgrind \ - massif \ - lackey \ diff --git a/package/valgrind/patches/patch-configure_ac b/package/valgrind/patches/patch-configure_ac index 1e5eb9f6a..63ed72c6b 100644 --- a/package/valgrind/patches/patch-configure_ac +++ b/package/valgrind/patches/patch-configure_ac @@ -1,93 +1,11 @@ ---- valgrind-3.9.0.orig/configure.ac 2013-11-01 00:28:16.000000000 +0100 -+++ valgrind-3.9.0/configure.ac 2014-05-19 19:33:23.000000000 +0200 -@@ -155,6 +155,7 @@ esac - # configure-time, and distinguishes them from the VGA_*/VGO_*/VGP_* - # variables used when compiling C files. - -+VGCONF_PLATFORM_ARM_ARCH= - AC_CANONICAL_HOST - - AC_MSG_CHECKING([for a supported CPU]) -@@ -191,8 +192,18 @@ case "${host_cpu}" in - ;; - - armv7*) -+ # This means we use a armv7 toolchain - at least Cortex-A8 - AC_MSG_RESULT([ok (${host_cpu})]) - ARCH_MAX="arm" -+ VGCONF_PLATFORM_ARM_ARCH="-march=armv7 -mcpu=cortex-a8" -+ ;; -+ -+ arm*) -+ # Generic arm toolchain - we will target armv6 -+ AC_MSG_RESULT([(${host_cpu}) - no armv7 toolchain specified, will enforce armv6 when compiling]) -+ ARCH_MAX="arm" -+ VGCONF_PLATFORM_ARM_ARCH="-march=armv6" -+ AC_DEFINE(ARM_ARCH_V6,1,"Defined for v6 architectures") - ;; - - mips) -@@ -225,6 +236,8 @@ case "${host_cpu}" in - ;; - esac - -+AC_SUBST(VGCONF_PLATFORM_ARM_ARCH) -+ - #---------------------------------------------------------------------------- - - # Sometimes it's convenient to subvert the bi-arch build system and -@@ -273,7 +286,7 @@ case "${host_os}" in - # Ok, this is linux. Check the kernel version - AC_MSG_CHECKING([for the kernel version]) - -- kernel=`uname -r` -+ kernel=3.13 - - case "${kernel}" in - 2.6.*|3.*) -@@ -792,6 +805,15 @@ AC_EGREP_CPP([BIONIC_LIBC], [ - ], - GLIBC_VERSION="bionic") - -+# not really a version check -+AC_EGREP_CPP([MUSL_LIBC], [ -+#if defined(__MUSL__) -+ MUSL_LIBC -+#endif -+], -+GLIBC_VERSION="musl") -+ -+ - - AC_MSG_CHECKING([the GLIBC_VERSION version]) - -@@ -918,6 +940,13 @@ case "${GLIBC_VERSION}" in - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" +--- valgrind-3.11.0.orig/configure.ac 2015-09-22 22:26:31.000000000 +0200 ++++ valgrind-3.11.0/configure.ac 2016-01-16 20:25:46.275096899 +0100 +@@ -1066,8 +1066,6 @@ case "${GLIBC_VERSION}" in ;; -+ 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]) -@@ -928,10 +957,13 @@ case "${GLIBC_VERSION}" in - AC_DEFINE([BIONIC_LIBC], 1, [Define to 1 if you're using Bionic]) - DEFAULT_SUPP="bionic.supp ${DEFAULT_SUPP}" - ;; -- -+ musl) -+ AC_MSG_RESULT(musl) -+ AC_DEFINE([MUSL_LIBC], 1, [Define to 1 if you're using musl]) -+ ;; - *) + 2.0|2.1|*) AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) -- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.17]) -+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.18]) - AC_MSG_ERROR([or Darwin libc]) +- AC_MSG_ERROR([Valgrind requires glibc version 2.2 or later,]) +- AC_MSG_ERROR([Darwin libc, Bionic libc or Solaris libc]) ;; esac + diff --git a/package/valgrind/patches/patch-coregrind_Makefile_am b/package/valgrind/patches/patch-coregrind_Makefile_am deleted file mode 100644 index 833f3188f..000000000 --- a/package/valgrind/patches/patch-coregrind_Makefile_am +++ /dev/null @@ -1,10 +0,0 @@ ---- valgrind-3.9.0.orig/coregrind/Makefile.am 2013-10-23 12:50:13.000000000 +0200 -+++ valgrind-3.9.0/coregrind/Makefile.am 2013-11-03 17:38:51.000000000 +0100 -@@ -299,7 +299,6 @@ COREGRIND_SOURCES_COMMON = \ - m_debuginfo/readelf.c \ - m_debuginfo/readmacho.c \ - m_debuginfo/readpdb.c \ -- m_debuginfo/readstabs.c \ - m_debuginfo/storage.c \ - m_debuginfo/tytypes.c \ - m_debuginfo/image.c \ diff --git a/package/valgrind/patches/patch-coregrind_m_redir_c b/package/valgrind/patches/patch-coregrind_m_redir_c deleted file mode 100644 index d03512762..000000000 --- a/package/valgrind/patches/patch-coregrind_m_redir_c +++ /dev/null @@ -1,35 +0,0 @@ ---- valgrind-3.9.0.orig/coregrind/m_redir.c 2013-10-23 12:50:14.000000000 +0200 -+++ valgrind-3.9.0/coregrind/m_redir.c 2013-11-07 14:34:44.000000000 +0100 -@@ -1214,9 +1214,6 @@ void VG_(redir_initialise) ( void ) - add_hardwired_spec( - "ld-linux.so.2", "index", - (Addr)&VG_(x86_linux_REDIR_FOR_index), mandatory); -- add_hardwired_spec( -- "ld-linux.so.2", "strlen", -- (Addr)&VG_(x86_linux_REDIR_FOR_strlen), mandatory); - } - - # elif defined(VGP_amd64_linux) -@@ -1236,22 +1233,6 @@ void VG_(redir_initialise) ( void ) - - /* If we're using memcheck, use these intercepts right from - the start, otherwise ld.so makes a lot of noise. */ -- if (0==VG_(strcmp)("Memcheck", VG_(details).name)) { -- -- add_hardwired_spec( -- "ld-linux-x86-64.so.2", "strlen", -- (Addr)&VG_(amd64_linux_REDIR_FOR_strlen), --# if defined(GLIBC_2_2) || defined(GLIBC_2_3) || defined(GLIBC_2_4) \ -- || defined(GLIBC_2_5) || defined(GLIBC_2_6) || defined(GLIBC_2_7) \ -- || defined(GLIBC_2_8) || defined(GLIBC_2_9) -- NULL --# else -- /* for glibc-2.10 and later, this is mandatory - can't sanely -- continue without it */ -- complain_about_stripped_glibc_ldso --# endif -- ); -- } - - # elif defined(VGP_ppc32_linux) - /* If we're using memcheck, use these intercepts right from diff --git a/package/valgrind/patches/patch-coregrind_vg_preloaded_c b/package/valgrind/patches/patch-coregrind_vg_preloaded_c new file mode 100644 index 000000000..f0d4b18dd --- /dev/null +++ b/package/valgrind/patches/patch-coregrind_vg_preloaded_c @@ -0,0 +1,11 @@ +--- valgrind-3.11.0.orig/coregrind/vg_preloaded.c 2015-09-08 15:23:26.000000000 +0200 ++++ valgrind-3.11.0/coregrind/vg_preloaded.c 2016-01-16 20:25:46.275096899 +0100 +@@ -56,7 +56,7 @@ + void VG_NOTIFY_ON_LOAD(freeres)( void ); + void VG_NOTIFY_ON_LOAD(freeres)( void ) + { +-# if !defined(__UCLIBC__) \ ++# if defined(__GLIBC__) \ + && !defined(VGPV_arm_linux_android) \ + && !defined(VGPV_x86_linux_android) \ + && !defined(VGPV_mips32_linux_android) \ diff --git a/package/valgrind/patches/patch-include_pub_tool_redir_h b/package/valgrind/patches/patch-include_pub_tool_redir_h new file mode 100644 index 000000000..3256a1ce2 --- /dev/null +++ b/package/valgrind/patches/patch-include_pub_tool_redir_h @@ -0,0 +1,20 @@ +--- valgrind-3.11.0.orig/include/pub_tool_redir.h 2015-09-08 15:23:26.000000000 +0200 ++++ valgrind-3.11.0/include/pub_tool_redir.h 2016-01-16 20:25:46.275096899 +0100 +@@ -242,7 +242,7 @@ + /* --- Soname of the standard C library. --- */ + + #if defined(VGO_linux) || defined(VGO_solaris) +-# 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 +@@ -274,7 +274,7 @@ + /* --- Soname of the pthreads library. --- */ + + #if defined(VGO_linux) +-# define VG_Z_LIBPTHREAD_SONAME libpthreadZdsoZd0 // libpthread.so.0 ++# define VG_Z_LIBPTHREAD_SONAME libcZdZa // libc.* + #elif defined(VGO_darwin) + # define VG_Z_LIBPTHREAD_SONAME libSystemZdZaZddylib // libSystem.*.dylib + #elif defined(VGO_solaris) |