From 4c377896ca6167f5791ee4f8194a1d12e0a643ec Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Wed, 16 Mar 2016 17:54:21 +0100
Subject: valgrind: add backport patch from svn for correct mips linking

---
 package/valgrind/Makefile                          |  2 +-
 package/valgrind/patches/patch-configure_ac        | 11 ++++++++-
 .../patches/patch-coregrind_link_tool_exe_linux_in | 28 ++++++++++++++++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 package/valgrind/patches/patch-coregrind_link_tool_exe_linux_in

(limited to 'package')

diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile
index fdda95828..6df8c788b 100644
--- a/package/valgrind/Makefile
+++ b/package/valgrind/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		valgrind
 PKG_VERSION:=		3.11.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_HASH:=		6c396271a8c1ddd5a6fb9abe714ea1e8a86fce85b30ab26b4266aeb4c2413b42
 PKG_DESCR:=		memory management debugging tool
 PKG_SECTION:=		app/debug
diff --git a/package/valgrind/patches/patch-configure_ac b/package/valgrind/patches/patch-configure_ac
index 63ed72c6b..9310c5a8b 100644
--- a/package/valgrind/patches/patch-configure_ac
+++ b/package/valgrind/patches/patch-configure_ac
@@ -1,5 +1,14 @@
 --- 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
++++ valgrind-3.11.0/configure.ac	2016-03-16 17:50:58.000000000 +0100
+@@ -234,7 +234,7 @@ case "${host_cpu}" in
+         ARCH_MAX="s390x"
+         ;;
+ 
+-     armv7*)
++     arm*)
+ 	AC_MSG_RESULT([ok (${host_cpu})])
+ 	ARCH_MAX="arm"
+ 	;;
 @@ -1066,8 +1066,6 @@ case "${GLIBC_VERSION}" in
  	;;
       2.0|2.1|*)
diff --git a/package/valgrind/patches/patch-coregrind_link_tool_exe_linux_in b/package/valgrind/patches/patch-coregrind_link_tool_exe_linux_in
new file mode 100644
index 000000000..9d3e85dc0
--- /dev/null
+++ b/package/valgrind/patches/patch-coregrind_link_tool_exe_linux_in
@@ -0,0 +1,28 @@
+--- valgrind-3.11.0.orig/coregrind/link_tool_exe_linux.in	2015-09-08 15:23:27.000000000 +0200
++++ valgrind-3.11.0/coregrind/link_tool_exe_linux.in	2016-03-15 15:35:20.000000000 +0100
+@@ -69,24 +69,7 @@ shift; # Remove $ala from @ARGV
+ die "Bogus alt-load address"
+     if (length($ala) < 3 || index($ala, "0x") != 0);
+ 
+-# For mips32 or mips64 we need to use "--section-start=.reginfo=$ala" or
+-# "--section-start=.MIPS.options=$ala" respectively, because "-Ttext=$ala" will
+-# not put all the sections to the specificed address ($ala).
+-my $x = `cat ../config.log 2>&1 | grep host_cpu= | sed "s/host_cpu='//g"`;
+-my $arch = substr($x, 0, index($x, "'"));
+-
+-my $extra_args;
+-if (($arch eq 'mips') || ($arch eq 'mipsel')
+-    || ($arch eq 'mipsisa32r2el')) {
+-   $extra_args = "-static -Wl,--section-start=.reginfo=$ala";
+-} elsif (($arch eq 'mips64') || ($arch eq 'mips64el') ||
+-         ($arch eq 'mipsisa64el')) {
+-   $extra_args = "-static -Wl,--section-start=.MIPS.options=$ala";
+-} else {
+-   $extra_args = "-static -Wl,@FLAG_T_TEXT@=$ala";
+-}
+-
+-my $cmd = join(" ", @ARGV, $extra_args);
++my $cmd = join(" ", @ARGV, "-static -Wl,@FLAG_T_TEXT@=$ala");
+ 
+ #print "link_tool_exe_linux: $cmd\n";
+ 
-- 
cgit v1.2.3