profiles/prefix/darwin: define CHOST_<ABI> for llvm

diff --git a/profiles/prefix/darwin/macos/10.10/x64/make.defaults b/profiles/prefix/darwin/macos/10.10/x64/make.defaults
index 020901043602620c7264dd6de176beaa4e0354f7..71591b9128143ae88f72845d9e6cc886df103714 100644 (file)
--- a/profiles/prefix/darwin/macos/10.10/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/10.10/x64/make.defaults
@@ -1,10 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-ARCH="x64-macos"
 CHOST="x86_64-apple-darwin14"
-ACCEPT_KEYWORDS="~x64-macos"
-
-USE="mmx mmxext sse sse2"
-CPU_FLAGS_X86="mmx mmxext sse sse2"
+CHOST_amd64="${CHOST}"

diff --git a/profiles/prefix/darwin/macos/10.10/x86/make.defaults b/profiles/prefix/darwin/macos/10.10/x86/make.defaults
index c372b5cae740f8ff1f0881cfaa42bb227dcd930f..99b9e28ea4977ea5a24e9594414fe05747661f94 100644 (file)
--- a/profiles/prefix/darwin/macos/10.10/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/10.10/x86/make.defaults
@@ -1,10 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-ARCH="x86-macos"
 CHOST="i686-apple-darwin14"
-ACCEPT_KEYWORDS="~x86-macos"
-
-USE="mmx mmxext sse sse2"
-CPU_FLAGS_X86="mmx mmxext sse sse2"
+CHOST_x86="${CHOST}"

diff --git a/profiles/prefix/darwin/macos/10.11/x64/make.defaults b/profiles/prefix/darwin/macos/10.11/x64/make.defaults
index b9464e7a2a0ed1f49398e8e3686e0347cabd98a6..8ca84707faae66a3ad85d41757175807032ff633 100644 (file)
--- a/profiles/prefix/darwin/macos/10.11/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/10.11/x64/make.defaults
@@ -1,10 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-ARCH="x64-macos"
 CHOST="x86_64-apple-darwin15"
-ACCEPT_KEYWORDS="~x64-macos"
-
-USE="mmx mmxext sse sse2"
-CPU_FLAGS_X86="mmx mmxext sse sse2"
+CHOST_amd64="${CHOST}"

diff --git a/profiles/prefix/darwin/macos/10.11/x86/make.defaults b/profiles/prefix/darwin/macos/10.11/x86/make.defaults
index 2e9a6dee39d3cc53e298ce1df21f8a3dde95e013..bdcf0372a7c8657335835a3cb2361a6e1dc45a83 100644 (file)
--- a/profiles/prefix/darwin/macos/10.11/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/10.11/x86/make.defaults
@@ -1,10 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-ARCH="x86-macos"
 CHOST="i686-apple-darwin15"
-ACCEPT_KEYWORDS="~x86-macos"
-
-USE="mmx mmxext sse sse2"
-CPU_FLAGS_X86="mmx mmxext sse sse2"
+CHOST_x86="${CHOST}"

diff --git a/profiles/prefix/darwin/macos/10.12/x64/make.defaults b/profiles/prefix/darwin/macos/10.12/x64/make.defaults
index 05c94818ade2f0a4002b7336c9f5c2b083c25d75..8abc6aeaa48f8e6a130aa9a687cc3649993e0bb4 100644 (file)
--- a/profiles/prefix/darwin/macos/10.12/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/10.12/x64/make.defaults
@@ -2,9 +2,5 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-ARCH="x64-macos"
 CHOST="x86_64-apple-darwin16"
-ACCEPT_KEYWORDS="~x64-macos"
-
-USE="mmx mmxext sse sse2"
-CPU_FLAGS_X86="mmx mmxext sse sse2"
+CHOST_amd64="${CHOST}"

diff --git a/profiles/prefix/darwin/macos/10.12/x86/make.defaults b/profiles/prefix/darwin/macos/10.12/x86/make.defaults
index a85c683229705750fe5097334e4c869eb7a65754..0ea641e1e301fb5e04ab2f3e5789b5d4547f7a6d 100644 (file)
--- a/profiles/prefix/darwin/macos/10.12/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/10.12/x86/make.defaults
@@ -2,9 +2,5 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-ARCH="x86-macos"
 CHOST="i686-apple-darwin16"
