profiles: CHOST_arm needs to be reset when arm CHOST changes

diff --git a/profiles/arch/arm/armv4/make.defaults b/profiles/arch/arm/armv4/make.defaults
index 7dede6e9e7d3b756825752d10fa20aef62a5701e..75bd5699da216a478f4006a1795a73eeabe4a7f1 100644 (file)
--- a/profiles/arch/arm/armv4/make.defaults
+++ b/profiles/arch/arm/armv4/make.defaults
@@ -1,4 +1,6 @@
 CHOST="armv4l-unknown-linux-gnu"
+CHOST_arm="${CHOST}"
+
 CFLAGS="-O2 -pipe -march=armv4"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"

diff --git a/profiles/arch/arm/armv4t/make.defaults b/profiles/arch/arm/armv4t/make.defaults
index c99eb3fbd66fe076802624ad48a789aebea0df6b..da47bc0c518c6091d86ba42892e0a79772ae0aac 100644 (file)
--- a/profiles/arch/arm/armv4t/make.defaults
+++ b/profiles/arch/arm/armv4t/make.defaults
@@ -1,4 +1,6 @@
 CHOST="armv4tl-softfloat-linux-gnueabi"
+CHOST_arm="${CHOST}"
+
 CFLAGS="-O2 -pipe -march=armv4t"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"

diff --git a/profiles/arch/arm/armv5te/make.defaults b/profiles/arch/arm/armv5te/make.defaults
index 4c5a401c2205d884963faed651078dda87d41419..f539415059d58ce6e04deee668151cbd8666f541 100644 (file)
--- a/profiles/arch/arm/armv5te/make.defaults
+++ b/profiles/arch/arm/armv5te/make.defaults
@@ -1,4 +1,6 @@
 CHOST="armv5tel-softfloat-linux-gnueabi"
+CHOST_arm="${CHOST}"
+
 CFLAGS="-O2 -pipe -march=armv5te"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"

diff --git a/profiles/arch/arm/armv6j/make.defaults b/profiles/arch/arm/armv6j/make.defaults
index b85e76c8b446d68ab6fccf876436634d7637fc5d..5475afdc1f4d7254e72665fda559c4f11c5ffb9c 100644 (file)
--- a/profiles/arch/arm/armv6j/make.defaults
+++ b/profiles/arch/arm/armv6j/make.defaults
@@ -1,4 +1,6 @@
 CHOST="armv6j-hardfloat-linux-gnueabi"
+CHOST_arm="${CHOST}"
+
 CFLAGS="-O2 -pipe -march=armv6j"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"

diff --git a/profiles/arch/arm/armv7a/make.defaults b/profiles/arch/arm/armv7a/make.defaults
index 2ca07ab4130ffb44d7cf51d32f5091ebd59249ab..e72068d9c3d7c1107d7c9412ae59101f9ea1c5b1 100644 (file)
--- a/profiles/arch/arm/armv7a/make.defaults
+++ b/profiles/arch/arm/armv7a/make.defaults
@@ -1,4 +1,6 @@
 CHOST="armv7a-hardfloat-linux-gnueabi"
+CHOST_arm="${CHOST}"
+
 CFLAGS="-O2 -pipe -march=armv7-a"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"

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 c0cb6c11748feb6c2b40c8da188641a248a5006b..9310aa7711ddaa9cfbe85cf0d36e5d0f8b9dce07 100644 (file)
--- a/profiles/default/linux/arm/17.0/musl/armv7a/make.defaults
+++ b/profiles/default/linux/arm/17.0/musl/armv7a/make.defaults
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 CHOST="armv7a-hardfloat-linux-musleabi"
+CHOST_arm="${CHOST}"
+
 CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"

