From f67a8a56dd7ca94ef11567595a43b379ab73bed7 Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@gmail.com>
Date: Tue, 12 Apr 2016 01:35:34 +0100
Subject: Add armv7hl config

---
 configure.ac | 11 +++++++++++
 rpmrc.in     | 13 +++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0af9b49..da1728a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,6 +91,11 @@ case "${target_cpu}" in
     RPMALLARCH="arml armv4tl armv5tl armv5tel armv7l"
     CANONTARGETCPU=armv7l
     CANONTARGETGNU=-gnueabi
+    ;;
+    armv7hl)
+    RPMALLARCH="armv7hl"
+    CANONTARGETCPU=armv7hl
+    CANONTARGETGNU=-gnueabihf
 esac
 RPMALLARCH="${RPMALLARCH} noarch"
 AC_SUBST(RPMALLARCH)
@@ -107,6 +112,12 @@ fi
 if echo "$build_os" | grep '.*-gnu' > /dev/null ; then
     build_os=`echo "${build_os}" | sed 's/-gnu$//'`
 fi
+if echo "$build_os" | grep '.*-gnueabi' > /dev/null ; then
+    build_os=`echo "${build_os}" | sed 's/-gnueabi$//'`
+fi
+if echo "$build_os" | grep '.*-gnueabihf' > /dev/null ; then
+    build_os=`echo "${build_os}" | sed 's/-gnueabihf$//'`
+fi
 
 changequote(<, >)
 build_os_exact="${build_os}"
diff --git a/rpmrc.in b/rpmrc.in
index 3b89636..bc4bef5 100644
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -64,6 +64,9 @@ optflags: armv5tl %{__common_cflags} -march=armv5t
 # Cortex A8
 optflags: armv7l %{__common_cflags} -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp
 
+optflags: armv7hl %{__common_cflags} -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16
+optflags: armv7hnl %{__common_cflags} -march=armv7-a -mfloat-abi=hard -mfpu=neon
+
 optflags: atarist %{__common_cflags} -fomit-frame-pointer
 optflags: atariste %{__common_cflags} -fomit-frame-pointer
 optflags: ataritt %{__common_cflags} -fomit-frame-pointer
@@ -99,10 +102,12 @@ buildarchtranslate: i486: i486
 buildarchtranslate: i386: i386
 buildarchtranslate: i386: i386
 
-buildarchtranslate: armv5tel armv5tl
-buildarchtranslate: armv7l armv5tl
-buildarchtranslate: armv5t armv5t
-buildarchtranslate: armv7 armv5t
+buildarchtranslate: armv5tel: armv5tl
+buildarchtranslate: armv5t: armv5t
+buildarchtranslate: armv7: armv5t
+buildarchtranslate: armv7l: armv7hl
+buildarchtranslate: armv7hl: armv7hl
+buildarchtranslate: armv7hnl: armv7hl
 
 #############################################################
 # Architecture compatibility
-- 
cgit v1.2.1