Add missing clang patch.

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0x9627F456F9DA7643!

3 files changed, 50 insertions, 16 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 78c541799320..4e384ee76aae 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.116 2013/07/21 10:00:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.117 2013/07/21 10:02:41 mgorny Exp $
+
+  21 Jul 2013; Michał Górny <mgorny@gentoo.org>
+  +files/clang-3.1-gentoo-runtime-gcc-detection-v3.patch:
+  Add missing clang patch.
 
 *llvm-9999-r1 (21 Jul 2013)
 *llvm-3.3-r1 (21 Jul 2013)
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index a7305cc38d1a..e3cfc9e2cd08 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX cl-patches/0001-r600-Add-some-intrinsic-definitions.patch 2450 SHA256 b0a718800c8969e174f3a22e61c15a370376f477e031fe97fff6aaab152f9867 SHA512 d23f9645d3e3364b1e9ce522eb15022fd3f2a685741db88b117b409ee33a07344a8e9ba9d89dc3535e5289edf79c6beb7ff144659f4e725b1a8f2c4256f9aad0 WHIRLPOOL c549806dbe5309dc441b65c942de488c6afc8c511d060d5c1459a4f99b97a357acbec51ce51bd704e5e1e74437cd413755f15377ad6b96c235242bc370af096f
 AUX cl-patches/0002-r600-Add-get_global_size-and-get_local_size-intrinsi.patch 1189 SHA256 172bbb3cb1214e61ee2684c133317bb997e94a34c91dae94d4848cbd0c216436 SHA512 cf711149c421b4258bc64b81018d0a9474d8b4e4128d0cc0cea788b54c93e9512397b2310db8a1834c3507b4d893d5743dbc53183ac0daca23da55601b976c16 WHIRLPOOL 8e6bd9f005a6a941c55d7c8d9b127826191944fab9e404f8ed958efd07017f5f9301273739f869a73f15fc2a79af9dc18687ff85403acf24e175a464838b3f2e
+AUX clang-3.1-gentoo-runtime-gcc-detection-v3.patch 1457 SHA256 f4b22281d21e39bc4681519cec90243c0e50262ce56ae68b0a8d9e7d92ce0375 SHA512 81c582791f4b0b1ccfcf3e8c82fbb68312320c5287402236d8c6d2d76767bbba031094c26d2b7bd9581c473896b78dda5a6284c5a87726e1bc0c539ae9294763 WHIRLPOOL bb68797804c89f8797561964697a72a015daf2c951d92f490f8c83f38aac6f50ce1527f39b53ccc6a3d93f84ec8f868e40340a5472b9e7ee4c34ceaa4b9ca845
 AUX clang-3.3-gentoo-install.patch 2869 SHA256 9c36b1611812ffec6b677131704a39a034a5553aa76e9a9eca24b6281fdb467a SHA512 d81a55d89fcb7a405337813cdd53ef9d462cc08b3848072bd456009d2f9c4fad2b9b149cc133f83b5ed51123115427dbb2fce82a3b3d4f8d98f1d8a350ca6eb9 WHIRLPOOL 4c34e25534fb886bfec2bdf2c42d987e14a99db2231b0a31bd177d6e5e1dee4a7d4368e281a419db5e42740d76c9152c10a74f09d3b3402eefd3b13bb296016d
 AUX llvm-2.6-commandguide-nops.patch 975 SHA256 0e36fb43e020fa380230a8c6f2a79b9a19e12e857e833ef856e2b41aaa283649 SHA512 6842285e499b86581ca12fd94f5335e0dcd7afcaf0cdc5042ee8d84d0da6aba6659652eb639027bcad7caf77b0c994ac7e181a15bc609c4b3882e0f391c8cd33 WHIRLPOOL bf1212a8fd06214dba0916a73266842558bed740220d68e3447701ffeba1b3020ca4b4ab5c6d57772a60a6e09f153232f680b1e0b11cbd5d430bd9ef693d2926
 AUX llvm-2.7-nodoctargz.patch 1878 SHA256 983657329ebede731b397ba0256d729b3958f39faea64c9f7d065ab8d2a3e7fd SHA512 3f9dd34437c6dba8246cdf5c8563889f805f3c8e579190c4f0fb06f72bf5aa112ecbfa18467a35eceaadcd470544f434f319f048cb58d6631170788b10fcc75b WHIRLPOOL 63182867bf8f0bd6ca1b7d97229fd13952526d59587192727348026e8a759f1c6b79db044760465e2424851fdbdf79e4122c5bb0285b505d20f151334063e8d1
