gentoo resync : 13.03.2018

4 files changed, 25 insertions, 13 deletions

diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 8a3f40865b1a..cb84579b95d0 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -46,7 +46,7 @@ EBUILD llvm-3.7.1-r3.ebuild 16958 BLAKE2B fd7a7890b0041c216fe4b21937a578b2a00da2
 EBUILD llvm-3.9.1-r1.ebuild 16507 BLAKE2B 83692ac24d5df082c1eab87ef85353a44a485332fa5720414a5965d379939e82aa6bfccb2fb513bc8c18872184d4ef99a02dc4766dad5bd555f887b2a9122589 SHA512 1234349f89c1d2b07e1918075b52f2866e56cc742d3f3da233dd8465c559c765c7cb256f1d6eb77ee61fede9be2c84bd6236c42e5672d5130f0e7730ee24de96
 EBUILD llvm-4.0.1-r1.ebuild 6840 BLAKE2B f4e1c45ddfb1e60e040193a5014b7968bdbd28e619fdb3fdeff58d3f1961c9768639b448026ba5c78f3016766c196fb733f4b787aefae12a11505679fc3a09a2 SHA512 66837bee739c86c6eac2d9dbc2b7556c5ef57674ab705dc5ef8d226753fad98dca22069d776b30501f644e77c66e03ba69b53c8fe274d8e0e67ac52c0bbafe8b
 EBUILD llvm-5.0.1.ebuild 7166 BLAKE2B a5395cb2b7e2d9d8c479500fce98142368480d9f29dac51da47d5cb0288e86360389529cc671815a7de2ead632976980cb9e9326210ac2cf659c528d909bff74 SHA512 65dd55857ead0993f48611c37bad53ec0ad7b5eb7b1e7d4aff0e8d22b961b1da69e7174d2f4392cd4a9d983e24cd6d015453b2347ffc0e4219baf3f1c746e2b9
-EBUILD llvm-6.0.0.ebuild 7451 BLAKE2B 0adc957ceeadc88a8dbd7379cb54b987c5322672feabc336cfb86db737bba4dd4f7f8b4509a3b8e9b45bb54720fffab12fb84b22f1afb97ce4444f8c4ea6479d SHA512 2b469d47086009eb21a9fb85529f6887b703f93674c6d931605050eb04b79d9b7e6b838a5d26e4be21c9cf16c03617884d33dcb1045903e641584c8b2b4a503e
-EBUILD llvm-6.0.9999.ebuild 6837 BLAKE2B 0bd92685277dee50c8d419781ae5c7a1d5085850e9591071606375547fb214cf41c06b18c658298121b98de47a3000900a8fe6d67ee8848ad34e87d098f585a4 SHA512 8e137774e5d281b563bc067253aea44a3e2c6d7c2cb07f495da4c56681f4c6022127a5595c13459d89a3db572de2ddb18b4c8a0e2c9951975a100d259b41b680
-EBUILD llvm-9999.ebuild 6991 BLAKE2B 13cb42108c8d716d01efb9103c82f168c90d90368267e5180d1122d0bd7c948d86702abec0aead0f4c38282fb13d0658b1e7932153b393fa97128e8e06a2273d SHA512 c571b63f15f6664df0121a057bf1039654fce05579fd8485045d8b427d49b7a583ffdeccadfb56563160ca6b130ffb20c0673f56c1e2619e432ed5f9108976a3
+EBUILD llvm-6.0.0.ebuild 7378 BLAKE2B bff6ac03d2a44ec5e30b69adfa9cb19a46cc90c5c838057c83bcf58c699ead7155cebf60bd91abd73adb0a3a9db7dc60d48d48b26bf90b1806df703f9439d755 SHA512 a579e991669ec26fe3d14992e30862356afc6478a12d4198ec219e52e3d7b9862b33b49c15396fc5dc345bfd1d77c569f0680315bbd05dc26952d5f825aa98b9
+EBUILD llvm-6.0.9999.ebuild 7084 BLAKE2B 3f6b7e53143ba75153e7d4c2b8c3eb4b7c8df5f5abdd3430fb2bf22781887fee9def5e5da84935ebbb45363f05b6e1c5d25d6634aa382acd56867b482860785e SHA512 63d759ed99eb2e1ba44f0ac2b8695083cec9424fc24023f3f1008042a86c0eb3dc19d8b983050a94b378142c40a885b901468dc4d4d1791cad8238fe9626380c
+EBUILD llvm-9999.ebuild 7238 BLAKE2B dfc6b14a552f31616270bf75bb345b9e241690eaf6478d07f86de3838bd19392752a375e52e41919702590b5ee1437fa6cedf61cfbb603d9c1e67fb5f6432757 SHA512 9b07f4239d6590f112af2db611ff8b85caf77cfad3fd7948bb9f9f1b1bc4e074d0a111a6b88894a6475706081855a444a64156251fa82ec2fc27ad26eac7390a
 MISC metadata.xml 2861 BLAKE2B 3102fbcb2d2fe9f173f01dddc4617115e8cd569b2ced486c45affcba348a922cf09974e1bf977f0ac5ec8bb42b9fb87b1005cebcf74120cdb96f03ad8a1ae406 SHA512 0ea8dc63287f86428f6c7cce5f5be821d16f2b473c2b8d09c2edcc1e1d3ed445e3eaba1c96aaedbd13163f61e0c1deaad9df5c410bf1e73d05ad1bace88ec95e