-ACCEPT_KEYWORDS="~x86-macos"
-
-USE="mmx mmxext sse sse2"
-CPU_FLAGS_X86="mmx mmxext sse sse2"
+CHOST_x86="${CHOST}"

diff --git a/profiles/prefix/darwin/macos/10.4/ppc/make.defaults b/profiles/prefix/darwin/macos/10.4/ppc/make.defaults
index 8c58b7fdfacc7cde3bca2c3454e5eb2fa4883fe0..de5ac9be6a34e81d3e492cb6771c2481155a4390 100644 (file)
--- a/profiles/prefix/darwin/macos/10.4/ppc/make.defaults
+++ b/profiles/prefix/darwin/macos/10.4/ppc/make.defaults
@@ -1,7 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-ARCH="ppc-macos"
 CHOST="powerpc-apple-darwin8"
-ACCEPT_KEYWORDS="~ppc-macos"
+CHOST_ppc="${CHOST}"

diff --git a/profiles/prefix/darwin/macos/10.4/x86/make.defaults b/profiles/prefix/darwin/macos/10.4/x86/make.defaults
index ff7d41e9b6edf0a26e24dc0453f583fa5a28b13f..8196d985f184831700f7b3aae643074211764db9 100644 (file)
--- a/profiles/prefix/darwin/macos/10.4/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/10.4/x86/make.defaults
@@ -1,10 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-ARCH="x86-macos"
 CHOST="i686-apple-darwin8"
-ACCEPT_KEYWORDS="~x86-macos"
-
-USE="mmx mmxext sse sse2"
-CPU_FLAGS_X86="mmx mmxext sse sse2"
+CHOST_x86="${CHOST}"

diff --git a/profiles/prefix/darwin/macos/10.5/ppc/make.defaults b/profiles/prefix/darwin/macos/10.5/ppc/make.defaults
index ccee30c668f4b257fb6aa7fe9637d7d4b4a36aab..1ec662c7bfcc99cdbbbd24c9a0a166144dee8fc6 100644 (file)
--- a/profiles/prefix/darwin/macos/10.5/ppc/make.defaults
+++ b/profiles/prefix/darwin/macos/10.5/ppc/make.defaults
@@ -1,7 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-ARCH="ppc-macos"
 CHOST="powerpc-apple-darwin9"
-ACCEPT_KEYWORDS="~ppc-macos"
+CHOST_ppc="${CHOST}"

diff --git a/profiles/prefix/darwin/macos/10.5/x64/make.defaults b/profiles/prefix/darwin/macos/10.5/x64/make.defaults
index 1c265fd79b9ae711fb92dc36f1d1b01010de5906..0f49e2605bc643c5c55c4f83798e7833c64964e9 100644 (file)
--- a/profiles/prefix/darwin/macos/10.5/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/10.5/x64/make.defaults
@@ -1,10 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-ARCH="x64-macos"
 CHOST="x86_64-apple-darwin9"
-ACCEPT_KEYWORDS="~x64-macos"
-
-USE="mmx mmxext sse sse2"
-CPU_FLAGS_X86="mmx mmxext sse sse2"
+CHOST_amd64="${CHOST}"

diff --git a/profiles/prefix/darwin/macos/10.5/x86/make.defaults b/profiles/prefix/darwin/macos/10.5/x86/make.defaults
index 701853b9bfd78996793929cac02fd76e8ed26edd..60efebaece16ceb81cf9d0ef60ade09c63757431 100644 (file)
--- a/profiles/prefix/darwin/macos/10.5/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/10.5/x86/make.defaults
@@ -1,10 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-ARCH="x86-macos"
 CHOST="i686-apple-darwin9"
-ACCEPT_KEYWORDS="~x86-macos"
-
-USE="mmx mmxext sse sse2"
-CPU_FLAGS_X86="mmx mmxext sse sse2"
+CHOST_x86="${CHOST}"

