diff options
author | Anthony G. Basile <blueness@gentoo.org> | 2014-07-01 12:37:36 +0000 |
---|---|---|
committer | Anthony G. Basile <blueness@gentoo.org> | 2014-07-01 12:37:36 +0000 |
commit | 9e9d7814c6c6a96927ceb1584f81b748a6bfc3ba (patch) | |
tree | 43ea1c72081b0ec67df7490ac5c57d1a41e48c39 /profiles/hardened | |
parent | version bump (diff) | |
download | gentoo-2-9e9d7814c6c6a96927ceb1584f81b748a6bfc3ba.tar.gz gentoo-2-9e9d7814c6c6a96927ceb1584f81b748a6bfc3ba.tar.bz2 gentoo-2-9e9d7814c6c6a96927ceb1584f81b748a6bfc3ba.zip |
Make linux/musl multilib aware, bug #515130
Diffstat (limited to 'profiles/hardened')
-rw-r--r-- | profiles/hardened/ChangeLog | 10 | ||||
-rw-r--r-- | profiles/hardened/linux/musl/amd64/make.defaults | 11 | ||||
-rw-r--r-- | profiles/hardened/linux/musl/amd64/use.force | 6 | ||||
-rw-r--r-- | profiles/hardened/linux/musl/amd64/use.mask | 6 | ||||
-rw-r--r-- | profiles/hardened/linux/musl/mips/make.defaults | 9 | ||||
-rw-r--r-- | profiles/hardened/linux/musl/mips/use.force | 5 | ||||
-rw-r--r-- | profiles/hardened/linux/musl/mips/use.mask | 5 | ||||
-rw-r--r-- | profiles/hardened/linux/musl/x86/make.defaults | 11 | ||||
-rw-r--r-- | profiles/hardened/linux/musl/x86/use.force | 6 | ||||
-rw-r--r-- | profiles/hardened/linux/musl/x86/use.mask | 9 |
10 files changed, 53 insertions, 25 deletions
diff --git a/profiles/hardened/ChangeLog b/profiles/hardened/ChangeLog index fb860a9ff88b..a702c82ef353 100644 --- a/profiles/hardened/ChangeLog +++ b/profiles/hardened/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for Gentoo/AMD64 profile directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ChangeLog,v 1.53 2014/07/01 12:23:15 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ChangeLog,v 1.54 2014/07/01 12:37:35 blueness Exp $ + + 01 Jul 2014; Anthony G. Basile <blueness@gentoo.org> + linux/musl/amd64/make.defaults, linux/musl/amd64/use.force, + linux/musl/amd64/use.mask, linux/musl/mips/make.defaults, + linux/musl/mips/use.force, linux/musl/mips/use.mask, + linux/musl/x86/make.defaults, linux/musl/x86/use.force, + linux/musl/x86/use.mask: + Make linux/musl multilib aware, bug #515130 01 Jul 2014; Anthony G. Basile <blueness@gentoo.org> linux/uclibc/amd64/make.defaults, linux/uclibc/amd64/use.force, diff --git a/profiles/hardened/linux/musl/amd64/make.defaults b/profiles/hardened/linux/musl/amd64/make.defaults index 0dbf3e648a0c..fea9442c197b 100644 --- a/profiles/hardened/linux/musl/amd64/make.defaults +++ b/profiles/hardened/linux/musl/amd64/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/make.defaults,v 1.5 2014/06/09 15:19:09 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/make.defaults,v 1.6 2014/07/01 12:37:35 blueness Exp $ ARCH="amd64" ACCEPT_KEYWORDS="${ARCH}" @@ -10,3 +10,12 @@ CFLAGS="-O2 -pipe" CXXFLAGS="${CFLAGS}" FFLAGS="${CFLAGS}" FCFLAGS="${CFLAGS}" + +# Anthony G. Basile <blueness@gentoo.org> (01 Jul 2014) +# Multilib-related setup, bug #515130 +ABI="amd64" +DEFAULT_ABI="amd64" +MULTILIB_ABIS="amd64" +CHOST_amd64=${CHOST} +LIBDIR_amd64="lib" +IUSE_IMPLICIT="abi_x86_64" diff --git a/profiles/hardened/linux/musl/amd64/use.force b/profiles/hardened/linux/musl/amd64/use.force index e2e63c282f27..100238716a8b 100644 --- a/profiles/hardened/linux/musl/amd64/use.force +++ b/profiles/hardened/linux/musl/amd64/use.force @@ -1,9 +1,7 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/use.force,v 1.2 2014/03/09 23:18:34 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/use.force,v 1.3 2014/07/01 12:37:35 blueness Exp $ -# Force the flag which corresponds to ARCH. +# Force the flag which corresponds to arch/abi, bug #515130 amd64 - -# Force the flag corresponding to the default ABI. abi_x86_64 diff --git a/profiles/hardened/linux/musl/amd64/use.mask b/profiles/hardened/linux/musl/amd64/use.mask index 1f41bb89bba7..9d397d63f631 100644 --- a/profiles/hardened/linux/musl/amd64/use.mask +++ b/profiles/hardened/linux/musl/amd64/use.mask @@ -1,11 +1,9 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/use.mask,v 1.2 2014/03/09 23:18:34 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/use.mask,v 1.3 2014/07/01 12:37:35 blueness Exp $ -# Unmask the flag which corresponds to ARCH. +# Force the flag which corresponds to arch/abi, bug #515130 -amd64 - -# Unmask the multilib flags for this arch. -abi_x86_64 # unmask all SIMD assembler flags diff --git a/profiles/hardened/linux/musl/mips/make.defaults b/profiles/hardened/linux/musl/mips/make.defaults index 22b92290f6d1..24ae96f99b2f 100644 --- a/profiles/hardened/linux/musl/mips/make.defaults +++ b/profiles/hardened/linux/musl/mips/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/mips/make.defaults,v 1.1 2014/02/28 18:17:06 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/mips/make.defaults,v 1.2 2014/07/01 12:37:35 blueness Exp $ ARCH="mips" ACCEPT_KEYWORDS="${ARCH} ~${ARCH}" @@ -11,6 +11,11 @@ CXXFLAGS="${CFLAGS}" FFLAGS="${CFLAGS}" FCFLAGS="${CFLAGS}" +# Anthony G. Basile <blueness@gentoo.org> (01 Jul 2014) +# Multilib-related setup, bug #515130 +ABI="o32" DEFAULT_ABI="o32" -ABI="${DEFAULT_ABI}" +MULTILIB_ABIS="o32" +CHOST_o32=${CHOST} LIBDIR_o32="lib" +IUSE_IMPLICIT="abi_mips_o32" diff --git a/profiles/hardened/linux/musl/mips/use.force b/profiles/hardened/linux/musl/mips/use.force index fb69ef6ed8aa..fff890a8534d 100644 --- a/profiles/hardened/linux/musl/mips/use.force +++ b/profiles/hardened/linux/musl/mips/use.force @@ -1,6 +1,7 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/mips/use.force,v 1.1 2014/02/28 18:17:07 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/mips/use.force,v 1.2 2014/07/01 12:37:35 blueness Exp $ -# Force the flag which corresponds to ARCH. +# Force the flag which corresponds to arch/abi, bug #515130 mips +abi_mips_o32 diff --git a/profiles/hardened/linux/musl/mips/use.mask b/profiles/hardened/linux/musl/mips/use.mask index ca67e1b64d07..4988992639ec 100644 --- a/profiles/hardened/linux/musl/mips/use.mask +++ b/profiles/hardened/linux/musl/mips/use.mask @@ -1,6 +1,7 @@ # Copyright 1999-2014 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/mips/use.mask,v 1.1 2014/02/28 18:17:07 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/mips/use.mask,v 1.2 2014/07/01 12:37:35 blueness Exp $ -# Unmask the flag which corresponds to ARCH. +# Unmask the flag which corresponds to arch/abi, bug #515130 -mips +-abi_mips_o32 diff --git a/profiles/hardened/linux/musl/x86/make.defaults b/profiles/hardened/linux/musl/x86/make.defaults index 88c786f8ecbb..b80e8978b179 100644 --- a/profiles/hardened/linux/musl/x86/make.defaults +++ b/profiles/hardened/linux/musl/x86/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/x86/make.defaults,v 1.5 2014/06/09 15:19:09 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/x86/make.defaults,v 1.6 2014/07/01 12:37:36 blueness Exp $ ARCH="x86" ACCEPT_KEYWORDS="${ARCH}" @@ -10,3 +10,12 @@ CFLAGS="-O2 -pipe" CXXFLAGS="${CFLAGS}" FFLAGS="${CFLAGS}" FCFLAGS="${CFLAGS}" + +# Anthony G. Basile <blueness@gentoo.org> (01 Jul 2014) +# Multilib-related setup, bug #515130 +ABI="x86" +DEFAULT_ABI="x86" +MULTILIB_ABIS="x86" +CHOST_x86=${CHOST} +LIBDIR_x86="lib" +IUSE_IMPLICIT="abi_x86_32" diff --git a/profiles/hardened/linux/musl/x86/use.force b/profiles/hardened/linux/musl/x86/use.force index 5c07a4726ad7..1764e59ab056 100644 --- a/profiles/hardened/linux/musl/x86/use.force +++ b/profiles/hardened/linux/musl/x86/use.force @@ -1,9 +1,7 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/x86/use.force,v 1.2 2014/03/09 23:18:35 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/x86/use.force,v 1.3 2014/07/01 12:37:36 blueness Exp $ -# Force the flag which corresponds to ARCH. +# Force the flag which corresponds to arch/abi, bug #515130 x86 - -# Force the flag corresponding to the only ABI. abi_x86_32 diff --git a/profiles/hardened/linux/musl/x86/use.mask b/profiles/hardened/linux/musl/x86/use.mask index be8ea77ae742..3a54e0a1436e 100644 --- a/profiles/hardened/linux/musl/x86/use.mask +++ b/profiles/hardened/linux/musl/x86/use.mask @@ -1,11 +1,9 @@ # Copyright 1999-2014 Gentoo Foundation. # Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/x86/use.mask,v 1.2 2014/03/09 23:18:35 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/x86/use.mask,v 1.3 2014/07/01 12:37:36 blueness Exp $ -# Unmask the flag which corresponds to ARCH. +# Force the flag which corresponds to arch/abi, bug #515130 -x86 - -# Unmask the flag corresponding to the only ABI. -abi_x86_32 # unmask all SIMD assembler flags @@ -19,3 +17,6 @@ -ssse3 -3dnow -3dnowext + +# Masked on all profiles but x86, bug #458354 +-video_cards_geode |