From d693f9692a97af3ba94d3ff8458ab1bc2aefcb78 Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Wed, 1 Feb 2012 14:11:24 +0100
Subject: [PATCH] [armv7l/portage] split make.conf (supporting both FPU ABI)

---
 conf/armv7l/portage/env/neon.conf                   |  2 +-
 conf/armv7l/portage/env/xbmc.conf                   |  2 +-
 conf/armv7l/portage/{make.conf => make.conf.common} | 10 ----------
 conf/armv7l/portage/make.conf.hardfp                | 11 +++++++++++
 conf/armv7l/portage/make.conf.softfp                | 10 ++++++++++
 5 files changed, 23 insertions(+), 12 deletions(-)
 rename conf/armv7l/portage/{make.conf => make.conf.common} (67%)
 create mode 100644 conf/armv7l/portage/make.conf.hardfp
 create mode 100644 conf/armv7l/portage/make.conf.softfp

diff --git a/conf/armv7l/portage/env/neon.conf b/conf/armv7l/portage/env/neon.conf
index a7463a9..046752f 100644
--- a/conf/armv7l/portage/env/neon.conf
+++ b/conf/armv7l/portage/env/neon.conf
@@ -1,3 +1,3 @@
 # Enable NEON when it's possible without breaking qemu-user chroot
-CFLAGS="-O2 -ftree-vectorize -pipe -march=armv7-a -mfpu=neon -mfloat-abi=hard ${GRAPHITE}"
+CFLAGS="-O2 -ftree-vectorize -pipe -march=armv7-a -mfpu=neon ${FPUABI} ${GRAPHITE}"
 CXXFLAGS="${CFLAGS}"
diff --git a/conf/armv7l/portage/env/xbmc.conf b/conf/armv7l/portage/env/xbmc.conf
index e82040d..73fbb5c 100644
--- a/conf/armv7l/portage/env/xbmc.conf
+++ b/conf/armv7l/portage/env/xbmc.conf
@@ -1,3 +1,3 @@
 # We want NEON for xbmc, and also, mfpu=vfpv3-d16 breaks compilation due to broken inline asm
-CFLAGS="-O2 -ftree-vectorize -pipe -march=armv7-a -mfpu=neon -mfloat-abi=hard ${GRAPHITE}"
+CFLAGS="-O2 -ftree-vectorize -pipe -march=armv7-a -mfpu=neon ${FPUABI} ${GRAPHITE}"
 CXXFLAGS="${CFLAGS}"
diff --git a/conf/armv7l/portage/make.conf b/conf/armv7l/portage/make.conf.common
similarity index 67%
rename from conf/armv7l/portage/make.conf
rename to conf/armv7l/portage/make.conf.common
index 7d670b6..9d42bc2 100644
--- a/conf/armv7l/portage/make.conf
+++ b/conf/armv7l/portage/make.conf.common
@@ -1,10 +1,3 @@
-# Compiler configuration
-GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block"
-CFLAGS="-O2 -ftree-vectorize -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard ${GRAPHITE}"
-CXXFLAGS="${CFLAGS}"
-LDFLAGS="-Wl,-O1 -Wl,--as-needed"
-CHOST="armv7a-hardfloat-linux-gnueabi"
-
 # Portage configuration
 ACCEPT_KEYWORDS="~arm arm"
 FEATURES="ccache distcc distcc-pump parallel-fetch protect-owned splitdebug"
@@ -28,6 +21,3 @@ APACHE2_MPMS="prefork"
 # Filter out crap from packages
 INSTALL_MASK="usr/share/gtk-doc/html/*"
 PKG_INSTALL_MASK="${INSTALL_MASK}"
-
-source /var/lib/layman/make.conf
-
diff --git a/conf/armv7l/portage/make.conf.hardfp b/conf/armv7l/portage/make.conf.hardfp
new file mode 100644
index 0000000..5c6f953
--- /dev/null
+++ b/conf/armv7l/portage/make.conf.hardfp
@@ -0,0 +1,11 @@
+GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block"
+FPUABI="-mfloat-abi=hard"
+
+CFLAGS="-O2 -ftree-vectorize -pipe -march=armv7-a -mfpu=vfpv3-d16 ${FPUABI} ${GRAPHITE}"
+CXXFLAGS="${CFLAGS}"
+LDFLAGS="-Wl,-O1 -Wl,--as-needed"
+CHOST="armv7a-hardfloat-linux-gnueabi"
+
+source /etc/make.conf.common
+source /var/lib/layman/make.conf
+
diff --git a/conf/armv7l/portage/make.conf.softfp b/conf/armv7l/portage/make.conf.softfp
new file mode 100644
index 0000000..57bd960
--- /dev/null
+++ b/conf/armv7l/portage/make.conf.softfp
@@ -0,0 +1,10 @@
+GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block"
+FPUABI="-mfloat-abi=softfp"
+
+CFLAGS="-O2 -ftree-vectorize -pipe -march=armv7-a -mfpu=vfpv3-d16 ${FPUABI} ${GRAPHITE}"
+CXXFLAGS="${CFLAGS}"
+LDFLAGS="-Wl,-O1 -Wl,--as-needed"
+CHOST="armv7a-unknown-linux-gnueabi"
+
+source /etc/make.conf.common
+source /var/lib/layman/make.conf