gentoo resync : 15.12.2017

7 files changed, 2 insertions, 49 deletions

diff --git a/profiles/hardened/linux/musl/arm/armv7a/make.defaults b/profiles/hardened/linux/musl/arm/armv7a/make.defaults
deleted file mode 100644
index c680f6aa2e5a..000000000000
--- a/profiles/hardened/linux/musl/arm/armv7a/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-CHOST="armv7a-hardfloat-linux-musleabi"
-CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
diff --git a/profiles/hardened/linux/musl/arm/armv7a/parent b/profiles/hardened/linux/musl/arm/armv7a/parent
index f3229c5b9876..4be939d87ce7 100644
--- a/profiles/hardened/linux/musl/arm/armv7a/parent
+++ b/profiles/hardened/linux/musl/arm/armv7a/parent
@@ -1 +1,3 @@
+../../../../../default/linux/musl/arm/armv7a
 ..
+../..
diff --git a/profiles/hardened/linux/musl/arm/make.defaults b/profiles/hardened/linux/musl/arm/make.defaults
deleted file mode 100644
index e0e4051efde6..000000000000
--- a/profiles/hardened/linux/musl/arm/make.defaults
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="arm"
-ACCEPT_KEYWORDS="${ARCH}"
-
-CHOST="arm-unknown-linux-musleabi"
-CFLAGS="-O2"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
-
-# Anthony G. Basile <blueness@gentoo.org> (25 Oct 2015)
-# Multilib-related setup, bug #515130
-ABI="arm"
-DEFAULT_ABI="arm"
-MULTILIB_ABIS="arm"
-CHOST_arm="${CHOST}"
-LIBDIR_arm="lib"
-
-# Michał Górny <mgorny@gentoo.org> (14 Mar 2017)
-# Unhide the ARM-specific USE_EXPANDs.
-USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
diff --git a/profiles/hardened/linux/musl/arm/package.use.force b/profiles/hardened/linux/musl/arm/package.use.force
deleted file mode 100644
index b92b1029f52a..000000000000
--- a/profiles/hardened/linux/musl/arm/package.use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
-# Force the host target to avoid dependency hell
-sys-devel/clang llvm_targets_ARM
-sys-devel/llvm llvm_targets_ARM
diff --git a/profiles/hardened/linux/musl/arm/parent b/profiles/hardened/linux/musl/arm/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/hardened/linux/musl/arm/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/hardened/linux/musl/arm/use.force b/profiles/hardened/linux/musl/arm/use.force
deleted file mode 100644
index 11e95dae7631..000000000000
--- a/profiles/hardened/linux/musl/arm/use.force
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Force the flag which corresponds to ARCH.
-arm
diff --git a/profiles/hardened/linux/musl/arm/use.mask b/profiles/hardened/linux/musl/arm/use.mask
deleted file mode 100644
index 8dffd62b8e39..000000000000
--- a/profiles/hardened/linux/musl/arm/use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# Unmask the flag which corresponds to ARCH.
--arm