- fix valgrind patches

make/target-development.mk

@@ -3,7 +3,7 @@
 #
 # -----------------------------------------------------------------------------
 
-VALGRIND_TARGET = $(if $(filter $(BOXSERIES), hd1), valgrind12305, valgrind3)
+VALGRIND_TARGET = $(if $(filter $(BOXMODEL), nevis), valgrind12305, valgrind3)
 
 valgrind: $(VALGRIND_TARGET)
 	$(TOUCH)
@@ -18,7 +18,7 @@ VALGRIND_URL    = ftp://sourceware.org/pub/valgrind
 $(ARCHIVE)/$(VALGRIND_SOURCE):
 	$(DOWNLOAD) $(VALGRIND_URL)/$(VALGRIND_SOURCE)
 
-VALGRIND_PATCH  = valgrind-fix-build-$(BOXSERIES).patch
+VALGRIND_PATCH  = valgrind-fix-build-$(TARGET_ARCH).patch
 
 valgrind3: $(ARCHIVE)/$(VALGRIND_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(VALGRIND_TMP)

patches/valgrind-fix-build-hd2.patch → patches/valgrind-fix-build-armv7-a.patch

@@ -2,7 +2,7 @@ From f0b4fd4d1c96b77cbf6c881b7d2d29882a05ab89 Mon Sep 17 00:00:00 2001
 Message-Id: <f0b4fd4d1c96b77cbf6c881b7d2d29882a05ab89.1509108332.git.thomas.harfmann@gmail.com>
 From: gixxpunk <thomas.harfmann@gmail.com>
 Date: Fri, 27 Oct 2017 14:45:27 +0200
-Subject: [PATCH] - valgrind-fix-build-hd2
+Subject: [PATCH] - valgrind-fix-build-armv7-a
 
 ---
  Makefile.all.am | 6 +++---

patches/valgrind-fix-build-bre2ze4k.patch → patches/valgrind-fix-build-armv7ve.patch

@@ -2,7 +2,7 @@ From 9901cac770d0d81ccf1ee8e5a02abf54d18e3a04 Mon Sep 17 00:00:00 2001
 Message-Id: <9901cac770d0d81ccf1ee8e5a02abf54d18e3a04.1509108606.git.thomas.harfmann@gmail.com>
 From: gixxpunk <thomas.harfmann@gmail.com>
 Date: Fri, 27 Oct 2017 14:50:01 +0200
-Subject: [PATCH] - valgrind-fix-build-hd51
+Subject: [PATCH] - valgrind-fix-build-armv7ve
 
 ---
  Makefile.all.am | 6 +++---

patches/valgrind-fix-build-hd51.patch

@@ -1,46 +0,0 @@
-From 9901cac770d0d81ccf1ee8e5a02abf54d18e3a04 Mon Sep 17 00:00:00 2001
-Message-Id: <9901cac770d0d81ccf1ee8e5a02abf54d18e3a04.1509108606.git.thomas.harfmann@gmail.com>
-From: gixxpunk <thomas.harfmann@gmail.com>
-Date: Fri, 27 Oct 2017 14:50:01 +0200
-Subject: [PATCH] - valgrind-fix-build-hd51
-
----
- Makefile.all.am | 6 +++---
- configure.ac    | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile.all.am b/Makefile.all.am
-index 1859a51..648a197 100644
---- a/Makefile.all.am
-+++ b/Makefile.all.am
-@@ -199,11 +199,11 @@ AM_CCASFLAGS_PPC64LE_LINUX  = @FLAG_M64@ -g
- 
- AM_FLAG_M3264_ARM_LINUX   = @FLAG_M32@
- AM_CFLAGS_ARM_LINUX       = @FLAG_M32@ \
--			 	$(AM_CFLAGS_BASE) -marm -mcpu=cortex-a8
-+			 	$(AM_CFLAGS_BASE) -mlittle-endian -march=armv7ve -mtune=cortex-a15 -mfpu=neon-vfpv4 -mhard-float
- AM_CFLAGS_PSO_ARM_LINUX   = @FLAG_M32@ $(AM_CFLAGS_BASE) \
--				-marm -mcpu=cortex-a8 $(AM_CFLAGS_PSO_BASE)
-+				-mlittle-endian -march=armv7ve -mtune=cortex-a15 -mfpu=neon-vfpv4 -mhard-float $(AM_CFLAGS_PSO_BASE)
- AM_CCASFLAGS_ARM_LINUX    = @FLAG_M32@ \
--				-marm -mcpu=cortex-a8 -g
-+				-mlittle-endian -march=armv7ve -mtune=cortex-a15 -mfpu=neon-vfpv4 -mhard-float -g
- 
- AM_FLAG_M3264_ARM64_LINUX = @FLAG_M64@
- AM_CFLAGS_ARM64_LINUX     = @FLAG_M64@ $(AM_CFLAGS_BASE)
-diff --git a/configure.ac b/configure.ac
-index 3874296..0fc12f7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -234,7 +234,7 @@ case "${host_cpu}" in
-         ARCH_MAX="s390x"
-         ;;
- 
--     armv7*)
-+     arm*)
- 	AC_MSG_RESULT([ok (${host_cpu})])
- 	ARCH_MAX="arm"
- 	;;
--- 
-2.15.0.rc2
-