Add more multilib subprofiles for each possible ABI combination.

52 files changed, 126 insertions, 14 deletions

diff --git a/profiles/arch/mips/ChangeLog b/profiles/arch/mips/ChangeLog
index 7e2623105a4b..18702e9950aa 100644
--- a/profiles/arch/mips/ChangeLog
+++ b/profiles/arch/mips/ChangeLog
@@ -1,6 +1,46 @@
 # ChangeLog for Gentoo/MIPS profile directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/ChangeLog,v 1.57 2011/06/07 19:30:53 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/ChangeLog,v 1.58 2011/06/08 18:38:22 mattst88 Exp $
+
+  08 Jun 2011; Matt Turner <mattst88@gentoo.org>
+  +mips64/multilib/n32-n64/make.defaults, +mips64/multilib/n32-n64/parent,
+  +mips64/multilib/n32-n64/use.force, +mips64/multilib/n32-o32/make.defaults,
+  +mips64/multilib/n32-o32/parent, +mips64/multilib/n32-o32/use.force,
+  +mips64/multilib/n32/use.force, +mips64/multilib/n64-n32/make.defaults,
+  +mips64/multilib/n64-n32/parent, +mips64/multilib/n64-n32/use.force,
+  +mips64/multilib/n64-o32/make.defaults, +mips64/multilib/n64-o32/parent,
+  +mips64/multilib/n64-o32/use.force, +mips64/multilib/n64/use.force,
+  +mips64/multilib/o32-n32/make.defaults, +mips64/multilib/o32-n32/parent,
+  +mips64/multilib/o32-n32/use.force, +mips64/multilib/o32-n64/make.defaults,
+  +mips64/multilib/o32-n64/parent, +mips64/multilib/o32-n64/use.force,
+  +mips64/multilib/o32/make.defaults, +mips64/multilib/o32/parent,
+  +mips64/multilib/o32/use.force,
+  +mipsel/mips64el/multilib/n32-n64/make.defaults,
+  +mipsel/mips64el/multilib/n32-n64/parent,
+  +mipsel/mips64el/multilib/n32-n64/use.force,
+  +mipsel/mips64el/multilib/n32-o32/make.defaults,
+  +mipsel/mips64el/multilib/n32-o32/parent,
+  +mipsel/mips64el/multilib/n32-o32/use.force,
+  +mipsel/mips64el/multilib/n32/use.force,
+  +mipsel/mips64el/multilib/n64-n32/make.defaults,
+  +mipsel/mips64el/multilib/n64-n32/parent,
+  +mipsel/mips64el/multilib/n64-n32/use.force,
+  +mipsel/mips64el/multilib/n64-o32/make.defaults,
+  +mipsel/mips64el/multilib/n64-o32/parent,
+  +mipsel/mips64el/multilib/n64-o32/use.force,
+  +mipsel/mips64el/multilib/n64/use.force,
+  +mipsel/mips64el/multilib/o32-n32/make.defaults,
+  +mipsel/mips64el/multilib/o32-n32/parent,
+  +mipsel/mips64el/multilib/o32-n32/use.force,
+  +mipsel/mips64el/multilib/o32-n64/make.defaults,
+  +mipsel/mips64el/multilib/o32-n64/parent,
+  +mipsel/mips64el/multilib/o32-n64/use.force,
+  +mipsel/mips64el/multilib/o32/make.defaults,
+  +mipsel/mips64el/multilib/o32/parent,
+  +mipsel/mips64el/multilib/o32/use.force, mips64/multilib/make.defaults,
+  mips64/multilib/use.force, mipsel/mips64el/multilib/make.defaults,
+  mipsel/mips64el/multilib/parent, mipsel/mips64el/multilib/use.force:
+  Add more multilib subprofiles for each possible ABI combination.
 
   07 Jun 2011; Matt Turner <mattst88@gentoo.org>
   +mips64/multilib/n32/make.defaults, +mips64/multilib/n32/parent,