@@ -42,24 +43,24 @@ EBUILD llvm-3.3-r1.ebuild 11830 SHA256 cf1098b85af5c99e0b1947b1b84039cb63dec374a
 EBUILD llvm-3.3.ebuild 6741 SHA256 e1f89537832dfd507c15880aee4e50ff5ac9163b2e0318783efd9470f83cab5e SHA512 bdf380643739a73fccae18abda3268912d8639b1dcf06f2c62e2832026ef82183fc736e7bdeb6582934b852ab70def1ce1b649d0128b9a680fd971db822b53fa WHIRLPOOL aad005b5d0c5f117b23cb9e365f967f928c09a75c58992dbd04b6545e9ce9020f2187fbc3071b2acf85f8e5a4092ef0fd75a34008228ca4d7441b638b4ce0cb4
 EBUILD llvm-9999-r1.ebuild 10743 SHA256 071d94892ea8b265d9433426979f9fbd5b553a03ab8c598af530b9f76562bc8d SHA512 0f923b80741ce7b64619562abc2f7b04dc0f1ec697464e67953e02b41267f44954b77565a3c70502fdb2bc1aaea9093235d006fac8c00ed1d082c19a165b0869 WHIRLPOOL dc4d1b8e74d75d021935f6003cffbb8b42fe4eca885fdae90b61a42e4a8fc1b7f31d4b49c699f1e5d2aa2e019d3591bcc547612889273f2e6fb96cbd9413bfd9
 EBUILD llvm-9999.ebuild 6403 SHA256 0bf8cf6152efca605f4dae6d2ff8dd50741a4b982df3a6a5dd983eb2084aea81 SHA512 522af6dc0e657f7a3b7b53662c540a1618e229f30f47169542675a26bea9024da234eb6b265d93cd68bc3ecb95b5c2d16997d83faf8a55d2514a99a62ab021c9 WHIRLPOOL 0b59232b99db28eb39e5bfcf00447dcc8213247691ed7942648c3bbfd1ca091c98d8f9c1b5b06dd04aefcd6612fe03c38d30fc1df2c5d84ab85c0afa0554da8f
-MISC ChangeLog 19532 SHA256 bbade035024f827ee1db21b30a0e95387598a353f5581948a6c9298a80ba2821 SHA512 dde02d7333c93ece65f435c9e7d8d918a713ba5d8b34e896ff80a1381d5ceab3b422f28cd9da260023499b73493e1354ed9c6a46fe6ba72881f97075fb02f135 WHIRLPOOL 4f73916910345af9de472803bea2438d745f0589a92a2c065cd95e2c03d87b38c0ffd1ff2917646a64dc8b1053600b1403a90f30571ca6241f8cae5aa2083df5
+MISC ChangeLog 19668 SHA256 36e78403699581060d7ac7ba162bd02f357cdf6070f668e3feacf39c5c387603 SHA512 96b905432c3b9dfa77a4e24b53e3b288a0ed90883591ee3f844ae3a2ce9a5f40a9968e693c8373640067e8a9aef42e914b60105dde187b7dbdc15fa97ee9937a WHIRLPOOL 138a9ecf8a9a2b9c0b899af7e24cec2ad6a96b692824d0859c1f7916e3567c61fea380fa8dc2124f30f6ad51c5c47aed8c30b5f0e79f65b57ac56922af6fb6d5
 MISC metadata.xml 2632 SHA256 2600c9022e42659f3c9201ecc0387455d2b76d70225ba4c9be8420c55fa6ab07 SHA512 43702a59d30b6bbc57d7f33497b3889d3dddf228776e8a79946ca868269451e6fa5666f561ae99fe035851bb305c6e9d3eb5de5955f1cc84bd62d557ad4ec314 WHIRLPOOL 143e68e5f52836d6bc6de79e7c055d7f776e49b17d563bb71e84f37b16f207e0cede39ee6c4b29bc566fc1b102ecd16743e596509fdcf239ffb8bced13b15ac2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJR67FrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJR67HSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDjA8P/jwgTjmnz15o7ywuSejKcEJI
