[gentoo-commits] proj/musl:master commit in: sys-devel/gcc/

[Aric Belsito]

commit:     6bb1d30e7124e6c46102dc81e00b6df58be53c13
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Tue Jan 16 04:54:39 2018 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Tue Jan 16 04:54:39 2018 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=6bb1d30e

sys-devel/gcc: bump to 7.2.0-r2

spectre patches should be masked for testing for now.

 sys-devel/gcc/gcc-7.2.0-r1.ebuild                          | 11 -----------
 sys-devel/gcc/{gcc-7.2.0-r1.ebuild => gcc-7.2.0-r2.ebuild} |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/sys-devel/gcc/gcc-7.2.0-r1.ebuild b/sys-devel/gcc/gcc-7.2.0-r1.ebuild
index c6f78df..c27bb96 100644
--- a/sys-devel/gcc/gcc-7.2.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-7.2.0-r1.ebuild
@@ -24,17 +24,6 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/gcc-7.2.0-pr69728.patch
 
-	# Meltdown/Spectre
-	epatch "${FILESDIR}"/0001-gcc-7.2.0-move-struct-ix86_frame-to-machine-function.patch
-	epatch "${FILESDIR}"/0002-gcc-7.2.0-move-struct-ix86_frame-to-machine-function.patch
-	epatch "${FILESDIR}"/0003-gcc-7.2.0-move-struct-ix86_frame-to-machine-function.patch
-
-	epatch "${FILESDIR}"/spectre-0001-mindirect-branch.patch
-	epatch "${FILESDIR}"/spectre-0002-mfunction-return.patch
-	epatch "${FILESDIR}"/spectre-0003-mindirect-branch-register.patch
-	epatch "${FILESDIR}"/spectre-0004-v-register-modifier.patch
-	epatch "${FILESDIR}"/spectre-0005-mcmodel-large.patch
-
 	if use elibc_musl || [[ ${CATEGORY} = cross-*-musl* ]]; then
 		epatch "${FILESDIR}"/6.3.0/cpu_indicator.patch
 		epatch "${FILESDIR}"/7.1.0/posix_memalign.patch

diff --git a/sys-devel/gcc/gcc-7.2.0-r1.ebuild b/sys-devel/gcc/gcc-7.2.0-r2.ebuild
similarity index 91%
copy from sys-devel/gcc/gcc-7.2.0-r1.ebuild
copy to sys-devel/gcc/gcc-7.2.0-r2.ebuild
index c6f78df..2862d12 100644
--- a/sys-devel/gcc/gcc-7.2.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-7.2.0-r2.ebuild
@@ -8,7 +8,7 @@ PATCH_VER="1.1"
 
 inherit epatch toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
 DEPEND="${RDEPEND}