Make linux/uclibc multilib aware, bug #515130

13 files changed, 82 insertions, 39 deletions

diff --git a/profiles/hardened/ChangeLog b/profiles/hardened/ChangeLog
index e235420f7b1b..fb860a9ff88b 100644
--- a/profiles/hardened/ChangeLog
+++ b/profiles/hardened/ChangeLog
@@ -1,6 +1,15 @@
 # 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.52 2014/06/13 19:15:57 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ChangeLog,v 1.53 2014/07/01 12:23:15 blueness Exp $
+
+  01 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  linux/uclibc/amd64/make.defaults, linux/uclibc/amd64/use.force,
+  linux/uclibc/amd64/use.mask, linux/uclibc/mips/make.defaults,
+  linux/uclibc/mips/use.force, linux/uclibc/mips/use.mask,
+  linux/uclibc/ppc/make.defaults, linux/uclibc/ppc/use.force,
+  +linux/uclibc/ppc/use.mask, linux/uclibc/x86/make.defaults,
+  linux/uclibc/x86/use.force, linux/uclibc/x86/use.mask:
+  Make linux/uclibc multilib aware, bug #515130
 
   13 Jun 2014; Anthony G. Basile <blueness@gentoo.org>
   linux/musl/mips/mipsel/make.defaults:
diff --git a/profiles/hardened/linux/uclibc/amd64/make.defaults b/profiles/hardened/linux/uclibc/amd64/make.defaults
index 90e4da75900a..8e1284a49fc2 100644
--- a/profiles/hardened/linux/uclibc/amd64/make.defaults
+++ b/profiles/hardened/linux/uclibc/amd64/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation.
+# Copyright 1999-2014 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/amd64/make.defaults,v 1.3 2012/10/08 17:57:51 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/amd64/make.defaults,v 1.4 2014/07/01 12:23:15 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/uclibc/amd64/use.force b/profiles/hardened/linux/uclibc/amd64/use.force
index 5849fc291c78..31a9a568320d 100644
--- a/profiles/hardened/linux/uclibc/amd64/use.force
+++ b/profiles/hardened/linux/uclibc/amd64/use.force
@@ -1,9 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/amd64/use.force,v 1.2 2014/03/09 23:12:07 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/amd64/use.force,v 1.3 2014/07/01 12:23:15 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/uclibc/amd64/use.mask b/profiles/hardened/linux/uclibc/amd64/use.mask
index f81b3fe39de6..1908732e9a45 100644
--- a/profiles/hardened/linux/uclibc/amd64/use.mask
+++ b/profiles/hardened/linux/uclibc/amd64/use.mask
@@ -1,11 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/amd64/use.mask,v 1.4 2014/03/09 23:12:08 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/amd64/use.mask,v 1.5 2014/07/01 12:23:15 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/uclibc/mips/make.defaults b/profiles/hardened/linux/uclibc/mips/make.defaults
index 9399b1da4c3e..d310df0fd654 100644
--- a/profiles/hardened/linux/uclibc/mips/make.defaults
+++ b/profiles/hardened/linux/uclibc/mips/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation.
+# Copyright 1999-2014 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/mips/make.defaults,v 1.4 2013/08/03 21:18:24 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/mips/make.defaults,v 1.5 2014/07/01 12:23:15 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/uclibc/mips/use.force b/profiles/hardened/linux/uclibc/mips/use.force
index 76627802f7a9..97037edb0c73 100644
--- a/profiles/hardened/linux/uclibc/mips/use.force
+++ b/profiles/hardened/linux/uclibc/mips/use.force
@@ -1,6 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/mips/use.force,v 1.1 2012/11/21 18:15:48 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/mips/use.force,v 1.2 2014/07/01 12:23:15 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/uclibc/mips/use.mask b/profiles/hardened/linux/uclibc/mips/use.mask
index 110c1bcdb1ac..e5a403503be7 100644
--- a/profiles/hardened/linux/uclibc/mips/use.mask
+++ b/profiles/hardened/linux/uclibc/mips/use.mask
@@ -1,6 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation.
+# Copyright 1999-2014 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/mips/use.mask,v 1.1 2012/11/20 16:24:59 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/mips/use.mask,v 1.2 2014/07/01 12:23:15 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/uclibc/ppc/make.defaults b/profiles/hardened/linux/uclibc/ppc/make.defaults
index 282e43d65533..88a50883c8b6 100644
--- a/profiles/hardened/linux/uclibc/ppc/make.defaults
+++ b/profiles/hardened/linux/uclibc/ppc/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation.
+# Copyright 1999-2014 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/ppc/make.defaults,v 1.3 2012/10/08 17:57:52 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/ppc/make.defaults,v 1.4 2014/07/01 12:23:15 blueness Exp $
 
 ARCH="ppc"
 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="ppc"