diff --git a/profiles/arch/mips/mips64/multilib/make.defaults b/profiles/arch/mips/mips64/multilib/make.defaults
index ec0633fd3ad7..ccdc4f2041fc 100644
--- a/profiles/arch/mips/mips64/multilib/make.defaults
+++ b/profiles/arch/mips/mips64/multilib/make.defaults
@@ -15,7 +15,3 @@ LIBDIR_n32="lib32"
 CFLAGS_n64="-mabi=64"
 CHOST_n64=${CHOST}
 LIBDIR_n64="lib64"
-
-MULTILIB_ABIS="n64 n32 o32"
-DEFAULT_ABI="o32"
-ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mips64/multilib/n32-n64/make.defaults b/profiles/arch/mips/mips64/multilib/n32-n64/make.defaults
new file mode 100644
index 000000000000..9fedd70bcdae
--- /dev/null
+++ b/profiles/arch/mips/mips64/multilib/n32-n64/make.defaults
@@ -0,0 +1,3 @@
+MULTILIB_ABIS="n64 n32"
+DEFAULT_ABI="n32"
+ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mips64/multilib/n32-n64/parent b/profiles/arch/mips/mips64/multilib/n32-n64/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/arch/mips/mips64/multilib/n32-n64/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/mips/mips64/multilib/n32-n64/use.force b/profiles/arch/mips/mips64/multilib/n32-n64/use.force
new file mode 100644
index 000000000000..dd60fb3a5c96
--- /dev/null
+++ b/profiles/arch/mips/mips64/multilib/n32-n64/use.force
@@ -0,0 +1,2 @@
+n32
+n64
diff --git a/profiles/arch/mips/mips64/multilib/n32-o32/make.defaults b/profiles/arch/mips/mips64/multilib/n32-o32/make.defaults
new file mode 100644
index 000000000000..c15dc478ccca
--- /dev/null
+++ b/profiles/arch/mips/mips64/multilib/n32-o32/make.defaults
@@ -0,0 +1,3 @@
+MULTILIB_ABIS="o32 n32"
+DEFAULT_ABI="n32"
+ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mips64/multilib/n32-o32/parent b/profiles/arch/mips/mips64/multilib/n32-o32/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/arch/mips/mips64/multilib/n32-o32/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/mips/mips64/multilib/n32-o32/use.force b/profiles/arch/mips/mips64/multilib/n32-o32/use.force
new file mode 100644
index 000000000000..888d35c1316a
--- /dev/null
+++ b/profiles/arch/mips/mips64/multilib/n32-o32/use.force
@@ -0,0 +1 @@
+n32
diff --git a/profiles/arch/mips/mips64/multilib/n32/use.force b/profiles/arch/mips/mips64/multilib/n32/use.force
new file mode 100644
index 000000000000..dd60fb3a5c96
--- /dev/null
+++ b/profiles/arch/mips/mips64/multilib/n32/use.force
@@ -0,0 +1,2 @@
+n32
+n64
diff --git a/profiles/arch/mips/mips64/multilib/n64-n32/make.defaults b/profiles/arch/mips/mips64/multilib/n64-n32/make.defaults
new file mode 100644
index 000000000000..71bbbc1a7fbb
--- /dev/null
+++ b/profiles/arch/mips/mips64/multilib/n64-n32/make.defaults
@@ -0,0 +1,3 @@
+MULTILIB_ABIS="n32 n64"
+DEFAULT_ABI="n64"
+ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mips64/multilib/n64-n32/parent b/profiles/arch/mips/mips64/multilib/n64-n32/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/arch/mips/mips64/multilib/n64-n32/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/mips/mips64/multilib/n64-n32/use.force b/profiles/arch/mips/mips64/multilib/n64-n32/use.force
new file mode 100644
index 000000000000..dd60fb3a5c96
--- /dev/null
+++ b/profiles/arch/mips/mips64/multilib/n64-n32/use.force
@@ -0,0 +1,2 @@
+n32
+n64
diff --git a/profiles/arch/mips/mips64/multilib/n64-o32/make.defaults b/profiles/arch/mips/mips64/multilib/n64-o32/make.defaults
new file mode 100644
index 000000000000..275eb765d437
--- /dev/null
+++ b/profiles/arch/mips/mips64/multilib/n64-o32/make.defaults
@@ -0,0 +1,3 @@
+MULTILIB_ABIS="o32 n64"
+DEFAULT_ABI="n64"
+ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mips64/multilib/n64-o32/parent b/profiles/arch/mips/mips64/multilib/n64-o32/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/arch/mips/mips64/multilib/n64-o32/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/mips/mips64/multilib/n64-o32/use.force b/profiles/arch/mips/mips64/multilib/n64-o32/use.force
new file mode 100644
index 000000000000..a85aea35530a
--- /dev/null
+++ b/profiles/arch/mips/mips64/multilib/n64-o32/use.force
@@ -0,0 +1 @@
+n64
diff --git a/profiles/arch/mips/mips64/multilib/n64/use.force b/profiles/arch/mips/mips64/multilib/n64/use.force
new file mode 100644
index 000000000000..dd60fb3a5c96
--- /dev/null
+++ b/profiles/arch/mips/mips64/multilib/n64/use.force
@@ -0,0 +1,2 @@
+n32
+n64
diff --git a/profiles/arch/mips/mips64/multilib/o32-n32/make.defaults b/profiles/arch/mips/mips64/multilib/o32-n32/make.defaults
new file mode 100644
index 000000000000..f5e72f35f314
--- /dev/null
+++ b/profiles/arch/mips/mips64/multilib/o32-n32/make.defaults
@@ -0,0 +1,3 @@
+MULTILIB_ABIS="n32 o32"
+DEFAULT_ABI="o32"
+ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mips64/multilib/o32-n32/parent b/profiles/arch/mips/mips64/multilib/o32-n32/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/arch/mips/mips64/multilib/o32-n32/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/mips/mips64/multilib/o32-n32/use.force b/profiles/arch/mips/mips64/multilib/o32-n32/use.force
new file mode 100644
index 000000000000..888d35c1316a
--- /dev/null
+++ b/profiles/arch/mips/mips64/multilib/o32-n32/use.force
@@ -0,0 +1 @@
+n32
diff --git a/profiles/arch/mips/mips64/multilib/o32-n64/make.defaults b/profiles/arch/mips/mips64/multilib/o32-n64/make.defaults
new file mode 100644
index 000000000000..0fbad2a60d02
--- /dev/null
+++ b/profiles/arch/mips/mips64/multilib/o32-n64/make.defaults
@@ -0,0 +1,3 @@
+MULTILIB_ABIS="n64 o32"
+DEFAULT_ABI="o32"
+ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mips64/multilib/o32-n64/parent b/profiles/arch/mips/mips64/multilib/o32-n64/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/arch/mips/mips64/multilib/o32-n64/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/mips/mips64/multilib/o32-n64/use.force b/profiles/arch/mips/mips64/multilib/o32-n64/use.force
new file mode 100644
index 000000000000..a85aea35530a
--- /dev/null
+++ b/profiles/arch/mips/mips64/multilib/o32-n64/use.force
@@ -0,0 +1 @@
+n64
diff --git a/profiles/arch/mips/mips64/multilib/o32/make.defaults b/profiles/arch/mips/mips64/multilib/o32/make.defaults
new file mode 100644
index 000000000000..fef4e2b836a2
--- /dev/null
+++ b/profiles/arch/mips/mips64/multilib/o32/make.defaults
@@ -0,0 +1,3 @@
+MULTILIB_ABIS="n64 n32 o32"
+DEFAULT_ABI="o32"
+ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mips64/multilib/o32/parent b/profiles/arch/mips/mips64/multilib/o32/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/arch/mips/mips64/multilib/o32/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/mips/mips64/multilib/o32/use.force b/profiles/arch/mips/mips64/multilib/o32/use.force
new file mode 100644
index 000000000000..dd60fb3a5c96
--- /dev/null
+++ b/profiles/arch/mips/mips64/multilib/o32/use.force
@@ -0,0 +1,2 @@
+n32
+n64
diff --git a/profiles/arch/mips/mips64/multilib/use.force b/profiles/arch/mips/mips64/multilib/use.force
index 45ead36007fc..169a704ba9bf 100644
--- a/profiles/arch/mips/mips64/multilib/use.force
+++ b/profiles/arch/mips/mips64/multilib/use.force
@@ -1,3 +1 @@
 multilib