diff --git a/profiles/default/linux/musl/arm/armv7a/make.defaults b/profiles/default/linux/musl/arm/armv7a/make.defaults
index c680f6aa2e5ae377f8ca20f0fea2abb482bf904f..9310aa7711ddaa9cfbe85cf0d36e5d0f8b9dce07 100644 (file)
--- a/profiles/default/linux/musl/arm/armv7a/make.defaults
+++ b/profiles/default/linux/musl/arm/armv7a/make.defaults
@@ -1,7 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
 CHOST="armv7a-hardfloat-linux-musleabi"
+CHOST_arm="${CHOST}"
+
 CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"

diff --git a/profiles/default/linux/musl/arm/make.defaults b/profiles/default/linux/musl/arm/make.defaults
index e0e4051efde662714179293614131bd0d2ba2a1e..a56035197c4335696289699b717a184e1b6fe58c 100644 (file)
--- a/profiles/default/linux/musl/arm/make.defaults
+++ b/profiles/default/linux/musl/arm/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
 ARCH="arm"
@@ -9,6 +9,7 @@ CFLAGS="-O2"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
 FCFLAGS="${CFLAGS}"
+CHOST_arm="${CHOST}"
 
 # Anthony G. Basile <blueness@gentoo.org> (25 Oct 2015)
 # Multilib-related setup, bug #515130

diff --git a/profiles/default/linux/uclibc/arm/armv6j/make.defaults b/profiles/default/linux/uclibc/arm/armv6j/make.defaults
index 10e4e8d35be2643521126f9eaa0317f14e02fc04..85682272eded7dd0a9b68e54837cd76171cc1ea8 100644 (file)
--- a/profiles/default/linux/uclibc/arm/armv6j/make.defaults
+++ b/profiles/default/linux/uclibc/arm/armv6j/make.defaults
@@ -1,7 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
 CHOST="armv6j-hardfloat-linux-uclibceabi"
+CHOST_arm="${CHOST}"
+
 CFLAGS="-O2 -pipe -march=armv6j -mfpu=vfp -mfloat-abi=hard"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"

diff --git a/profiles/default/linux/uclibc/arm/armv7a/make.defaults b/profiles/default/linux/uclibc/arm/armv7a/make.defaults
index 0ac8f14a75a5e806e8bc71b323dd72a5419747f9..397875e9b6bb42332cdd00488f2a840dd5f62604 100644 (file)
--- a/profiles/default/linux/uclibc/arm/armv7a/make.defaults
+++ b/profiles/default/linux/uclibc/arm/armv7a/make.defaults
@@ -1,7 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
 CHOST="armv7a-hardfloat-linux-uclibceabi"
+CHOST_arm="${CHOST}"
+
 CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"

diff --git a/profiles/default/linux/uclibc/arm/make.defaults b/profiles/default/linux/uclibc/arm/make.defaults
index a551dc5118c02b00b96e41e1bdfd60de9875aea9..ae32c6cdd3ae7cc317be6572a1dd87c74de0600b 100644 (file)
--- a/profiles/default/linux/uclibc/arm/make.defaults
+++ b/profiles/default/linux/uclibc/arm/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
 ARCH="arm"
@@ -9,6 +9,7 @@ CFLAGS="-O2"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
 FCFLAGS="${CFLAGS}"
+CHOST_arm="${CHOST}"
 
 # Anthony G. Basile <blueness@gentoo.org> (25 Oct 2015)
 # Multilib-related setup, bug #515130

diff --git a/profiles/prefix/linux/arm/make.defaults b/profiles/prefix/linux/arm/make.defaults
index 33360a56b8f2b7c50e191e32ac5d7fe76a60d21b..22479baf6f0e9dbb235355382e1837ee72582d35 100644 (file)
--- a/profiles/prefix/linux/arm/make.defaults
+++ b/profiles/prefix/linux/arm/make.defaults
@@ -1,6 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 ARCH="arm"
 # This is a pretty specific profile to the armv7 arch, we can change that later
 CHOST="armv7a-softfloat-linux-gnueabi"
+CHOST_arm="${CHOST}"