gentoo resync : 23.03.2018

8 files changed, 130 insertions, 6 deletions

diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index b97b41b81f4b..b0a2344423db 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -4,6 +4,8 @@ AUX 4.0.1/extra/0001-test-Fix-test-dependencies-when-using-installed-tool.patch
 AUX 5.0.1/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch 6888 BLAKE2B e6d9907b05f99fb21008e7533f348348a3fe81249e6bcd0c473b82ba2dbb3651f7c27ba8c84053eb9c5832de1df4de7632971fc48d47aa9fff673f76e5688263 SHA512 6d1f35f39c15b11ce631477eefcca7ade90cb08e5992839273f97c339ef6bf0deecf9625fdacbad6e8cc61e4fd213e0e1c582c407ac051d99545962e310344fe
 AUX 5.0.1/darwin_prefix-include-paths.patch 690 BLAKE2B cfb96eb259fb7d557d215be08ea3babcae6dc1353171fad7f297f787d476d28768c7c1bbe6efc7404ea638f1dc6b4b36e1c17e141faf82be623bbd96d5e09118 SHA512 5f8ecabaf43853964bffeb3953b205bea7e8928fd53637d01842723ac8344e19cc639f6f06c199f2be88b73e60b6eab1987bc5ee7dfeaea5e710eacab90f3533
 AUX 5.0.1/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch 3411 BLAKE2B a47f686dffa3e710435291670b8be7b99ea89d86092230f9acce328d24efa7ee43a5023b8deb482a497c1b54eec02c89291e4f10ad2c60382cc4ebe7c913981e SHA512 1ebfe7a6d06dd2991923cd1142c5c5b09ba2d06a3c7e0cbcb5b0f1d34aee57bf585941c0dd44ab331e9427828e5c63ea7475d673ccd3ec8617b99c59c56229a0
+AUX 6.0.0/0001-Driver-Avoid-invalidated-iterator-in-insertTargetAnd.patch 2041 BLAKE2B 27d95ce8b9eb0aa2536db6eafae8c6c72b2446f8b839338bcdfd7136ef8fcf5f5b4f3a38dffb04c73d603d8da418475edf925b2a1dc6058b00fa1e4fae048bc6 SHA512 ce45081a6a77584142502af43b77b00e6e6857dc37f04ba872453585ec007fd4cf2548cce07d1450ef8f3ece8ea7850c63ab023545330714649a6e2035f04100
+AUX 6.0.0/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch 1256 BLAKE2B e71f32b08defa1ba59b574e9314e272107638676f1b1469a448efced144c680ffde4d76e34fa3fa5786859bf6e04050bd23150d7c0b98f8849f5d9355eacb646 SHA512 260096c1c7e6ba6f35537873cb6ba83f2271cb50446c50f6f1a5c88138c23508df16c99cac8664b5be0d56f2e0fe288f51a27424ff0b56c317d7a7e07562e0fc
 DIST cfe-4.0.1.src.tar.xz 10933628 BLAKE2B bc1bb8875e83ccecd446a48cfa41f5c98a09d6ad24ff439a983f629711b4513b9c4bee4070f8df13b6b2a52d673b0706733a4c151ce5021a0233147debff14ac SHA512 936c9e1626b27e63a4fb11f3c0cb998eeaf9a520ad6e2bcd67cb4352e59e7781ecc700df79794f3fd70473d90b7e2ba418a39038eb0146b68e843f0705c1f964
 DIST cfe-5.0.1.src.tar.xz 11483036 BLAKE2B c4eb54cd8271b62cf7a2219db0b599b68c00b6e574d1946220efbd1633e841796e6717d6eeb35e84a6db32a731a3285b59cedeb3b1a8f3c3c502b799fdd0a720 SHA512 6619177a2ff9934fe8b15d6aa229abb8e34d0b1a75228d9efba9393daf71d6419a7256de57b31e2f9f829f71f842118556f996e86ee076f1e0a7cd394dfd31a2
 DIST cfe-6.0.0.src.tar.xz 11959224 BLAKE2B 257edbaedf72bd941b67b4aa2f152a96a37bbea72d21d22d4445152685efe40d75b9a7a39955545643e841ad6693ef12e52b207b9119098774f39e858b64bc09 SHA512 e886dd27448503bbfc7fd4f68eb089c19b2f2be4f0e5b26d3df253833f60b91d70b472a6b530063386e2252075b110ce9f5942800feddf6c34b94a75cf7bd5c6