diff --git a/profiles/prefix/darwin/macos/10.6/x64/make.defaults b/profiles/prefix/darwin/macos/10.6/x64/make.defaults
index de733d2806a3ad662e68d9ac998b23f0b460e825..56a2ce92a58ab90267b46747f32a9a1d3f28ca48 100644 (file)
--- a/profiles/prefix/darwin/macos/10.6/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/10.6/x64/make.defaults
@@ -1,10 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-ARCH="x64-macos"
 CHOST="x86_64-apple-darwin10"
-ACCEPT_KEYWORDS="~x64-macos"
-
-USE="mmx mmxext sse sse2"
-CPU_FLAGS_X86="mmx mmxext sse sse2"
+CHOST_amd64="${CHOST}"

diff --git a/profiles/prefix/darwin/macos/10.6/x86/make.defaults b/profiles/prefix/darwin/macos/10.6/x86/make.defaults
index 7cd2a2caba268b88fcd632def44516709637f98e..e9eb0bce49134d3e094b131c1e5fc8d48b6369bf 100644 (file)
--- a/profiles/prefix/darwin/macos/10.6/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/10.6/x86/make.defaults
@@ -1,10 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-ARCH="x86-macos"
 CHOST="i686-apple-darwin10"
-ACCEPT_KEYWORDS="~x86-macos"
-
-USE="mmx mmxext sse sse2"
-CPU_FLAGS_X86="mmx mmxext sse sse2"
+CHOST_x86="${CHOST}"

diff --git a/profiles/prefix/darwin/macos/10.7/x64/make.defaults b/profiles/prefix/darwin/macos/10.7/x64/make.defaults
index 34a480e2f1a1dd8aed4fdc34ed3d15075a81d94c..ef1a45d2b4d72984bd3dd77a91e1d4ca5e073897 100644 (file)
--- a/profiles/prefix/darwin/macos/10.7/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/10.7/x64/make.defaults
@@ -1,10 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-ARCH="x64-macos"
 CHOST="x86_64-apple-darwin11"
-ACCEPT_KEYWORDS="~x64-macos"
-
-USE="mmx mmxext sse sse2"
-CPU_FLAGS_X86="mmx mmxext sse sse2"
+CHOST_amd64="${CHOST}"

diff --git a/profiles/prefix/darwin/macos/10.7/x86/make.defaults b/profiles/prefix/darwin/macos/10.7/x86/make.defaults
index a0835e2ad87153778df599201e7c10e2df42b1ab..dfffd8e7f895d35695ae43fc5320b06010770176 100644 (file)
--- a/profiles/prefix/darwin/macos/10.7/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/10.7/x86/make.defaults
@@ -1,10 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-ARCH="x86-macos"
 CHOST="i686-apple-darwin11"
-ACCEPT_KEYWORDS="~x86-macos"
-
-USE="mmx mmxext sse sse2"
-CPU_FLAGS_X86="mmx mmxext sse sse2"
+CHOST_x86="${CHOST}"

diff --git a/profiles/prefix/darwin/macos/10.8/x64/make.defaults b/profiles/prefix/darwin/macos/10.8/x64/make.defaults
index f606f1fbdc5aa109476c0a3270082b3a4171c214..59cce776f17df1bf983d4c25d54e13a5146edcb8 100644 (file)
--- a/profiles/prefix/darwin/macos/10.8/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/10.8/x64/make.defaults
@@ -1,10 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-ARCH="x64-macos"
 CHOST="x86_64-apple-darwin12"
-ACCEPT_KEYWORDS="~x64-macos"
-
-USE="mmx mmxext sse sse2"
-CPU_FLAGS_X86="mmx mmxext sse sse2"
+CHOST_amd64="${CHOST}"

diff --git a/profiles/prefix/darwin/macos/10.8/x86/make.defaults b/profiles/prefix/darwin/macos/10.8/x86/make.defaults
index 23d3fd2b894844a82664450667ca38e8c99f32fe..3f8cf18d97e108019abb81905459367f4aabcf2c 100644 (file)
--- a/profiles/prefix/darwin/macos/10.8/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/10.8/x86/make.defaults
@@ -1,10 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-ARCH="x86-macos"
 CHOST="i686-apple-darwin12"