-n32
-n64
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/make.defaults b/profiles/arch/mips/mipsel/mips64el/multilib/make.defaults
index 88575eda346f..6ea9555ef173 100644
--- a/profiles/arch/mips/mipsel/mips64el/multilib/make.defaults
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/make.defaults
@@ -15,7 +15,3 @@ LIBDIR_n32="lib32"
 CFLAGS_n64="-mabi=64"
 CHOST_n64=${CHOST}
 LIBDIR_n64="lib64"
-
-MULTILIB_ABIS="n64 n32 o32"
-DEFAULT_ABI="o32"
-ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n32-n64/make.defaults b/profiles/arch/mips/mipsel/mips64el/multilib/n32-n64/make.defaults
new file mode 100644
index 000000000000..9fedd70bcdae
--- /dev/null
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/n32-n64/make.defaults
@@ -0,0 +1,3 @@
+MULTILIB_ABIS="n64 n32"
+DEFAULT_ABI="n32"
+ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n32-n64/parent b/profiles/arch/mips/mipsel/mips64el/multilib/n32-n64/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/n32-n64/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n32-n64/use.force b/profiles/arch/mips/mipsel/mips64el/multilib/n32-n64/use.force
new file mode 100644
index 000000000000..dd60fb3a5c96
--- /dev/null
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/n32-n64/use.force
@@ -0,0 +1,2 @@
+n32
+n64
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n32-o32/make.defaults b/profiles/arch/mips/mipsel/mips64el/multilib/n32-o32/make.defaults
new file mode 100644
index 000000000000..c15dc478ccca
--- /dev/null
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/n32-o32/make.defaults
@@ -0,0 +1,3 @@
+MULTILIB_ABIS="o32 n32"
+DEFAULT_ABI="n32"
+ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n32-o32/parent b/profiles/arch/mips/mipsel/mips64el/multilib/n32-o32/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/n32-o32/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n32-o32/use.force b/profiles/arch/mips/mipsel/mips64el/multilib/n32-o32/use.force
new file mode 100644
index 000000000000..888d35c1316a
--- /dev/null
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/n32-o32/use.force
@@ -0,0 +1 @@
+n32
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n32/use.force b/profiles/arch/mips/mipsel/mips64el/multilib/n32/use.force
new file mode 100644
index 000000000000..dd60fb3a5c96
--- /dev/null
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/n32/use.force
@@ -0,0 +1,2 @@
+n32
+n64
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n64-n32/make.defaults b/profiles/arch/mips/mipsel/mips64el/multilib/n64-n32/make.defaults
new file mode 100644
index 000000000000..71bbbc1a7fbb
--- /dev/null
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/n64-n32/make.defaults
@@ -0,0 +1,3 @@
+MULTILIB_ABIS="n32 n64"
+DEFAULT_ABI="n64"
+ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n64-n32/parent b/profiles/arch/mips/mipsel/mips64el/multilib/n64-n32/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/n64-n32/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n64-n32/use.force b/profiles/arch/mips/mipsel/mips64el/multilib/n64-n32/use.force
new file mode 100644
index 000000000000..dd60fb3a5c96
--- /dev/null
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/n64-n32/use.force
@@ -0,0 +1,2 @@
+n32
+n64
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n64-o32/make.defaults b/profiles/arch/mips/mipsel/mips64el/multilib/n64-o32/make.defaults
new file mode 100644
index 000000000000..275eb765d437
--- /dev/null
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/n64-o32/make.defaults
@@ -0,0 +1,3 @@
+MULTILIB_ABIS="o32 n64"
+DEFAULT_ABI="n64"
+ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n64-o32/parent b/profiles/arch/mips/mipsel/mips64el/multilib/n64-o32/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/n64-o32/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n64-o32/use.force b/profiles/arch/mips/mipsel/mips64el/multilib/n64-o32/use.force
new file mode 100644
index 000000000000..a85aea35530a
--- /dev/null
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/n64-o32/use.force
@@ -0,0 +1 @@
+n64
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n64/use.force b/profiles/arch/mips/mipsel/mips64el/multilib/n64/use.force
new file mode 100644
index 000000000000..dd60fb3a5c96
--- /dev/null
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/n64/use.force
@@ -0,0 +1,2 @@
+n32
+n64
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/o32-n32/make.defaults b/profiles/arch/mips/mipsel/mips64el/multilib/o32-n32/make.defaults
new file mode 100644
index 000000000000..f5e72f35f314
--- /dev/null
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/o32-n32/make.defaults
@@ -0,0 +1,3 @@
+MULTILIB_ABIS="n32 o32"
+DEFAULT_ABI="o32"
+ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/o32-n32/parent b/profiles/arch/mips/mipsel/mips64el/multilib/o32-n32/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/o32-n32/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/o32-n32/use.force b/profiles/arch/mips/mipsel/mips64el/multilib/o32-n32/use.force
new file mode 100644
index 000000000000..888d35c1316a
--- /dev/null
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/o32-n32/use.force
@@ -0,0 +1 @@
+n32
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/o32-n64/make.defaults b/profiles/arch/mips/mipsel/mips64el/multilib/o32-n64/make.defaults
new file mode 100644
index 000000000000..0fbad2a60d02
--- /dev/null
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/o32-n64/make.defaults
@@ -0,0 +1,3 @@
+MULTILIB_ABIS="n64 o32"
+DEFAULT_ABI="o32"
+ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/o32-n64/parent b/profiles/arch/mips/mipsel/mips64el/multilib/o32-n64/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/o32-n64/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/o32-n64/use.force b/profiles/arch/mips/mipsel/mips64el/multilib/o32-n64/use.force
new file mode 100644
index 000000000000..a85aea35530a
--- /dev/null
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/o32-n64/use.force
@@ -0,0 +1 @@
+n64
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/o32/make.defaults b/profiles/arch/mips/mipsel/mips64el/multilib/o32/make.defaults
new file mode 100644
index 000000000000..fef4e2b836a2
--- /dev/null
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/o32/make.defaults
@@ -0,0 +1,3 @@
+MULTILIB_ABIS="n64 n32 o32"
+DEFAULT_ABI="o32"
+ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/o32/parent b/profiles/arch/mips/mipsel/mips64el/multilib/o32/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/o32/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/o32/use.force b/profiles/arch/mips/mipsel/mips64el/multilib/o32/use.force
new file mode 100644
index 000000000000..dd60fb3a5c96
--- /dev/null
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/o32/use.force
@@ -0,0 +1,2 @@
+n32
+n64
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/parent b/profiles/arch/mips/mipsel/mips64el/multilib/parent
index 5689fbd5e174..97dffb64c4d1 100644
--- a/profiles/arch/mips/mipsel/mips64el/multilib/parent
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../features/multilib/lib32
+../../../../../features/multilib
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/use.force b/profiles/arch/mips/mipsel/mips64el/multilib/use.force
index 45ead36007fc..169a704ba9bf 100644
--- a/profiles/arch/mips/mipsel/mips64el/multilib/use.force
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/use.force
@@ -1,3 +1 @@
 multilib
-n32
-n64