From: James Le Cuirot Date: Fri, 4 May 2018 22:54:20 +0000 (+0100) Subject: profiles: CHOST_arm needs to be reset when arm CHOST changes X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d8f68e312ac310f9b632608389a2d6985b97daf0;p=gentoo.git 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 7dede6e9e7d3..75bd5699da21 100644 --- 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 c99eb3fbd66f..da47bc0c518c 100644 --- 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 4c5a401c2205..f539415059d5 100644 --- 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 b85e76c8b446..5475afdc1f4d 100644 --- 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 2ca07ab4130f..e72068d9c3d7 100644 --- 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 c0cb6c11748f..9310aa7711dd 100644 --- 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 c680f6aa2e5a..9310aa7711dd 100644 --- 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 e0e4051efde6..a56035197c43 100644 --- 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 (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 10e4e8d35be2..85682272eded 100644 --- 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 0ac8f14a75a5..397875e9b6bb 100644 --- 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 a551dc5118c0..ae32c6cdd3ae 100644 --- 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 (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 33360a56b8f2..22479baf6f0e 100644 --- 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}"