@@ -21,9 +23,9 @@ EBUILD clang-3.5.2-r100.ebuild 972 BLAKE2B 0f17918969ee1034e1febc34afe95a29dddcf
 EBUILD clang-3.6.2-r100.ebuild 972 BLAKE2B 865d1b2ca82dc3e4965f676adee77bcebb285fd3071caa37a399795426f541cbfb4a380e615673a2a1ca6c2832becd21e6252b678f2c1047a0605fdb5db2845c SHA512 604f7551a0081e7de09875f54a64502e8d2e97341bd44e4d2ae35ecd2392b22b7aea5fdf4923cf196cde1de5711f05868943d3f802d975118426ee43d0877f6f
 EBUILD clang-3.7.1-r100.ebuild 1121 BLAKE2B 9cf6e15e5a2fa9d400731747105f65c8ef14d20e5a982f02b53a13ad1f269b86c298603e6625340670fffd74e434c92df7fb22cfb4cd7af4d75501a0520b5106 SHA512 5280504ce38eba8da79cf1c31b21bcbd07ad9ecb3db59a7054f829ed43d48744d16760cbaab9ef32f01345a9e7f54f8a63091dda3687115654a110f5a0e227bf
 EBUILD clang-3.9.1-r100.ebuild 1534 BLAKE2B b269b09553ec5559ad90ffdfcaa20604c10fbe394651b7a9e037a9aaac878a6ef6cc2702a1cc6123cffa0ece705b851e908ac275f7fa854d099ec2ab8bafc9ed SHA512 84a3c016f9db31c6cbcee7620330b76af97702be3e92bd0db6e58883ccc054a792003a374cb5bf9d69b8f7c89165a2853ba495d58cd02d98524cf8025e99bcf0