-caPMaEAnVoSqmUPrXyqmMF70PxBKJR/xtZ9xSEhRntNivIPgakQvSQRaz/4z7O+o
-jwqDwYLc+sJT7tTemtrlBvgxAekXDVqUXn9wIxM8Y2PI9fWCoJdxsaknaE2Bm2kI
-TynbSeDgH7UhF9aAcwu8OeT8T+Mcjfzv5eWvEfYqGX43sUaZj2n+N+MFxkdJsVYK
-Z+VBFou90cWny4mti66S3IvJgyXLluEtrqn5WL3/u2LAAJ0H6M7o8aXx1JhvMAl8
-KV/1ka37dpkra0Z4++4OAQyybfddZjY/uDBU73qzDiw1J/KtfyU9JzjzI1hhnL9j
-5WaqganOcTmxdkTXl7VvfWtHaV/KQW5TzT0BVaE7MXUzqObLXS6bp4NelKYZDIGM
-/FWKmx2hRjLVRBwKyaYVuYJbkCkC3oBSEwpoIBqkrgk6HjcTBLTzAjBF2eS4/Xqr
-KcP1qQNiTerGO07/cGafp3o/xyfuE792jinlAs2Y+HaVE+vrv7TQCFlc7jC6gXhP
-EHaASkNVxneeevO9/AzPgl7m7f5ieD9Na3fH9l9hc1edIPBMqNwlt5OqEPEpq2jj
-3brmvChc72tMCG1SaLhplJtc2mQg20D5D1xS7Dh1Nl65eZsjrkAIp9Pwqw9l/Idx
-fDdUMAyBGmvoPFl547YU
-=sO98
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZD9DkQALnlJPeXBgSh2Jlet2OxUuNT
+HyyZ2R+SD51ac198O55iZQxKCWh+KXv/g1qZKGvOHWv7gqXk5wiGrLMt1nXYkhIh
+bUXMeH5BDIxcg8ACfo6ZcydmJG3UZR+08nuORwaSKH6VWPsaV4ckrADqbK9V0F3R
+IcBebM0ZRTA64fCbnt1zRvvhtg8fyyJCxllqI1bEIMVVC2MSjpGKupdBks6tjE6c
+ThcDK7F7QHcP+CmCZytx8sQowyOaRiRsW2XPd8Hv5scV4kAv/Cicie3T5nPns+6N
+xMCtycD43WnNcHPPX0ylRZT83DQl+HoH/w9RvTRIlcKiv0RlwQQI7UNhLaGvKrKj
+/2pofZOZZ06Z9+foIKdVwcsPCKVhoyahP4B0bk/GqNo7YEi6BMaqcpOPs2lS/QWj
+dQRjOU829pB8Yn+PAT0TeFFGjLSULcE3cXS0v+k7odtYLOX4r775hXUw5mdgUW86
+JSme+tZu4YvqT+VPWbb5wMTaxviWm+6+R9BpSyhSr5cu0YWQe33m+ocZ9eCH5Gs/
+kOtq77DylYducCdawI1nVHAUMdreMTE1tk2ionCnZ0FENUq1qUwG0yhDBfsdI7GL
+e2tWAXffyAs3W+RJ5I8Jxvg1aR0jbO9qjgEpn1c56w6pTG5nWtlHCmijgWgJOzNj
+JB0/2uiWhyUN21N8E38Z
+=0U6D
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/files/clang-3.1-gentoo-runtime-gcc-detection-v3.patch b/sys-devel/llvm/files/clang-3.1-gentoo-runtime-gcc-detection-v3.patch
new file mode 100644
index 000000000000..49f108533404
--- /dev/null
+++ b/sys-devel/llvm/files/clang-3.1-gentoo-runtime-gcc-detection-v3.patch
@@ -0,0 +1,29 @@
+diff -upNr a/llvm-3.1.src/tools/clang/lib/Driver/ToolChains.cpp b/llvm-3.1.src/tools/clang/lib/Driver/ToolChains.cpp
+--- a/llvm-3.1.src/tools/clang/lib/Driver/ToolChains.cpp	2012-05-24 03:32:31.593191000 -0400
++++ b/llvm-3.1.src/tools/clang/lib/Driver/ToolChains.cpp	2012-05-24 03:38:31.733163513 -0400
+@@ -1145,6 +1145,25 @@ Generic_GCC::GCCInstallationDetector::GC
+     Prefixes.push_back(D.InstalledDir + "/..");
+   }
+ 
++  llvm::OwningPtr<llvm::MemoryBuffer> File;
++  for (unsigned k = 0, ke = CandidateTripleAliases.size(); k < ke; ++k) {
++    if (!llvm::MemoryBuffer::getFile(D.SysRoot + "/etc/env.d/gcc/config-" + CandidateTripleAliases[k].str(), File))
++    {
++      bool Exists;
++      const std::string VersionText = File.get()->getBuffer().rsplit('-').second.substr(0,5).str();
++      const std::string GentooPath = D.SysRoot + "/usr/lib/gcc/" + CandidateTripleAliases[k].str() + "/" + VersionText;
++      if (!llvm::sys::fs::exists(GentooPath + "/crtbegin.o", Exists) && Exists)
++      {
++        Version = GCCVersion::Parse(VersionText);
++        GCCInstallPath = GentooPath;
++        GCCParentLibPath = GCCInstallPath + "/../../..";
++        GCCTriple.setTriple(CandidateTripleAliases[k]);
++        IsValid = true;
++        return;
++      }
++    }
++  }
++
+   // Loop over the various components which exist and select the best GCC
+   // installation available. GCC installs are ranked by version number.
+   Version = GCCVersion::Parse("0.0.0");