From: James Le Cuirot <chewi@gentoo.org>
Date: Fri, 4 May 2018 22:57:30 +0000 (+0100)
Subject: profiles: Use *eabihf on arm hardfloat triplets for 17.0 onwards
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=26a471c23be476600eecbc5ae8582eba94b9acfe;p=gentoo.git

profiles: Use *eabihf on arm hardfloat triplets for 17.0 onwards

13.0 is now the exception, which sets it back to the old value.

Bug: https://bugs.gentoo.org/602440
---

diff --git a/profiles/arch/arm/armv6j/make.defaults b/profiles/arch/arm/armv6j/make.defaults
index 5475afdc1f4d..f23e0de09e37 100644
--- a/profiles/arch/arm/armv6j/make.defaults
+++ b/profiles/arch/arm/armv6j/make.defaults
@@ -1,4 +1,4 @@
-CHOST="armv6j-hardfloat-linux-gnueabi"
+CHOST="armv6j-unknown-linux-gnueabihf"
 CHOST_arm="${CHOST}"
 
 CFLAGS="-O2 -pipe -march=armv6j"
diff --git a/profiles/arch/arm/armv7a/make.defaults b/profiles/arch/arm/armv7a/make.defaults
index e72068d9c3d7..525a73346b19 100644
--- a/profiles/arch/arm/armv7a/make.defaults
+++ b/profiles/arch/arm/armv7a/make.defaults
@@ -1,4 +1,4 @@
-CHOST="armv7a-hardfloat-linux-gnueabi"
+CHOST="armv7a-unknown-linux-gnueabihf"
 CHOST_arm="${CHOST}"
 
 CFLAGS="-O2 -pipe -march=armv7-a"
diff --git a/profiles/default/linux/arm/13.0/armv6j/make.defaults b/profiles/default/linux/arm/13.0/armv6j/make.defaults
new file mode 100644
index 000000000000..88750c055d7d
--- /dev/null
+++ b/profiles/default/linux/arm/13.0/armv6j/make.defaults
@@ -0,0 +1,2 @@
+CHOST="armv6j-hardfloat-linux-gnueabi"
+CHOST_arm="${CHOST}"
diff --git a/profiles/default/linux/arm/13.0/armv7a/make.defaults b/profiles/default/linux/arm/13.0/armv7a/make.defaults
new file mode 100644
index 000000000000..dd7639e152d5
--- /dev/null
+++ b/profiles/default/linux/arm/13.0/armv7a/make.defaults
@@ -0,0 +1,2 @@
+CHOST="armv7a-hardfloat-linux-gnueabi"
+CHOST_arm="${CHOST}"
diff --git a/profiles/default/linux/arm/17.0/musl/armv7a/make.defaults b/profiles/default/linux/arm/17.0/musl/armv7a/make.defaults
index 9310aa7711dd..608aa101c645 100644
--- a/profiles/default/linux/arm/17.0/musl/armv7a/make.defaults
+++ b/profiles/default/linux/arm/17.0/musl/armv7a/make.defaults
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
-CHOST="armv7a-hardfloat-linux-musleabi"
+CHOST="armv7a-unknown-linux-musleabihf"
 CHOST_arm="${CHOST}"
 
 CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"