-EBUILD clang-4.0.1.ebuild 9517 BLAKE2B 53814f4ad9b6f0f435c539cb00f7fea4cedf4e6b0d829e4c1528cfeab8b6a76c202fcdec888ac9d84a554e7abdb1512468016b032bf4ab54a752e4f41c129921 SHA512 6888217d052286d9324d2846d8e8b0c4c88a37bcf4b2ab278c4884c1d1806a8256b922381b8bc6cd2a2f61efdfd7e6e1c8fd5f1eb90ba7515b1fcb414478436d
-EBUILD clang-5.0.1.ebuild 9759 BLAKE2B eadb4c3b6e81b070ad8f95b4b36a227de96b5246ed731eb1fa66d61627aa2eb574bf12dc23c2cbad8397f03b4654d40e5d715cf53efcf72427509080bd42e61c SHA512 1a0bdcd561a1d3ab8a99f7a543adfce37338024ad7f0061ba4443b8065f332a926e352391f1fdfcf0402a60d7072cc37e8868cb6882ead7d41e10947490ab20e
-EBUILD clang-6.0.0.ebuild 9630 BLAKE2B 810a8897b7f2a260a6cf708e3993cbd337bbcc79423421f8247f14efd4ae3487942332d5d93a51e751ab19b71c97c04bcaeb1b7716a5cd60c3b270d892a0daa8 SHA512 b38fca101ea92644cc1514ad6e1350329a86447648f9c6e9023c9526dc50a0531388d9f6b52fcac34cdc54911d30b07dc48ff117bd27c8ce2ebb040f4b58d00e
-EBUILD clang-6.0.9999.ebuild 8947 BLAKE2B f3ba920f6996ef865536689968aa0456fc71a5471e7db5109757782d435b2e0a89791523d84a5577a65e0b69e099decfaf609768a202faad4749b7ee5c4babc5 SHA512 6b43bb691894db623cca9365114fc56b43694aacc4a116b38c3111ce3c1dc4c777a19508e9b150743ba308fbfa52bf4dee8f205f42224316d72ce5bdee0f6dd5
-EBUILD clang-9999.ebuild 9012 BLAKE2B d4a03b1a7e13c33335e6a2ea8e7a9681782146e1ea00659d3d0b418cd4eac95b5a5726e9e1a9d60bff7f7f5d3b3d5721a58e65dc3728a79e2895561f755809d0 SHA512 3d9eba14975f69631272a599b30b961a008be6ae4024fe09a7a9ac24dba2dc88b9be738a30311ed7aadcf560fb6b9a9a3c70df2669348b3b414b8096e5394c60
+EBUILD clang-4.0.1.ebuild 9614 BLAKE2B 91c600b1ee83aac262ff02438138623128815753f3e2f3cf044ca238b247077cf6a9fb80f5b0f24e69dd2e15dee66355a27b8e10f6186e1d6e9b84444861fe07 SHA512 5db57f9cdb4a33cf2551b2f1f3937d497b67295f45ecec66dc4a109a3511b7cb21f3cf73ace088858b3c399deddc95c784e7e99a510b7c46e8d3fd8288c63b90
+EBUILD clang-5.0.1.ebuild 9856 BLAKE2B 4df08235dff3a8e9bef959750a1f9f19a89efccfcbc379616a06fee39c329d368cfba0031185e0730ff4c04e7add7b7fd90ffd38f62be571331203adaf0578a5 SHA512 94a8315b473ef26096d45089d3ed4e529bc57d9961e4d78ecd5aac76b4dcd0fe2752113f50d39244b83ec65edc7f11581f1cbb746b89e33b23ae7e0994714a39
+EBUILD clang-6.0.0-r1.ebuild 10071 BLAKE2B a48e4cadf1b6309dc140f7140045c83f5a9fca25b1626e3c986d408cfb2268fcf0397f534c9da2810a78ed5039497c9a3c11c23d1f5742b4a93b79b129905891 SHA512 87c6df88a1ad4c21a212f82ac391f78159b5f21c7cc8568b1f8d65bd828ebe6027bd2cd750358719598289219905c9d6f09f1b30485942593d0f93821d0038c4
+EBUILD clang-6.0.9999.ebuild 9044 BLAKE2B 3aa47ac54c0372cd06c06bda2e31217b1899f9ff2bc89050718f6fdc2f6b7df2693176fe9e4a9610ea7cf8c19fe040d6b9597abc043e22cdb92f59e452d72ba9 SHA512 d2be0fd7dff16dc2e4bcfc0cb963cb4750dd6cdad914ff7cf6f2828fab724541e7588349ecf569b41717ae793dc0a49e24b8301fc00f68913c376a647448f244
+EBUILD clang-9999.ebuild 9109 BLAKE2B 7faafdf6e670ceed893bb1d740836c2fd0dbdb81f25eb60fc55302298ab9bd5e648c3f2f95b9a01aac318a5012918beb7396df7695af64946196a98527be3181 SHA512 2a09c8373eae2b4f913ee63fc6dbf2a522b8fadd2322bc75c5c8cd09b6a04c1a69810b3da687a820e88851aa3d67d6dcfee92c694e0fddf80d05327c0fc243ef
 MISC metadata.xml 1455 BLAKE2B 9dd88bba7158dfdc83bfc48fa4134e1f5a3357ab778cad400a51e348bbb4b44d2740ec417fdc888df0b4fd820441649e92b7adffdd4db558a2f4c3f4830a83a1 SHA512 369a87bd551e483e81ff56f5167177b1bcfedf9bc97f501ef2b07bfdfea3a25532f5e86af062568b3b22a53fe07318fd93dc55bd83b453dd10a0f4d3e88cb932
diff --git a/sys-devel/clang/clang-4.0.1.ebuild b/sys-devel/clang/clang-4.0.1.ebuild
index 6c37d1fd9594..e3cdd3ce84a8 100644
--- a/sys-devel/clang/clang-4.0.1.ebuild
+++ b/sys-devel/clang/clang-4.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -164,6 +164,12 @@ multilib_src_configure() {
 		)
 	fi
 
+	if [[ -n ${EPREFIX} ]]; then
+		mycmakeargs+=(
+			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+		)
+	fi
+
 	if tc-is-cross-compiler; then
 		[[ -x "/usr/bin/clang-tblgen" ]] \
 			|| die "/usr/bin/clang-tblgen not found or usable"
