6 files changed, 31 insertions, 0 deletions
diff --git a/profiles/hardened/linux/musl/amd64/x32/eapi b/profiles/hardened/linux/musl/amd64/x32/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/hardened/linux/musl/amd64/x32/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/hardened/linux/musl/amd64/x32/make.defaults b/profiles/hardened/linux/musl/amd64/x32/make.defaults
new file mode 100644
index 000000000000..cf5a09254092
--- /dev/null
+++ b/profiles/hardened/linux/musl/amd64/x32/make.defaults
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+CHOST="x86_64-gentoo-linux-muslx32"
+
+# Anthony G. Basile <blueness@gentoo.org> (31 Aug 2015)
+# Multilib-related setup, bug #515130
+ABI="x32"
+DEFAULT_ABI="x32"
+MULTILIB_ABIS="x32"
+CHOST_x32=${CHOST}
+LIBDIR_x32="lib"
+IUSE_IMPLICIT="abi_x86_x32"
diff --git a/profiles/hardened/linux/musl/amd64/x32/parent b/profiles/hardened/linux/musl/amd64/x32/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/hardened/linux/musl/amd64/x32/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/hardened/linux/musl/amd64/x32/use.force b/profiles/hardened/linux/musl/amd64/x32/use.force
new file mode 100644
index 000000000000..71a90a0fac61
--- /dev/null
+++ b/profiles/hardened/linux/musl/amd64/x32/use.force
@@ -0,0 +1,7 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Force the flag which corresponds to arch/abi, bug #515130
+-abi_x86_64
+abi_x86_x32
diff --git a/profiles/hardened/linux/musl/amd64/x32/use.mask b/profiles/hardened/linux/musl/amd64/x32/use.mask
new file mode 100644
index 000000000000..182f7557c994
--- /dev/null
+++ b/profiles/hardened/linux/musl/amd64/x32/use.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Force the flag which corresponds to arch/abi, bug #515130
+-abi_x86_x32
+abi_x86_64
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index b2f2200cf09e..9274218a35d8 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -189,6 +189,7 @@ amd64		hardened/linux/amd64/no-multilib			stable
 amd64		hardened/linux/amd64/no-multilib/selinux		stable
 amd64		hardened/linux/amd64/x32				dev
 amd64		hardened/linux/musl/amd64				exp
+amd64		hardened/linux/musl/amd64/x32				exp
 arm		hardened/linux/arm/armv7a				dev
 arm		hardened/linux/arm/armv6j				dev
 arm		hardened/linux/musl/arm/armv7a				exp