-ACCEPT_KEYWORDS="~x86-macos"
-
-USE="mmx mmxext sse sse2"
-CPU_FLAGS_X86="mmx mmxext sse sse2"
+CHOST_x86="${CHOST}"

diff --git a/profiles/prefix/darwin/macos/10.9/x64/make.defaults b/profiles/prefix/darwin/macos/10.9/x64/make.defaults
index e8831181e7014d432327cc0e4f77f2708b069134..ad96e6c95501c1df464806281e1ac4fa96d651aa 100644 (file)
--- a/profiles/prefix/darwin/macos/10.9/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/10.9/x64/make.defaults
@@ -1,10 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-ARCH="x64-macos"
 CHOST="x86_64-apple-darwin13"
-ACCEPT_KEYWORDS="~x64-macos"
-
-USE="mmx mmxext sse sse2"
-CPU_FLAGS_X86="mmx mmxext sse sse2"
+CHOST_amd64="${CHOST}"

diff --git a/profiles/prefix/darwin/macos/10.9/x86/make.defaults b/profiles/prefix/darwin/macos/10.9/x86/make.defaults
index 092253cac5a27d6ea1dbdd84e2764d11e38e9333..c0c8c538ac3bc869ab68939121b851c86ea8c377 100644 (file)
--- a/profiles/prefix/darwin/macos/10.9/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/10.9/x86/make.defaults
@@ -1,10 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-ARCH="x86-macos"
 CHOST="i686-apple-darwin13"
-ACCEPT_KEYWORDS="~x86-macos"
-
-USE="mmx mmxext sse sse2"
-CPU_FLAGS_X86="mmx mmxext sse sse2"
+CHOST_x86="${CHOST}"

diff --git a/profiles/prefix/darwin/macos/arch/ppc/make.defaults b/profiles/prefix/darwin/macos/arch/ppc/make.defaults
index 6c28906396f81b16ef1595c8cc2a91aa69e2e7d3..dec207ac7ee5b74cae03e2dad21dbc32b29c5f3b 100644 (file)
--- a/profiles/prefix/darwin/macos/arch/ppc/make.defaults
+++ b/profiles/prefix/darwin/macos/arch/ppc/make.defaults
@@ -1,7 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+ARCH="ppc-macos"
+ACCEPT_KEYWORDS="~ppc-macos"
+
 # multilib build stuff, single ABI (no multilib)
 MULTILIB_ABIS="ppc"
 DEFAULT_ABI="ppc"

diff --git a/profiles/prefix/darwin/macos/arch/x64/make.defaults b/profiles/prefix/darwin/macos/arch/x64/make.defaults
index 8b994140ed32ae323a7bf0a80168ce0de649804c..51246a77f2e6fbe0fb09bbedc157c6c520a8a674 100644 (file)
--- a/profiles/prefix/darwin/macos/arch/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/arch/x64/make.defaults
@@ -1,7 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+ARCH="x64-macos"
+ACCEPT_KEYWORDS="~x64-macos"
+
+USE="mmx mmxext sse sse2"
+CPU_FLAGS_X86="mmx mmxext sse sse2"
+
 # multilib build stuff, single ABI (no multilib)
 MULTILIB_ABIS="amd64"
 DEFAULT_ABI="amd64"

diff --git a/profiles/prefix/darwin/macos/arch/x86/make.defaults b/profiles/prefix/darwin/macos/arch/x86/make.defaults
index 3a38bd918d51f40c7330acfa29bb5d57c5cf019b..8a721e619da4afba5b0111978bc45c3ff92ea14a 100644 (file)
--- a/profiles/prefix/darwin/macos/arch/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/arch/x86/make.defaults
@@ -1,7 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+ARCH="x86-macos"
+ACCEPT_KEYWORDS="~x86-macos"
+
+USE="mmx mmxext sse sse2"
+CPU_FLAGS_X86="mmx mmxext sse sse2"
+
 # multilib build stuff, single ABI (no multilib)
 MULTILIB_ABIS="x86"
 DEFAULT_ABI="x86"