diff --git a/sys-devel/clang/clang-5.0.1.ebuild b/sys-devel/clang/clang-5.0.1.ebuild
index 4c30e033af76..b16d9564915d 100644
--- a/sys-devel/clang/clang-5.0.1.ebuild
+++ b/sys-devel/clang/clang-5.0.1.ebuild
@@ -178,6 +178,12 @@ multilib_src_configure() {
 		)
 	fi
 
+	if [[ -n ${EPREFIX} ]]; then
+		mycmakeargs+=(
+			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+		)
+	fi
+
 	if tc-is-cross-compiler; then
 		[[ -x "/usr/bin/clang-tblgen" ]] \
 			|| die "/usr/bin/clang-tblgen not found or usable"
diff --git a/sys-devel/clang/clang-6.0.0.ebuild b/sys-devel/clang/clang-6.0.0-r1.ebuild
index 7e9999198164..a8ab8bbb6b6a 100644
--- a/sys-devel/clang/clang-6.0.0.ebuild
+++ b/sys-devel/clang/clang-6.0.0-r1.ebuild
@@ -70,6 +70,13 @@ CMAKE_BUILD_TYPE=RelWithDebInfo
 PATCHES=(
 	# add Prefix include paths for Darwin
 	"${FILESDIR}"/5.0.1/darwin_prefix-include-paths.patch
+
+	# fix Driver crash with CHOST prefix and long command-line
+	# https://bugs.gentoo.org/650082
+	"${FILESDIR}"/6.0.0/0001-Driver-Avoid-invalidated-iterator-in-insertTargetAnd.patch
+	# fix test failure with default-compiler-rt
+	# https://bugs.gentoo.org/650316
+	"${FILESDIR}"/6.0.0/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch
 )
 
 # Multilib notes:
@@ -179,6 +186,12 @@ multilib_src_configure() {
 		)
 	fi
 
+	if [[ -n ${EPREFIX} ]]; then
+		mycmakeargs+=(
+			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+		)
+	fi
+
 	if tc-is-cross-compiler; then
 		[[ -x "/usr/bin/clang-tblgen" ]] \
 			|| die "/usr/bin/clang-tblgen not found or usable"
diff --git a/sys-devel/clang/clang-6.0.9999.ebuild b/sys-devel/clang/clang-6.0.9999.ebuild
index dc7101832912..509b47b788fb 100644
--- a/sys-devel/clang/clang-6.0.9999.ebuild
+++ b/sys-devel/clang/clang-6.0.9999.ebuild
@@ -164,6 +164,12 @@ multilib_src_configure() {
 		)
 	fi
 
+	if [[ -n ${EPREFIX} ]]; then
+		mycmakeargs+=(
+			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+		)
+	fi
+
 	if tc-is-cross-compiler; then
 		[[ -x "/usr/bin/clang-tblgen" ]] \
 			|| die "/usr/bin/clang-tblgen not found or usable"
diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
index 0014ecde46b2..10c2dbd94ce6 100644
--- a/sys-devel/clang/clang-9999.ebuild
+++ b/sys-devel/clang/clang-9999.ebuild
@@ -165,6 +165,12 @@ multilib_src_configure() {
 		)
 	fi
 
+	if [[ -n ${EPREFIX} ]]; then
+		mycmakeargs+=(
+			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+		)
+	fi
+
 	if tc-is-cross-compiler; then
 		[[ -x "/usr/bin/clang-tblgen" ]] \
 			|| die "/usr/bin/clang-tblgen not found or usable"