+DEFAULT_ABI="ppc"
+MULTILIB_ABIS="ppc"
+CHOST_ppc=${CHOST}
+LIBDIR_ppc="lib"
+IUSE_IMPLICIT="abi_ppc_32"
diff --git a/profiles/hardened/linux/uclibc/ppc/use.force b/profiles/hardened/linux/uclibc/ppc/use.force
index 8d7a8261880c..e0cb285ece1e 100644
--- a/profiles/hardened/linux/uclibc/ppc/use.force
+++ b/profiles/hardened/linux/uclibc/ppc/use.force
@@ -1,6 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/ppc/use.force,v 1.1 2012/11/21 18:15:48 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/ppc/use.force,v 1.2 2014/07/01 12:23:15 blueness Exp $
 
-# Force the flag which corresponds to ARCH.
+# Force the flag which corresponds to arch/abi, bug #515130
 ppc
+abi_ppc_32
diff --git a/profiles/hardened/linux/uclibc/ppc/use.mask b/profiles/hardened/linux/uclibc/ppc/use.mask
new file mode 100644
index 000000000000..b2e84fab5755
--- /dev/null
+++ b/profiles/hardened/linux/uclibc/ppc/use.mask
@@ -0,0 +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/uclibc/ppc/use.mask,v 1.1 2014/07/01 12:23:15 blueness Exp $
+
+# Unmask the flag which corresponds to arch/abi, bug #515130
+-ppc
+-abi_ppc_32
diff --git a/profiles/hardened/linux/uclibc/x86/make.defaults b/profiles/hardened/linux/uclibc/x86/make.defaults
index a047b6825ed8..0e52e39d4253 100644
--- a/profiles/hardened/linux/uclibc/x86/make.defaults
+++ b/profiles/hardened/linux/uclibc/x86/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation.
+# Copyright 1999-2014 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/x86/make.defaults,v 1.3 2012/10/08 17:57:52 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/x86/make.defaults,v 1.4 2014/07/01 12:23:16 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/uclibc/x86/use.force b/profiles/hardened/linux/uclibc/x86/use.force
index 7ae80f87e166..a921df0d654b 100644
--- a/profiles/hardened/linux/uclibc/x86/use.force
+++ b/profiles/hardened/linux/uclibc/x86/use.force
@@ -1,9 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/x86/use.force,v 1.2 2014/03/09 23:12:08 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/x86/use.force,v 1.3 2014/07/01 12:23:16 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/uclibc/x86/use.mask b/profiles/hardened/linux/uclibc/x86/use.mask
index 806a18049959..a7156b78b996 100644
--- a/profiles/hardened/linux/uclibc/x86/use.mask
+++ b/profiles/hardened/linux/uclibc/x86/use.mask
@@ -1,11 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation.
+# Copyright 1999-2014 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/x86/use.mask,v 1.4 2014/03/09 23:12:08 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/x86/use.mask,v 1.5 2014/07/01 12:23:16 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