valgrind: fix kernel version handling

 * add upstream patch for Linux 3.x
 * add cache variable for kernel version

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

7 files changed, 102 insertions, 28 deletions

diff --git a/patches/valgrind-3.6.1/0001-configure-allow-all-arm-don-t-restrict-to-armv7.patch b/patches/valgrind-3.6.1/0001-configure-allow-all-arm-don-t-restrict-to-armv7.patch
deleted file mode 100644
index b2fe6c255..000000000
--- a/patches/valgrind-3.6.1/0001-configure-allow-all-arm-don-t-restrict-to-armv7.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Wed, 8 Jun 2011 00:58:59 +0200
-Subject: [PATCH] configure: allow all arm, don't restrict to armv7
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- configure |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure b/configure
-index 699137b..1179122 100755
---- a/configure
-+++ b/configure
-@@ -5262,7 +5262,7 @@ $as_echo "ok (${host_cpu})" >&6; }
-         esac
-         ;;
- 
--     armv7*)
-+     arm*)
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (${host_cpu})" >&5
- $as_echo "ok (${host_cpu})" >&6; }
- 	ARCH_MAX="arm"
--- 
-1.7.4.1
-
diff --git a/patches/valgrind-3.6.1/0001-configure.in-allow-all-arm-don-t-restrict-to-armv7.patch b/patches/valgrind-3.6.1/0001-configure.in-allow-all-arm-don-t-restrict-to-armv7.patch
new file mode 100644
index 000000000..d24b0f161
--- /dev/null
+++ b/patches/valgrind-3.6.1/0001-configure.in-allow-all-arm-don-t-restrict-to-armv7.patch
@@ -0,0 +1,24 @@
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Wed, 8 Jun 2011 00:58:59 +0200
+Subject: [PATCH] configure.in: allow all arm, don't restrict to armv7
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+[mol: change configure.in not configure]
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 3878619..6674f9d 100644
+--- a/configure.in
++++ b/configure.in
+@@ -158,7 +158,7 @@ case "${host_cpu}" in
+         esac
+         ;;
+ 
+-     armv7*)
++     arm*)
+ 	AC_MSG_RESULT([ok (${host_cpu})])
+ 	ARCH_MAX="arm"
+ 	;;
diff --git a/patches/valgrind-3.6.1/0002-Make-Valgrind-build-on-Linux-kernel-3.0-and-beyond.patch b/patches/valgrind-3.6.1/0002-Make-Valgrind-build-on-Linux-kernel-3.0-and-beyond.patch
new file mode 100644
index 000000000..c889a1d3e
--- /dev/null
+++ b/patches/valgrind-3.6.1/0002-Make-Valgrind-build-on-Linux-kernel-3.0-and-beyond.patch
@@ -0,0 +1,28 @@
+From: bart <bart@a5019735-40e9-0310-863c-91ae7b9d1cf9>
+Date: Sun, 5 Jun 2011 08:51:47 +0000
+Subject: [PATCH] Make Valgrind build on Linux kernel 3.0 and beyond
+
+Closes #274926. An official statement that the Linux kernel 3.0 API and ABI is
+compatible with Linux kernel 2.6 can be found here:
+http://lkml.org/lkml/2011/5/29/204.
+
+From svn://svn.valgrind.org/valgrind/trunk r11796
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 6674f9d..36fe45f 100644
+--- a/configure.in
++++ b/configure.in
+@@ -220,7 +220,7 @@ case "${host_os}" in
+         kernel=`uname -r`
+ 
+         case "${kernel}" in
+-             2.6.*) 
++             2.6.*|3.*)
+         	    AC_MSG_RESULT([2.6 family (${kernel})])
+         	    AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x])
+         	    ;;
diff --git a/patches/valgrind-3.6.1/0003-make-kernel-version-a-autoconf-cache-variable.patch b/patches/valgrind-3.6.1/0003-make-kernel-version-a-autoconf-cache-variable.patch
new file mode 100644
index 000000000..5980b1e29
--- /dev/null
+++ b/patches/valgrind-3.6.1/0003-make-kernel-version-a-autoconf-cache-variable.patch
@@ -0,0 +1,41 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 8 Aug 2011 08:57:32 +0200
+Subject: [PATCH] make kernel version a autoconf cache variable
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure.in |   11 ++++++-----
+ 1 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 36fe45f..9845dd3 100644
+--- a/configure.in
++++ b/configure.in
+@@ -217,21 +217,22 @@ case "${host_os}" in
+         # Ok, this is linux. Check the kernel version
+         AC_MSG_CHECKING([for the kernel version])
+ 
+-        kernel=`uname -r`
++        AC_CACHE_VAL([valgrind_cv_sys_kernel_version],
++          [valgrind_cv_sys_kernel_version=`uname -r`])
+ 
+-        case "${kernel}" in
++        case "${valgrind_cv_sys_kernel_version}" in
+              2.6.*|3.*)
+-        	    AC_MSG_RESULT([2.6 family (${kernel})])
++        	    AC_MSG_RESULT([2.6 family (${valgrind_cv_sys_kernel_version})])
+         	    AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x])
+         	    ;;
+ 
+              2.4.*) 
+-        	    AC_MSG_RESULT([2.4 family (${kernel})])
++        	    AC_MSG_RESULT([2.4 family (${valgrind_cv_sys_kernel_version})])
+         	    AC_DEFINE([KERNEL_2_4], 1, [Define to 1 if you're using Linux 2.4.x])
+         	    ;;
+ 
+              *) 
+-        	    AC_MSG_RESULT([unsupported (${kernel})])
++        	    AC_MSG_RESULT([unsupported (${valgrind_cv_sys_kernel_version})])
+         	    AC_MSG_ERROR([Valgrind works on kernels 2.4, 2.6])
+         	    ;;
+         esac
diff --git a/patches/valgrind-3.6.1/autogen.sh b/patches/valgrind-3.6.1/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/valgrind-3.6.1/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/valgrind-3.6.1/series b/patches/valgrind-3.6.1/series
index 4db899dd7..82c2d66f6 100644
--- a/patches/valgrind-3.6.1/series
+++ b/patches/valgrind-3.6.1/series
@@ -1,3 +1,6 @@
 # generated by git-ptx-patches
-0001-configure-allow-all-arm-don-t-restrict-to-armv7.patch
-# bfabec993b2d4636784bbd5fd034c019  - git-ptx-patches magic
+#tag:base --start-number 1
+0001-configure.in-allow-all-arm-don-t-restrict-to-armv7.patch
+0002-Make-Valgrind-build-on-Linux-kernel-3.0-and-beyond.patch
+0003-make-kernel-version-a-autoconf-cache-variable.patch
+# db8148e32489c8bfc4bac8eb1ee71e88  - git-ptx-patches magic
diff --git a/rules/valgrind.make b/rules/valgrind.make
index 4468600e0..7fa78e83a 100644
--- a/rules/valgrind.make
+++ b/rules/valgrind.make
@@ -41,7 +41,9 @@ $(VALGRIND_SOURCE):
 # ----------------------------------------------------------------------------
 
 VALGRIND_PATH	:= PATH=$(CROSS_PATH)
-VALGRIND_ENV 	:= $(CROSS_ENV)
+VALGRIND_ENV	:= \
+	$(CROSS_ENV) \
+	valgrind_cv_sys_kernel_version=$(KERNEL_HEADER_VERSION)
 
 #
 # autoconf