diff --git a/sys-devel/clang/files/6.0.0/0001-Driver-Avoid-invalidated-iterator-in-insertTargetAnd.patch b/sys-devel/clang/files/6.0.0/0001-Driver-Avoid-invalidated-iterator-in-insertTargetAnd.patch
new file mode 100644
index 000000000000..20ba89bf126b
--- /dev/null
+++ b/sys-devel/clang/files/6.0.0/0001-Driver-Avoid-invalidated-iterator-in-insertTargetAnd.patch
@@ -0,0 +1,55 @@
+From 99418eabfbe5378d7a751444856c6c5c656519c4 Mon Sep 17 00:00:00 2001
+From: Serge Pavlov <sepavloff@gmail.com>
+Date: Mon, 19 Mar 2018 16:13:43 +0000
+Subject: [PATCH 1/2] [Driver] Avoid invalidated iterator in
+ insertTargetAndModeArgs
+
+Doing an .insert() can potentially invalidate iterators by reallocating the
+vector's storage. When all the stars align just right, this causes segfaults
+or glibc aborts.
+
+Gentoo Linux bug (crashes while building Chromium): https://bugs.gentoo.org/650082.
+
+Patch by Hector Martin!
+
+Differential Revision: https://reviews.llvm.org/D44607
+
+
+git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@327863 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ tools/driver/driver.cpp | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp
+index fa757da953..1b614accb2 100644
+--- a/tools/driver/driver.cpp
++++ b/tools/driver/driver.cpp
+@@ -212,20 +212,21 @@ static void insertTargetAndModeArgs(const ParsedClangName &NameParts,
+   // Put target and mode arguments at the start of argument list so that
+   // arguments specified in command line could override them. Avoid putting
+   // them at index 0, as an option like '-cc1' must remain the first.
+-  auto InsertionPoint = ArgVector.begin();
+-  if (InsertionPoint != ArgVector.end())
++  int InsertionPoint = 0;
++  if (ArgVector.size() > 0)
+     ++InsertionPoint;
+ 
+   if (NameParts.DriverMode) {
+     // Add the mode flag to the arguments.
+-    ArgVector.insert(InsertionPoint,
++    ArgVector.insert(ArgVector.begin() + InsertionPoint,
+                      GetStableCStr(SavedStrings, NameParts.DriverMode));
+   }
+ 
+   if (NameParts.TargetIsValid) {
+     const char *arr[] = {"-target", GetStableCStr(SavedStrings,
+                                                   NameParts.TargetPrefix)};
+-    ArgVector.insert(InsertionPoint, std::begin(arr), std::end(arr));
++    ArgVector.insert(ArgVector.begin() + InsertionPoint,
++                     std::begin(arr), std::end(arr));
+   }
+ }
+ 
+-- 
+2.16.2
+
diff --git a/sys-devel/clang/files/6.0.0/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch b/sys-devel/clang/files/6.0.0/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch
new file mode 100644
index 000000000000..0c6644891069
--- /dev/null
+++ b/sys-devel/clang/files/6.0.0/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch
@@ -0,0 +1,30 @@
+From f81bc3f2d174ac21e576cdddb736524531258fbe Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 19 Mar 2018 20:55:47 +0100
+Subject: [PATCH 2/2] [test] Fix Cross-DSO CFI Android sanitizer test for
+ -rtlib=compiler-rt
+
+Fix the CHECK-CFI-CROSS-DSO-ANDROID test to be more precise and match
+specifically 'clang_rt.cfi' rather than any compiler-rt library. This
+fixes the failure when the linker command-line contains
+clang_rt.builtins library due to CLANG_DEFAULT_RTLIB=compiler-rt.
+---
+ test/Driver/sanitizer-ld.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/Driver/sanitizer-ld.c b/test/Driver/sanitizer-ld.c
+index 0da4255f69..9309450186 100644
+--- a/test/Driver/sanitizer-ld.c
++++ b/test/Driver/sanitizer-ld.c
+@@ -514,7 +514,7 @@
+ // RUN:     --sysroot=%S/Inputs/basic_android_tree \
+ // RUN:   | FileCheck --check-prefix=CHECK-CFI-CROSS-DSO-ANDROID %s
+ // CHECK-CFI-CROSS-DSO-ANDROID: "{{.*}}ld{{(.exe)?}}"
+-// CHECK-CFI-CROSS-DSO-ANDROID-NOT: libclang_rt.
++// CHECK-CFI-CROSS-DSO-ANDROID-NOT: libclang_rt.cfi
+ 
+ // Cross-DSO CFI with diagnostics on Android links just the UBSAN runtime.
+ // RUN: %clang -fsanitize=cfi -fsanitize-cfi-cross-dso %s -### -o %t.o 2>&1 \
+-- 
+2.16.2
+