diff --git a/sys-devel/llvm/llvm-6.0.0.ebuild b/sys-devel/llvm/llvm-6.0.0.ebuild
index f38524606bb8..f0d491628ab9 100644
--- a/sys-devel/llvm/llvm-6.0.0.ebuild
+++ b/sys-devel/llvm/llvm-6.0.0.ebuild
@@ -32,7 +32,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LICENSE="UoI-NCSA rc BSD public-domain
 	llvm_targets_ARM? ( LLVM-Grant )"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc gold libedit +libffi ncurses test xar xml
 	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
 RESTRICT="!test? ( test )"
@@ -75,15 +75,6 @@ S=${WORKDIR}/${P/_/}.src
 # least intrusive of all
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
-pkg_pretend() {
-	if tc-is-gcc && [[ $(gcc-major-version) -ge 7 ]]; then
-		eerror "GCC 7 is known to cause mis-compilation that causes the build to hang."
-		eerror "Please use an older version to build LLVM until a good solution is found."
-		eerror "Bug report: https://bugs.gentoo.org/649880"
-		die "GCC-7+ is not supported"
-	fi
-}
-
 src_prepare() {
 	# Fix llvm-config for shared linking and sane flags
 	# https://bugs.gentoo.org/show_bug.cgi?id=565358
@@ -179,6 +170,13 @@ multilib_src_configure() {
 		)
 	fi
 
+	# workaround BMI bug in gcc-7 (fixed in 7.4)
+	# https://bugs.gentoo.org/649880
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]; then
+		local CFLAGS="${CFLAGS} -mno-bmi"
+		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
+	fi
+
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
 	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
 	cmake-utils_src_configure
diff --git a/sys-devel/llvm/llvm-6.0.9999.ebuild b/sys-devel/llvm/llvm-6.0.9999.ebuild
index 38353f69eef9..631422bd1ad4 100644
--- a/sys-devel/llvm/llvm-6.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-6.0.9999.ebuild
@@ -170,6 +170,13 @@ multilib_src_configure() {
 		)
 	fi
 
+	# workaround BMI bug in gcc-7 (fixed in 7.4)
+	# https://bugs.gentoo.org/649880
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]; then
+		local CFLAGS="${CFLAGS} -mno-bmi"
+		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
+	fi
+
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
 	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
 	cmake-utils_src_configure
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 603571a0bd65..1c439e6fd6a5 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -172,6 +172,13 @@ multilib_src_configure() {
 		)
 	fi
 
+	# workaround BMI bug in gcc-7 (fixed in 7.4)
+	# https://bugs.gentoo.org/649880
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]; then
+		local CFLAGS="${CFLAGS} -mno-bmi"
+		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
+	fi
+
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
 	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
 	cmake-utils_src_configure