Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/3.9.0/, sys-devel/llvm/files/3.9.0/compiler-rt/, ...
Date: Sun, 28 Aug 2016 16:19:33
Message-Id: 1472401165.2ab1d293f6a880b9111284c26e7e71458604fa30.mgorny@gentoo
1 commit: 2ab1d293f6a880b9111284c26e7e71458604fa30
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 28 14:46:09 2016 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 28 16:19:25 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ab1d293
7
8 sys-devel/llvm: Bump to 3.9.0rc3
9
10 profiles/base/package.use.mask | 6 +
11 sys-devel/llvm/Manifest | 6 +
12 ...e-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch | 0
13 ...clang-runtime-into-usr-lib-without-suffix.patch | 0
14 ...make-Make-CLANG_LIBDIR_SUFFIX-overridable.patch | 0
15 .../clang/darwin_prefix-include-paths.patch | 0
16 .../llvm/files/3.9.0/clang/default-libs.patch | 703 +++++++++++++++++++++
17 .../clang/gentoo-runtime-gcc-detection-v3.patch | 0
18 ...ll-compiler-rt-into-usr-lib-without-suffi.patch | 25 +
19 .../llvm/files/{3.8.1 => 3.9.0}/lldb/six.patch | 0
20 .../files/{3.8.1 => 3.9.0}/llvm-config-r1.patch | 0
21 sys-devel/llvm/llvm-3.5.0.ebuild | 4 +-
22 sys-devel/llvm/llvm-3.5.2.ebuild | 4 +-
23 sys-devel/llvm/llvm-3.6.2.ebuild | 4 +-
24 sys-devel/llvm/llvm-3.7.1-r3.ebuild | 8 +-
25 sys-devel/llvm/llvm-3.8.0-r3.ebuild | 12 +-
26 sys-devel/llvm/llvm-3.8.1-r2.ebuild | 14 +-
27 sys-devel/llvm/llvm-3.8.1.ebuild | 12 +-
28 ...{llvm-3.8.0-r3.ebuild => llvm-3.9.0_rc3.ebuild} | 97 ++-
29 sys-devel/llvm/llvm-9999.ebuild | 5 +-
30 20 files changed, 818 insertions(+), 82 deletions(-)
31
32 diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
33 index bcfb9bb..4f9d441 100644
34 --- a/profiles/base/package.use.mask
35 +++ b/profiles/base/package.use.mask
36 @@ -5,6 +5,12 @@
37 # This file requires >=portage-2.1.1
38 # New entries go on top.
39
40 +# Michał Górny <mgorny@g.o> (28 Aug 2016)
41 +# lldb fails to build in the current RC, and needs a lot of minor fixes.
42 +# It's no longer available in -9999 line, and it won't be in 3.9.0
43 +# either unless somebody steps up to fix it.
44 +>=sys-devel/llvm-3.9.0_rc lldb
45 +
46 # Thomas Deutschmann <whissi@g.o> (26 Aug 2016)
47 # It's only supported on amd64, ia64, powerpc and x86
48 dev-db/percona-server numa
49
50 diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
51 index 20d4862..0d46bfc 100644
52 --- a/sys-devel/llvm/Manifest
53 +++ b/sys-devel/llvm/Manifest
54 @@ -4,21 +4,25 @@ DIST cfe-3.6.2.src.tar.xz 8617576 SHA256 ae9180466a23acb426d12444d866b266ff2289b
55 DIST cfe-3.7.1.src.tar.xz 9110616 SHA256 56e2164c7c2a1772d5ed2a3e57485ff73ff06c97dff12edbeea1acc4412b0674 SHA512 8e3285a32ad0fd4721fa77c4fb9709f31bb4e4f7cb5245357aaf57b0767b6ef18a30d902b59d1437a6febffb6c2128214f9ce5aa913bb298743221a28c4f9de5 WHIRLPOOL ce300f5023bddda59ee055e4dccdca8bf459fae5d4e91c44262d2830c406b798d697d1bf3c6326ff41b969a8439f94a3c83570f1d0151a7f0223eb0d8f324f7b
56 DIST cfe-3.8.0.src.tar.xz 9627228 SHA256 04149236de03cf05232d68eb7cb9c50f03062e339b68f4f8a03b650a11536cf9 SHA512 fef431d63f95a394d53e3857fb6a6bde7a7b27f40ef5111b4353bcb63ac26febec8a9eb84780187c49699ab099834f13f996f085d02c365676b3fa5bbcc03dcd WHIRLPOOL 10fd94f75f645318ed3436454ccffd570a88cafe35e870563b5f4d89c37b9bdbe282d8793301ca53db6774cc223b2ff7ab0af99293413cac3deefcf5150fcca3
57 DIST cfe-3.8.1.src.tar.xz 9605548 SHA256 4cd3836dfb4b88b597e075341cae86d61c63ce3963e45c7fe6a8bf59bb382cdf SHA512 72d23a410271b50f97371b13dd7a6c6c5c0a993e35df436ab716ece8521d83406aa3d4bf8fdecd8154139f39fd5e011e480d405225d8c3ff152d0a2ac4573e04 WHIRLPOOL 7bcc9e6fed871b7490e2a280f2ad36008150a0af3605357fbe529aea8a7acbbed41c7da273dd150f8f50869cd321f114e909236261c4dd05ed7f644c75f208c4
58 +DIST cfe-3.9.0rc3.src.tar.xz 10390412 SHA256 cb06bb2403cc13bd2bc561222a9854d1aa52d96cf48b4a24d9e4b0b6832c96ec SHA512 cc7260222bf91283879fb3f59d0924df60da5f18dd73ea054a587ef4c0628f6c49ac72289c777e018462f38592dfd1bfc72f6cc5bce1f6be09782da8e420eeaa WHIRLPOOL f93c16291c35dd5e8f6483f2ad05d116a18e9fba8c3b3ae4d0e78f510345793063796b2b4587815290d1d69a35b0109ed9dc640931e9e343e4b69af350c72277
59 DIST clang-tools-extra-3.5.0.src.tar.xz 216256 SHA256 2981beb378afb5aa5c50ed017720a42a33e77e902c7086ad2d412ef4fa931f69 SHA512 5ff2cc5d143b78fbe6645486f02e50f738a92aaf6b8e85cfc6f91e659684686b12e61fc8f00b814b4372c5ed2c2b1be5eca61ea696fbe074b815877b799534ee WHIRLPOOL 10b5afc550fa6a8c33739fbf9268e934732b2892842d398152676e66ab90aed3c6e1bae02bc1b8aa0a9a917b6b450f60950317a9eda3f9e377971cbe00164b11
60 DIST clang-tools-extra-3.5.2.src.tar.xz 215804 SHA256 f21a374d74b194d8c984546266491b518859b5f12ed9abd49337b8060d3fc004 SHA512 6a8e662d2704147296c13626fbc5885911c646c67404f12eacc67ee2995221445bf4f6122b271b9cb3a56b716f550a651024822f72358d400b9052bf50423669 WHIRLPOOL 088d2725a88a439a1a2c4048e0eaf540587078078bd1c9823a4804200265cab4d32606abf5e72be76da45ea4aa6e7a7201a2bdbddc78d5f9e0024b0d7b59e222
61 DIST clang-tools-extra-3.6.2.src.tar.xz 248624 SHA256 6a0ec627d398f501ddf347060f7a2ccea4802b2494f1d4fd7bda3e0442d04feb SHA512 1b7710a7deee30cefb6a3b4edb026a96d8935a0c6f3056ccdb7a45564d10baf01a4f6722ae853ad9a3bad17e8de32a3c0ec99c5cf6144647a5e182809d403f7a WHIRLPOOL 3dc8888c302bac84f53b673784dec092a2c59ea2985d9983e87f057b9aa7b5d3e34cf13d2b0f1f60ea44f342b8167377204a510036872a087037cf02335c19cd
62 DIST clang-tools-extra-3.7.1.src.tar.xz 277476 SHA256 4a91edaccad1ce984c7c49a4a87db186b7f7b21267b2b03bcf4bd7820715bc6b SHA512 06e2db8af75f1e6ee82da6ee723b5256b9e3f6ba196428f18944ec02d07df26d04329ca8824a083c5f25274ce7e3469aa75e3a29ccfbdb6375524841d65e3ad7 WHIRLPOOL 2c1a459d6aff6bc24d5c8d38120ab665adbef61394050781a9707d50e83dae1b4997ed19459086e9bd7f6dd38a09c295d135e33515c947d64a7f1ab714ad8beb
63 DIST clang-tools-extra-3.8.0.src.tar.xz 334072 SHA256 afbda810106a6e64444bc164b921be928af46829117c95b996f2678ce4cb1ec4 SHA512 f0e593a76df5485f403079bd2fbb4e51c3d1c3fc4e63e2c2910894e8f2a7c14b47265435f3c52f035fb3fe2f595812d0f9869235296157a39c071a23e6a8b178 WHIRLPOOL 4928669a3c019eebe0a98ee72e25ef70ddf3c1d29e6a4aa18e408276b2a870069460c39e0e8fbe960d8d56127bb6951433d1fd89015d192951004e527b065ec9
64 DIST clang-tools-extra-3.8.1.src.tar.xz 334768 SHA256 664a5c60220de9c290bf2a5b03d902ab731a4f95fe73a00856175ead494ec396 SHA512 ec8c4a6ac4fd1a0e24fc15e56ba00828e0d718c2f7bd477ea134ab094c67f4f4b2f603f128ec11a03b7f25f3e9b8fe75181e40730c56b7b683f54e3f37573137 WHIRLPOOL b05213cbe21b778e718233cecbf4d01b92c1f133eced6fdd3fa5059c4b10e5f0407549634f65032af177ba1614250f5c02e283c2b03563db3e227b1afcae424b
65 +DIST clang-tools-extra-3.9.0rc3.src.tar.xz 455376 SHA256 adac980fb7aef0c57bc0e7468e2fb3d328ec9417ff7997b7390b8ef4902b6cdb SHA512 9c3f6bd2a6f0756d9c8e5ce31fa2b74c6fddff44ba7d266d9a3f3d06d2d18a5660cb954b9e1739e4c0700384b78f6f2f00e5bd722baef8398cdd4b26fefd2723 WHIRLPOOL 4360712aab1329e434a46ca7dbd5dac5177856cde6927bae83de33bb9a0a2e189da8c4bc3238ea01780c960d7b5d729a0b624a3110b2634997d73b0cf55d71eb
66 DIST compiler-rt-3.5.0.src.tar.xz 1088352 SHA256 a4b3e655832bf8d9a357ea2c771db347237460e131988cbb96cda40ff39a8136 SHA512 862cce2d6b398bd1a8399496a547e6ab976a31f676528beebfbea5fd7dc54aa72e1c25deefa12f6167096521eba74090565b0168806451da02ddac04e922fc48 WHIRLPOOL 248acf997d70d7904aa79bf83e0c02ba4e5f8c2812c03f44a8e1e31b845a654f250c09ec6a123f9245d0db8713e8cc5a4087b9ce785af4f5eb7e55d9dbd362a2
67 DIST compiler-rt-3.5.2.src.tar.xz 1093000 SHA256 542d7aadd21e7fe35bea0a7912bc965f08a1a566746cebcca76f96dcfeb74dc3 SHA512 319a8a1dbe07eb4f1fcccfe79a1fa445f348fb854a441500e89fa0a128e45716b65d06347f19a63de32e9294cd2331e914ae0d5fe8224f0b2452c39b79ac96ff WHIRLPOOL 6e9286c56a60a515006c8232ca01622ae844185a5f31fb49bce632868862c5e560619f1c45da66878b5322a764f91a284cd296e9f13105d6f74e055a17321d93
68 DIST compiler-rt-3.6.2.src.tar.xz 1128080 SHA256 0f2ff37d80a64575fecd8cf0d5c50f7ac1f837ddf700d1855412bb7547431d87 SHA512 7dafcc5bd4822475de649d8a84ae51af3c4ed4d0958f76b1b55ba79219638f3e78eb94a1986c6e9ba0e7f1ccf3ec834d546b5ca60e8b08083fea5880ecdf17a3 WHIRLPOOL dd77e7df43c9028a6873ed903da67560fdb04968013016a7f0ad2d2e9a81b3a3d890b95e4f49a6bdef349806d6507defcd80a0a9fb50c1c9f778e7eff42dbc5d
69 DIST compiler-rt-3.7.1.src.tar.xz 1181772 SHA256 9d4769e4a927d3824bcb7a9c82b01e307c68588e6de4e7f04ab82d82c5af8181 SHA512 bf434519ea0838264c30de1e1e8681320aa868df0ecc825a45c659077b963a4120c18216946558cbf8aea24a8ac8ec39af2066dab906bc7cabc0894d51d61325 WHIRLPOOL 0bea047e48622884a6fc6bb3826046e9de5b3192006cc41c0ccd9d6c611674869c3c15988b531a0f7d9fea2cf951b90ecef385b85db765c6f99a48692fdcf223
70 DIST compiler-rt-3.8.0.src.tar.xz 1270128 SHA256 c8d3387e55f229543dac1941769120f24dc50183150bf19d1b070d53d29d56b0 SHA512 21ba548b6b35a79aa291adba7f83db14c33855fa3cf376f2ad75bd22bb454501b74f0ea4f71bc03a864135862c800b101d3cd790e54e687c2a3459c64218b9c3 WHIRLPOOL 63ceb498fbc4083afda4f4aa12e44b8a6d2b58408edacd7d578d3cd6a63f0c1074e453b950fae4fee51690b3f79700e7752b6ceb3e6980c88541314993ce71a5
71 DIST compiler-rt-3.8.1.src.tar.xz 1263312 SHA256 0df011dae14d8700499dfc961602ee0a9572fef926202ade5dcdfe7858411e5c SHA512 bed3da5f8594c4bf71af406419fbeaf7ed5d8bf46adb305233a298271d34a9af1072bcb47d474ac19bb862cc7c7bc9e1d89bc1567133553f29480030cad1cf75 WHIRLPOOL 950de96c57461c51ee9857dd56a858876f6bdb09f44ea1ec96c6f113d3499f5f3ddb90e86a8a6b50460577e1b4857da3dd6024eb3427d837630a2c4c678c360a
72 +DIST compiler-rt-3.9.0rc3.src.tar.xz 1377852 SHA256 2ae30412681098d7632f09c524b00049faccd3e802ec6fd2171fe8c6e47c9202 SHA512 14884a97a8fda8616fbf6345233371cb3d97efbb8915240fc8fa8763fa5259da800fcad97a6106bafbf7764746787f4ef7a51134293953f2cf8bade6003939db WHIRLPOOL f52cfe41afc09870ed255326bc1cdf78302bead5b4f61e8651c77f09b8b591df7da519be7717923d8e5ca70aa0a865b2e8318ac921bd243529d2290d996ae447
73 DIST lldb-3.7.1.src.tar.xz 10650524 SHA256 9a0bc315ef55f44c98cdf92d064df0847f453ed156dd0ef6a87e04f5fd6a0e01 SHA512 d2d3e1052026edd6ef9113ff5362acb4a32cef598098b4031c35e389301130ef2e1bda594f30de4d65c9fdc0beaecdd35afcf36676eb540baad34015aca294d1 WHIRLPOOL bba9c700788f0cf86ac1de51383a223e1c92f724719cdd327d83189cb77714c1e10fb78569aeed3b3c639062a3410bb114f646a271fd0d9e8c9a8e45d090330a
74 DIST lldb-3.8.0.src.tar.xz 10929768 SHA256 e3f68f44147df0433e7989bf6ed1c58ff28d7c68b9c47553cb9915f744785a35 SHA512 a491209ae12b0c7d938ebd94362396a50922326ed24ed11f71b1f19b61274a34a92d2bd46857b44081e7fa3e6d0a641d148bd4022f8edf71f80ff2aa7a55ebef WHIRLPOOL c498c22acab867419143745ce0212c70bdfc141dbae19ab53221908eba7961aae6a029cbad01b8409e6fbc187550141ed87f32366dd847ac57754891fbbc4049
75 DIST lldb-3.8.1.src.tar.xz 10928220 SHA256 349148116a47e39dcb5d5042f10d8a6357d2c865034563283ca512f81cdce8a3 SHA512 d73c55daed6ef5e5ca784c7010f2d75be26024b14fa61a2861a8a6cbe129e417fb7be2a3b532e17e9d7de98ae38ce6a689d8166049eff365fb04f4bd772758f3 WHIRLPOOL 78dd8161cd1411bd62cb3ffe1196fe95ccb73d78f2e141a58c63776eb6d91065fe1348b1b8e241630cdf954ab659b333ebbcdcaeba3e6df36af62aaf3a7c6634
76 +DIST lldb-3.9.0rc3.src.tar.xz 13754856 SHA256 de5057b75adf87f17af3bf667adb0638cb504b0049647946ab93af45dba311e6 SHA512 aa5af23b2d01b90cafd9288e46f18f63d022420874df62e864bcf576294e834fa22f22f65dcc1e449653e6c2bab624f529a817fed91aaf9c8d3640d1ffb8d98f WHIRLPOOL 8077a1bb867e9c805d1ff1f3b26b2c7772647e46c7ad093c6cb898303879178e9893382294c484717ab553c459670a09f57d69dddcd2888144fc143f362b1313
77 DIST llvm-3.5.0-manpages.tar.bz2 35314 SHA256 724e752a60016dce8cc536658906d3646c600e977374e0ea692a5d0fe2d4a021 SHA512 d99d6096d7f21a81923297584fe5eeb23e0d83d4538fe376615c92fffc8aff3189999f7ab3c537b5aa5d6bc2c22c53eb05717d48c7ab99c42315b8665bac62c3 WHIRLPOOL 68ced06ee6678c5333c662eb1cc0da744c5a184b12dd059c1b77ec200b1d3cc231f270b9d9b6e177d728776894277b3f9061338aa55620c90474eb97915b7819
78 DIST llvm-3.5.0.src.tar.xz 11735940 SHA256 28e199f368ef0a4666708f31c7991ad3bcc3a578342b0306526dd35f07595c03 SHA512 b4d0f325dbdb0a8f10e5fd031954ef4b1971d8f99f4e4b53834801a2b74a7acde3f77c655c8355b407424b363edfb10f71d85fc370356dc52af5c636a1bba197 WHIRLPOOL 561520823468b61c63df8e13f876b7ac586eb1e52c256e9a36370e5d46e8cef3937655c36fbb51eebd3680fab67412e7c777479477fc728e7a8f35420e573ef1
79 DIST llvm-3.5.2.src.tar.xz 11876128 SHA256 44196156d5749eb4b4224fe471a29cc3984df92570a4a89fa859f7394fc0c575 SHA512 0f6a83cc61a385387e7baf8fb8f0d9f18e3fd00d2d389a3c7e2c3792be7d82ed095506cac52c24e65ae3c1f94456a441d39440feef6125e25ef18447ec9dd406 WHIRLPOOL b41de51907d6d2c2d04a4c498b44f0ed560cc710e6e2d8678f5ef93a9009d140bc7c2406f4b25d5b901fd026689d48edce77a2e435687b489b835156a512e256
80 @@ -29,3 +33,5 @@ DIST llvm-3.7.1.src.tar.xz 14592544 SHA256 be7794ed0cec42d6c682ca8e3517535b54555
81 DIST llvm-3.8.0-manpages.tar.bz2 37889 SHA256 4dda7f69f9412e0fb50d32631df34d6ea7f93c945c9a59cb050a99f1d2d0508b SHA512 a93ed7a25b75c237a0967ba7a501c71af3e7e9292ebabf69733bc637e9a4534dcaee539c6b1f6b2df7a87103c2371b1cf130fac05b88047100988c814e89ab0f WHIRLPOOL 9790a576fd4db798c2339bb4ea1dc973f1057177364770a104be7916998a1ad824e6b4eee296066ddd32eb5e6c57ffd5716457cecbd8ca9fe1b317d0d5ed2676
82 DIST llvm-3.8.0.src.tar.xz 16580932 SHA256 555b028e9ee0f6445ff8f949ea10e9cd8be0d084840e21fbbe1d31d51fc06e46 SHA512 2c76e79d803768ed20af6ca1801cf2518071bf9835c54580ea3eb6219a66cdcf8b4c575f192c15082cc18d2468b7611dacb57950b605813a2317125c2d33c138 WHIRLPOOL f7219f3324080f22158b08eb23b5b545d303090d0bb8cde6ee971da829dd52837832a127792b153006568e0c7c0163c1095d1e258600f4359df347148e965b94
83 DIST llvm-3.8.1.src.tar.xz 16551472 SHA256 6e82ce4adb54ff3afc18053d6981b6aed1406751b8742582ed50f04b5ab475f9 SHA512 99bbb2cc5f337fd5edf1621f8028c8cb74011aa4af2531018dc05409b27f7b8d0c2f76a00115f677f7c013029d5d9f55d085a5b40433409aac4e9161d53bd366 WHIRLPOOL a99cef164a0e05e5237b840bee776d48fe0bde460cb4536f03a5e4eb0cc630deeb96f76bdd42f912a4b2dab08133bd9137ea16be1b9582d375f0f5841dd40234
84 +DIST llvm-3.9.0_rc3-manpages.tar.bz2 80007 SHA256 991f5238d23c0aee2fd303d1adecd6045c42ed066f42f0d58f62c3a25c197140 SHA512 f96c340021de3f096ec3ad7d51a6af2c7a84974122d1df15729a39d4f9d65452f063a85ab38adb064288dc14220d9cc679b31ee19b48424d3d7cde621ff37597 WHIRLPOOL d3f24a2faaa5aa909519373532262c342acf517048ac543f303b6ddb539f5ece876a338c8efc445f4ada6f723a4e65e35bd5f2f9b4f52ef96ef832000259ab20
85 +DIST llvm-3.9.0rc3.src.tar.xz 18235444 SHA256 b52ed8390a9b7c30ab88cd679f890b5cac17ec52f7fe10bfc305b4d7254e3f82 SHA512 9838b21153ea20cd2d5fd13f06dceaeebe1514c04a7e6e2bab58d842f0391cc6aa986fa31252491eee8e51a75bba073a853622058cce05a01f95c8945f206302 WHIRLPOOL 83a648a11e4f7f627292dbcb84ae761bb0c308a573e3db53329d8aab31ec1ab75e70de06f651d2478d467a8247cf7e27ff94ed5e664ef50472317e598d807de2
86
87 diff --git a/sys-devel/llvm/files/3.8.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch b/sys-devel/llvm/files/3.9.0/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
88 similarity index 100%
89 rename from sys-devel/llvm/files/3.8.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
90 rename to sys-devel/llvm/files/3.9.0/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
91
92 diff --git a/sys-devel/llvm/files/3.8.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch b/sys-devel/llvm/files/3.9.0/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
93 similarity index 100%
94 rename from sys-devel/llvm/files/3.8.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
95 rename to sys-devel/llvm/files/3.9.0/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
96
97 diff --git a/sys-devel/llvm/files/3.8.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch b/sys-devel/llvm/files/3.9.0/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
98 similarity index 100%
99 rename from sys-devel/llvm/files/3.8.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
100 rename to sys-devel/llvm/files/3.9.0/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
101
102 diff --git a/sys-devel/llvm/files/3.8.1/clang/darwin_prefix-include-paths.patch b/sys-devel/llvm/files/3.9.0/clang/darwin_prefix-include-paths.patch
103 similarity index 100%
104 rename from sys-devel/llvm/files/3.8.1/clang/darwin_prefix-include-paths.patch
105 rename to sys-devel/llvm/files/3.9.0/clang/darwin_prefix-include-paths.patch
106
107 diff --git a/sys-devel/llvm/files/3.9.0/clang/default-libs.patch b/sys-devel/llvm/files/3.9.0/clang/default-libs.patch
108 new file mode 100644
109 index 00000000..12ef52d
110 --- /dev/null
111 +++ b/sys-devel/llvm/files/3.9.0/clang/default-libs.patch
112 @@ -0,0 +1,703 @@
113 +From 2d354bfbb2f5efdf3f6b2405078f9ccb65c21536 Mon Sep 17 00:00:00 2001
114 +From: Jonas Hahnfeld <Hahnfeld@×××××××××××××××.de>
115 +Date: Wed, 27 Jul 2016 08:15:54 +0000
116 +Subject: [PATCH] Support setting default value for -rtlib at build time
117 +
118 +This patch introduces a new cmake variable: CLANG_DEFAULT_RTLIB, thru
119 +which we can specify a default value for -rtlib (libgcc or
120 +compiler-rt) at build time, just like how we set the default C++
121 +stdlib thru CLANG_DEFAULT_CXX_STDLIB.
122 +
123 +With these two options, we can configure clang to build binaries on
124 +Linux that have no runtime dependence on any gcc libs (libstdc++ or
125 +libgcc_s).
126 +
127 +Patch by Lei Zhang!
128 +
129 +Differential Revision: https://reviews.llvm.org/D22663
130 +
131 +git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@276848 91177308-0d34-0410-b5e6-96231b3b80d8
132 +---
133 + CMakeLists.txt | 10 +++++
134 + include/clang/Config/config.h.cmake | 3 ++
135 + lib/Driver/ToolChain.cpp | 22 ++++++-----
136 + lib/Driver/ToolChains.cpp | 23 ++++++-----
137 + lib/Driver/ToolChains.h | 2 +
138 + test/Driver/linux-ld.c | 76 ++++++++++++++++++-------------------
139 + test/Driver/miamcu-opt.c | 14 +++----
140 + test/Driver/miamcu-opt.cpp | 2 +-
141 + test/Driver/mingw-libgcc.c | 24 ++++++------
142 + test/Driver/mingw.cpp | 14 +++----
143 + test/Driver/mips-mti-linux.c | 4 +-
144 + test/Driver/sanitizer-ld.c | 2 +-
145 + test/Driver/windows-cross.c | 2 +-
146 + test/OpenMP/linking.c | 18 +++++----
147 + 14 files changed, 121 insertions(+), 95 deletions(-)
148 +
149 +diff --git a/CMakeLists.txt b/CMakeLists.txt
150 +index cfcd221..aec4579 100644
151 +--- a/CMakeLists.txt
152 ++++ b/CMakeLists.txt
153 +@@ -201,6 +201,16 @@ if (NOT(CLANG_DEFAULT_CXX_STDLIB STREQUAL "" OR
154 + set(CLANG_DEFAULT_CXX_STDLIB "")
155 + endif()
156 +
157 ++set(CLANG_DEFAULT_RTLIB "" CACHE STRING
158 ++ "Default runtime library to use (\"libgcc\" or \"compiler-rt\", empty for platform default)")
159 ++if (NOT(CLANG_DEFAULT_RTLIB STREQUAL "" OR
160 ++ CLANG_DEFAULT_RTLIB STREQUAL "libgcc" OR
161 ++ CLANG_DEFAULT_RTLIB STREQUAL "compiler-rt"))
162 ++ message(WARNING "Resetting default rtlib to use platform default")
163 ++ set(CLANG_DEFAULT_RTLIB "" CACHE STRING
164 ++ "Default runtime library to use (\"libgcc\" or \"compiler-rt\", empty for platform default)" FORCE)
165 ++endif()
166 ++
167 + set(CLANG_DEFAULT_OPENMP_RUNTIME "libomp" CACHE STRING
168 + "Default OpenMP runtime used by -fopenmp.")
169 +
170 +diff --git a/include/clang/Config/config.h.cmake b/include/clang/Config/config.h.cmake
171 +index e5a1d0d..9200ed9 100644
172 +--- a/include/clang/Config/config.h.cmake
173 ++++ b/include/clang/Config/config.h.cmake
174 +@@ -11,6 +11,9 @@
175 + /* Default C++ stdlib to use. */
176 + #define CLANG_DEFAULT_CXX_STDLIB "${CLANG_DEFAULT_CXX_STDLIB}"
177 +
178 ++/* Default runtime library to use. */
179 ++#define CLANG_DEFAULT_RTLIB "${CLANG_DEFAULT_RTLIB}"
180 ++
181 + /* Default OpenMP runtime used by -fopenmp. */
182 + #define CLANG_DEFAULT_OPENMP_RUNTIME "${CLANG_DEFAULT_OPENMP_RUNTIME}"
183 +
184 +diff --git a/lib/Driver/ToolChain.cpp b/lib/Driver/ToolChain.cpp
185 +index e96688c..b825d63 100644
186 +--- a/lib/Driver/ToolChain.cpp
187 ++++ b/lib/Driver/ToolChain.cpp
188 +@@ -526,15 +526,19 @@ void ToolChain::addProfileRTLibs(const llvm::opt::ArgList &Args,
189 +
190 + ToolChain::RuntimeLibType ToolChain::GetRuntimeLibType(
191 + const ArgList &Args) const {
192 +- if (Arg *A = Args.getLastArg(options::OPT_rtlib_EQ)) {
193 +- StringRef Value = A->getValue();
194 +- if (Value == "compiler-rt")
195 +- return ToolChain::RLT_CompilerRT;
196 +- if (Value == "libgcc")
197 +- return ToolChain::RLT_Libgcc;
198 +- getDriver().Diag(diag::err_drv_invalid_rtlib_name)
199 +- << A->getAsString(Args);
200 +- }
201 ++ const Arg* A = Args.getLastArg(options::OPT_rtlib_EQ);
202 ++ StringRef LibName = A ? A->getValue() : CLANG_DEFAULT_RTLIB;
203 ++
204 ++ // "platform" is only used in tests to override CLANG_DEFAULT_RTLIB
205 ++ if (LibName == "compiler-rt")
206 ++ return ToolChain::RLT_CompilerRT;
207 ++ else if (LibName == "libgcc")
208 ++ return ToolChain::RLT_Libgcc;
209 ++ else if (LibName == "platform")
210 ++ return GetDefaultRuntimeLibType();
211 ++
212 ++ if (A)
213 ++ getDriver().Diag(diag::err_drv_invalid_rtlib_name) << A->getAsString(Args);
214 +
215 + return GetDefaultRuntimeLibType();
216 + }
217 +diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
218 +index 347aa29..6027bbf 100644
219 +--- a/lib/Driver/ToolChains.cpp
220 ++++ b/lib/Driver/ToolChains.cpp
221 +@@ -400,17 +400,22 @@ void DarwinClang::AddLinkSanitizerLibArgs(const ArgList &Args,
222 + /*AddRPath*/ true);
223 + }
224 +
225 ++ToolChain::RuntimeLibType DarwinClang::GetRuntimeLibType(
226 ++ const ArgList &Args) const {
227 ++ if (Arg* A = Args.getLastArg(options::OPT_rtlib_EQ)) {
228 ++ StringRef Value = A->getValue();
229 ++ if (Value != "compiler-rt")
230 ++ getDriver().Diag(diag::err_drv_unsupported_rtlib_for_platform)
231 ++ << Value << "darwin";
232 ++ }
233 ++
234 ++ return ToolChain::RLT_CompilerRT;
235 ++}
236 ++
237 + void DarwinClang::AddLinkRuntimeLibArgs(const ArgList &Args,
238 + ArgStringList &CmdArgs) const {
239 +- // Darwin only supports the compiler-rt based runtime libraries.
240 +- switch (GetRuntimeLibType(Args)) {
241 +- case ToolChain::RLT_CompilerRT:
242 +- break;
243 +- default:
244 +- getDriver().Diag(diag::err_drv_unsupported_rtlib_for_platform)
245 +- << Args.getLastArg(options::OPT_rtlib_EQ)->getValue() << "darwin";
246 +- return;
247 +- }
248 ++ // Call once to ensure diagnostic is printed if wrong value was specified
249 ++ GetRuntimeLibType(Args);
250 +
251 + // Darwin doesn't support real static executables, don't link any runtime
252 + // libraries with -static.
253 +diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h
254 +index 369712f..fe570fd 100644
255 +--- a/lib/Driver/ToolChains.h
256 ++++ b/lib/Driver/ToolChains.h
257 +@@ -573,6 +573,8 @@ public:
258 + /// @name Apple ToolChain Implementation
259 + /// {
260 +
261 ++ RuntimeLibType GetRuntimeLibType(const llvm::opt::ArgList &Args) const override;
262 ++
263 + void AddLinkRuntimeLibArgs(const llvm::opt::ArgList &Args,
264 + llvm::opt::ArgStringList &CmdArgs) const override;
265 +
266 +diff --git a/test/Driver/linux-ld.c b/test/Driver/linux-ld.c
267 +index f9f4b48..87bd55f 100644
268 +--- a/test/Driver/linux-ld.c
269 ++++ b/test/Driver/linux-ld.c
270 +@@ -16,7 +16,7 @@
271 + // CHECK-LD-32: "-L[[SYSROOT]]/usr/lib"
272 + //
273 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
274 +-// RUN: --target=x86_64-unknown-linux \
275 ++// RUN: --target=x86_64-unknown-linux -rtlib=platform \
276 + // RUN: --gcc-toolchain="" \
277 + // RUN: --sysroot=%S/Inputs/basic_linux_tree \
278 + // RUN: | FileCheck --check-prefix=CHECK-LD-64 %s
279 +@@ -36,7 +36,7 @@
280 + // CHECK-LD-64: "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed"
281 + //
282 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
283 +-// RUN: --target=x86_64-unknown-linux-gnux32 \
284 ++// RUN: --target=x86_64-unknown-linux-gnux32 -rtlib=platform \
285 + // RUN: --gcc-toolchain="" \
286 + // RUN: --sysroot=%S/Inputs/basic_linux_tree \
287 + // RUN: | FileCheck --check-prefix=CHECK-LD-X32 %s
288 +@@ -86,7 +86,7 @@
289 + // CHECK-LD-RT-ANDROID: libclang_rt.builtins-arm-android.a"
290 + //
291 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
292 +-// RUN: --target=x86_64-unknown-linux \
293 ++// RUN: --target=x86_64-unknown-linux -rtlib=platform \
294 + // RUN: --gcc-toolchain="" \
295 + // RUN: --sysroot=%S/Inputs/basic_linux_tree \
296 + // RUN: --rtlib=libgcc \
297 +@@ -107,7 +107,7 @@
298 + // CHECK-LD-GCC: "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed"
299 + //
300 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
301 +-// RUN: --target=x86_64-unknown-linux \
302 ++// RUN: --target=x86_64-unknown-linux -rtlib=platform \
303 + // RUN: -static-libgcc \
304 + // RUN: --gcc-toolchain="" \
305 + // RUN: --sysroot=%S/Inputs/basic_linux_tree \
306 +@@ -128,7 +128,7 @@
307 + // CHECK-LD-64-STATIC-LIBGCC: "-lgcc" "-lgcc_eh"
308 + //
309 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
310 +-// RUN: --target=x86_64-unknown-linux \
311 ++// RUN: --target=x86_64-unknown-linux -rtlib=platform \
312 + // RUN: -static \
313 + // RUN: --gcc-toolchain="" \
314 + // RUN: --sysroot=%S/Inputs/basic_linux_tree \
315 +@@ -149,7 +149,7 @@
316 + //
317 + // Check that flags can be combined. The -static dominates.
318 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
319 +-// RUN: --target=x86_64-unknown-linux \
320 ++// RUN: --target=x86_64-unknown-linux -rtlib=platform \
321 + // RUN: -static-libgcc -static \
322 + // RUN: --gcc-toolchain="" \
323 + // RUN: --sysroot=%S/Inputs/basic_linux_tree \
324 +@@ -1004,42 +1004,42 @@
325 + //
326 + // Test linker invocation on Android.
327 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
328 +-// RUN: --target=arm-linux-androideabi \
329 ++// RUN: --target=arm-linux-androideabi -rtlib=platform \
330 + // RUN: --gcc-toolchain="" \
331 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
332 + // RUN: | FileCheck --check-prefix=CHECK-ANDROID %s
333 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
334 +-// RUN: --target=arm-linux-android \
335 ++// RUN: --target=arm-linux-android -rtlib=platform \
336 + // RUN: --gcc-toolchain="" \
337 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
338 + // RUN: | FileCheck --check-prefix=CHECK-ANDROID %s
339 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
340 +-// RUN: --target=aarch64-linux-android \
341 ++// RUN: --target=aarch64-linux-android -rtlib=platform \
342 + // RUN: --gcc-toolchain="" \
343 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
344 + // RUN: | FileCheck --check-prefix=CHECK-ANDROID %s
345 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
346 +-// RUN: --target=arm64-linux-android \
347 ++// RUN: --target=arm64-linux-android -rtlib=platform \
348 + // RUN: --gcc-toolchain="" \
349 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
350 + // RUN: | FileCheck --check-prefix=CHECK-ANDROID %s
351 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
352 +-// RUN: --target=mipsel-linux-android \
353 ++// RUN: --target=mipsel-linux-android -rtlib=platform \
354 + // RUN: --gcc-toolchain="" \
355 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
356 + // RUN: | FileCheck --check-prefix=CHECK-ANDROID %s
357 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
358 +-// RUN: --target=mips64el-linux-android \
359 ++// RUN: --target=mips64el-linux-android -rtlib=platform \
360 + // RUN: --gcc-toolchain="" \
361 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
362 + // RUN: | FileCheck --check-prefix=CHECK-ANDROID %s
363 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
364 +-// RUN: --target=i686-linux-android \
365 ++// RUN: --target=i686-linux-android -rtlib=platform \
366 + // RUN: --gcc-toolchain="" \
367 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
368 + // RUN: | FileCheck --check-prefix=CHECK-ANDROID %s
369 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
370 +-// RUN: --target=x86_64-linux-android \
371 ++// RUN: --target=x86_64-linux-android -rtlib=platform \
372 + // RUN: --gcc-toolchain="" \
373 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
374 + // RUN: | FileCheck --check-prefix=CHECK-ANDROID %s
375 +@@ -1052,48 +1052,48 @@
376 + // CHECK-ANDROID-NOT: "gcc_s"
377 + // CHECK-ANDROID: "{{.*}}{{/|\\\\}}crtend_android.o"
378 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
379 +-// RUN: --target=arm-linux-androideabi \
380 ++// RUN: --target=arm-linux-androideabi -rtlib=platform \
381 + // RUN: --gcc-toolchain="" \
382 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
383 + // RUN: -shared \
384 + // RUN: | FileCheck --check-prefix=CHECK-ANDROID-SO %s
385 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
386 +-// RUN: --target=arm-linux-android \
387 ++// RUN: --target=arm-linux-android -rtlib=platform \
388 + // RUN: --gcc-toolchain="" \
389 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
390 + // RUN: -shared \
391 + // RUN: | FileCheck --check-prefix=CHECK-ANDROID-SO %s
392 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
393 +-// RUN: --target=aarch64-linux-android \
394 ++// RUN: --target=aarch64-linux-android -rtlib=platform \
395 + // RUN: --gcc-toolchain="" \
396 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
397 + // RUN: -shared \
398 + // RUN: | FileCheck --check-prefix=CHECK-ANDROID-SO %s
399 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
400 +-// RUN: --target=arm64-linux-android \
401 ++// RUN: --target=arm64-linux-android -rtlib=platform \
402 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
403 + // RUN: -shared \
404 + // RUN: | FileCheck --check-prefix=CHECK-ANDROID-SO %s
405 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
406 +-// RUN: --target=mipsel-linux-android \
407 ++// RUN: --target=mipsel-linux-android -rtlib=platform \
408 + // RUN: --gcc-toolchain="" \
409 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
410 + // RUN: -shared \
411 + // RUN: | FileCheck --check-prefix=CHECK-ANDROID-SO %s
412 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
413 +-// RUN: --target=mips64el-linux-android \
414 ++// RUN: --target=mips64el-linux-android -rtlib=platform \
415 + // RUN: --gcc-toolchain="" \
416 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
417 + // RUN: -shared \
418 + // RUN: | FileCheck --check-prefix=CHECK-ANDROID-SO %s
419 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
420 +-// RUN: --target=i686-linux-android \
421 ++// RUN: --target=i686-linux-android -rtlib=platform \
422 + // RUN: --gcc-toolchain="" \
423 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
424 + // RUN: -shared \
425 + // RUN: | FileCheck --check-prefix=CHECK-ANDROID-SO %s
426 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
427 +-// RUN: --target=x86_64-linux-android \
428 ++// RUN: --target=x86_64-linux-android -rtlib=platform \
429 + // RUN: --gcc-toolchain="" \
430 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
431 + // RUN: -shared \
432 +@@ -1108,47 +1108,47 @@
433 + // CHECK-ANDROID-SO-NOT: "gcc_s"
434 + // CHECK-ANDROID-SO: "{{.*}}{{/|\\\\}}crtend_so.o"
435 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
436 +-// RUN: --target=arm-linux-androideabi \
437 ++// RUN: --target=arm-linux-androideabi -rtlib=platform \
438 + // RUN: --gcc-toolchain="" \
439 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
440 + // RUN: -static \
441 + // RUN: | FileCheck --check-prefix=CHECK-ANDROID-STATIC %s
442 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
443 +-// RUN: --target=arm-linux-android \
444 ++// RUN: --target=arm-linux-android -rtlib=platform \
445 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
446 + // RUN: -static \
447 + // RUN: | FileCheck --check-prefix=CHECK-ANDROID-STATIC %s
448 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
449 +-// RUN: --target=aarch64-linux-android \
450 ++// RUN: --target=aarch64-linux-android -rtlib=platform \
451 + // RUN: --gcc-toolchain="" \
452 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
453 + // RUN: -static \
454 + // RUN: | FileCheck --check-prefix=CHECK-ANDROID-STATIC %s
455 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
456 +-// RUN: --target=arm64-linux-android \
457 ++// RUN: --target=arm64-linux-android -rtlib=platform \
458 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
459 + // RUN: -static \
460 + // RUN: | FileCheck --check-prefix=CHECK-ANDROID-STATIC %s
461 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
462 +-// RUN: --target=mipsel-linux-android \
463 ++// RUN: --target=mipsel-linux-android -rtlib=platform \
464 + // RUN: --gcc-toolchain="" \
465 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
466 + // RUN: -static \
467 + // RUN: | FileCheck --check-prefix=CHECK-ANDROID-STATIC %s
468 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
469 +-// RUN: --target=mips64el-linux-android \
470 ++// RUN: --target=mips64el-linux-android -rtlib=platform \
471 + // RUN: --gcc-toolchain="" \
472 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
473 + // RUN: -static \
474 + // RUN: | FileCheck --check-prefix=CHECK-ANDROID-STATIC %s
475 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
476 +-// RUN: --target=i686-linux-android \
477 ++// RUN: --target=i686-linux-android -rtlib=platform \
478 + // RUN: --gcc-toolchain="" \
479 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
480 + // RUN: -static \
481 + // RUN: | FileCheck --check-prefix=CHECK-ANDROID-STATIC %s
482 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
483 +-// RUN: --target=x86_64-linux-android \
484 ++// RUN: --target=x86_64-linux-android -rtlib=platform \
485 + // RUN: --gcc-toolchain="" \
486 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
487 + // RUN: -static \
488 +@@ -1162,49 +1162,49 @@
489 + // CHECK-ANDROID-STATIC-NOT: "gcc_s"
490 + // CHECK-ANDROID-STATIC: "{{.*}}{{/|\\\\}}crtend_android.o"
491 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
492 +-// RUN: --target=arm-linux-androideabi \
493 ++// RUN: --target=arm-linux-androideabi -rtlib=platform \
494 + // RUN: --gcc-toolchain="" \
495 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
496 + // RUN: -pie \
497 + // RUN: | FileCheck --check-prefix=CHECK-ANDROID-PIE %s
498 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
499 +-// RUN: --target=arm-linux-android \
500 ++// RUN: --target=arm-linux-android -rtlib=platform \
501 + // RUN: --gcc-toolchain="" \
502 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
503 + // RUN: -pie \
504 + // RUN: | FileCheck --check-prefix=CHECK-ANDROID-PIE %s
505 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
506 +-// RUN: --target=aarch64-linux-android \
507 ++// RUN: --target=aarch64-linux-android -rtlib=platform \
508 + // RUN: --gcc-toolchain="" \
509 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
510 + // RUN: -pie \
511 + // RUN: | FileCheck --check-prefix=CHECK-ANDROID-PIE %s
512 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
513 +-// RUN: --target=arm64-linux-android \
514 ++// RUN: --target=arm64-linux-android -rtlib=platform \
515 + // RUN: --gcc-toolchain="" \
516 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
517 + // RUN: -pie \
518 + // RUN: | FileCheck --check-prefix=CHECK-ANDROID-PIE %s
519 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
520 +-// RUN: --target=mipsel-linux-android \
521 ++// RUN: --target=mipsel-linux-android -rtlib=platform \
522 + // RUN: --gcc-toolchain="" \
523 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
524 + // RUN: -pie \
525 + // RUN: | FileCheck --check-prefix=CHECK-ANDROID-PIE %s
526 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
527 +-// RUN: --target=mips64el-linux-android \
528 ++// RUN: --target=mips64el-linux-android -rtlib=platform \
529 + // RUN: --gcc-toolchain="" \
530 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
531 + // RUN: -pie \
532 + // RUN: | FileCheck --check-prefix=CHECK-ANDROID-PIE %s
533 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
534 +-// RUN: --target=i686-linux-android \
535 ++// RUN: --target=i686-linux-android -rtlib=platform \
536 + // RUN: --gcc-toolchain="" \
537 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
538 + // RUN: -pie \
539 + // RUN: | FileCheck --check-prefix=CHECK-ANDROID-PIE %s
540 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
541 +-// RUN: --target=x86_64-linux-android \
542 ++// RUN: --target=x86_64-linux-android -rtlib=platform \
543 + // RUN: --gcc-toolchain="" \
544 + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
545 + // RUN: -pie \
546 +diff --git a/test/Driver/miamcu-opt.c b/test/Driver/miamcu-opt.c
547 +index 7f96998..577bd37 100644
548 +--- a/test/Driver/miamcu-opt.c
549 ++++ b/test/Driver/miamcu-opt.c
550 +@@ -1,13 +1,13 @@
551 + // REQUIRES: clang-driver
552 + // REQUIRES: x86-registered-target
553 + //
554 +-// RUN: %clang -miamcu -no-canonical-prefixes %s -### -o %t.o 2>&1 | FileCheck %s
555 +-// RUN: %clang -miamcu -no-canonical-prefixes -m32 %s -### -o %t.o 2>&1 | FileCheck %s
556 +-// RUN: %clang -miamcu -no-canonical-prefixes -target x86_64-unknown-linux-gnu %s -### -o %t.o 2>&1 | FileCheck %s
557 +-// RUN: %clang -mno-iamcu -miamcu -no-canonical-prefixes %s -### -o %t.o 2>&1 | FileCheck %s
558 +-// RUN: %clang -miamcu -no-canonical-prefixes -m64 %s -### -o %t.o 2>&1 | FileCheck %s -check-prefix=M64
559 +-// RUN: %clang -miamcu -no-canonical-prefixes -dynamic %s -### -o %t.o 2>&1 | FileCheck %s -check-prefix=DYNAMIC
560 +-// RUN: %clang -miamcu -no-canonical-prefixes -target armv8-eabi %s -### -o %t.o 2>&1 | FileCheck %s -check-prefix=NOT-X86
561 ++// RUN: %clang -miamcu -rtlib=platform -no-canonical-prefixes %s -### -o %t.o 2>&1 | FileCheck %s
562 ++// RUN: %clang -miamcu -rtlib=platform -no-canonical-prefixes -m32 %s -### -o %t.o 2>&1 | FileCheck %s
563 ++// RUN: %clang -miamcu -rtlib=platform -no-canonical-prefixes -target x86_64-unknown-linux-gnu %s -### -o %t.o 2>&1 | FileCheck %s
564 ++// RUN: %clang -mno-iamcu -miamcu -rtlib=platform -no-canonical-prefixes %s -### -o %t.o 2>&1 | FileCheck %s
565 ++// RUN: %clang -miamcu -rtlib=platform -no-canonical-prefixes -m64 %s -### -o %t.o 2>&1 | FileCheck %s -check-prefix=M64
566 ++// RUN: %clang -miamcu -rtlib=platform -no-canonical-prefixes -dynamic %s -### -o %t.o 2>&1 | FileCheck %s -check-prefix=DYNAMIC
567 ++// RUN: %clang -miamcu -rtlib=platform -no-canonical-prefixes -target armv8-eabi %s -### -o %t.o 2>&1 | FileCheck %s -check-prefix=NOT-X86
568 + // RUN: %clang -miamcu -mno-iamcu -no-canonical-prefixes -target x86_64-unknown-linux-gnu %s -### -o %t.o 2>&1 | FileCheck %s -check-prefix=MNOIAMCU
569 +
570 + // M64: error: invalid argument '-miamcu' not allowed with '-m64'
571 +diff --git a/test/Driver/miamcu-opt.cpp b/test/Driver/miamcu-opt.cpp
572 +index 6c8d755..b63c455 100644
573 +--- a/test/Driver/miamcu-opt.cpp
574 ++++ b/test/Driver/miamcu-opt.cpp
575 +@@ -1,3 +1,3 @@
576 +-// RUN: %clang -miamcu %s -### -o %t.o 2>&1 | FileCheck %s
577 ++// RUN: %clang -miamcu -rtlib=platform %s -### -o %t.o 2>&1 | FileCheck %s
578 +
579 + // CHECK: error: the clang compiler does not support 'C++ for IAMCU'
580 +diff --git a/test/Driver/mingw-libgcc.c b/test/Driver/mingw-libgcc.c
581 +index 75a5696..1d45c91 100644
582 +--- a/test/Driver/mingw-libgcc.c
583 ++++ b/test/Driver/mingw-libgcc.c
584 +@@ -2,24 +2,24 @@
585 + // Verified with gcc version 5.1.0 (i686-posix-dwarf-rev0, Built by MinGW-W64 project).
586 +
587 + // gcc, static
588 +-// RUN: %clang -v -target i686-pc-windows-gnu -### %s 2>&1 | FileCheck -check-prefix=CHECK_STATIC %s
589 +-// RUN: %clang -static -v -target i686-pc-windows-gnu -### %s 2>&1 | FileCheck -check-prefix=CHECK_STATIC %s
590 +-// RUN: %clang -static-libgcc -v -target i686-pc-windows-gnu -### %s 2>&1 | FileCheck -check-prefix=CHECK_STATIC %s
591 +-// RUN: %clang -static -shared -v -target i686-pc-windows-gnu -### %s 2>&1 | FileCheck -check-prefix=CHECK_STATIC %s
592 +-// RUN: %clang -static-libgcc -shared -v -target i686-pc-windows-gnu -### %s 2>&1 | FileCheck -check-prefix=CHECK_STATIC %s
593 ++// RUN: %clang -v -target i686-pc-windows-gnu -rtlib=platform -### %s 2>&1 | FileCheck -check-prefix=CHECK_STATIC %s
594 ++// RUN: %clang -static -v -target i686-pc-windows-gnu -rtlib=platform -### %s 2>&1 | FileCheck -check-prefix=CHECK_STATIC %s
595 ++// RUN: %clang -static-libgcc -v -target i686-pc-windows-gnu -rtlib=platform -### %s 2>&1 | FileCheck -check-prefix=CHECK_STATIC %s
596 ++// RUN: %clang -static -shared -v -target i686-pc-windows-gnu -rtlib=platform -### %s 2>&1 | FileCheck -check-prefix=CHECK_STATIC %s
597 ++// RUN: %clang -static-libgcc -shared -v -target i686-pc-windows-gnu -rtlib=platform -### %s 2>&1 | FileCheck -check-prefix=CHECK_STATIC %s
598 +
599 + // gcc, dynamic
600 +-// RUN: %clang -shared -v -target i686-pc-windows-gnu -### %s 2>&1 | FileCheck -check-prefix=CHECK_DYNAMIC %s
601 ++// RUN: %clang -shared -v -target i686-pc-windows-gnu -rtlib=platform -### %s 2>&1 | FileCheck -check-prefix=CHECK_DYNAMIC %s
602 +
603 + // g++, static
604 +-// RUN: %clang -static --driver-mode=g++ -v -target i686-pc-windows-gnu -### %s 2>&1 | FileCheck -check-prefix=CHECK_STATIC %s
605 +-// RUN: %clang -static-libgcc --driver-mode=g++ -v -target i686-pc-windows-gnu -### %s 2>&1 | FileCheck -check-prefix=CHECK_STATIC %s
606 +-// RUN: %clang -static -shared --driver-mode=g++ -v -target i686-pc-windows-gnu -### %s 2>&1 | FileCheck -check-prefix=CHECK_STATIC %s
607 +-// RUN: %clang -static-libgcc -shared --driver-mode=g++ -v -target i686-pc-windows-gnu -### %s 2>&1 | FileCheck -check-prefix=CHECK_STATIC %s
608 ++// RUN: %clang -static --driver-mode=g++ -v -target i686-pc-windows-gnu -rtlib=platform -### %s 2>&1 | FileCheck -check-prefix=CHECK_STATIC %s
609 ++// RUN: %clang -static-libgcc --driver-mode=g++ -v -target i686-pc-windows-gnu -rtlib=platform -### %s 2>&1 | FileCheck -check-prefix=CHECK_STATIC %s
610 ++// RUN: %clang -static -shared --driver-mode=g++ -v -target i686-pc-windows-gnu -rtlib=platform -### %s 2>&1 | FileCheck -check-prefix=CHECK_STATIC %s
611 ++// RUN: %clang -static-libgcc -shared --driver-mode=g++ -v -target i686-pc-windows-gnu -rtlib=platform -### %s 2>&1 | FileCheck -check-prefix=CHECK_STATIC %s
612 +
613 + // g++, dynamic
614 +-// RUN: %clang --driver-mode=g++ -v -target i686-pc-windows-gnu -### %s 2>&1 | FileCheck -check-prefix=CHECK_DYNAMIC %s
615 +-// RUN: %clang -shared --driver-mode=g++ -v -target i686-pc-windows-gnu -### %s 2>&1 | FileCheck -check-prefix=CHECK_DYNAMIC %s
616 ++// RUN: %clang --driver-mode=g++ -v -target i686-pc-windows-gnu -rtlib=platform -### %s 2>&1 | FileCheck -check-prefix=CHECK_DYNAMIC %s
617 ++// RUN: %clang -shared --driver-mode=g++ -v -target i686-pc-windows-gnu -rtlib=platform -### %s 2>&1 | FileCheck -check-prefix=CHECK_DYNAMIC %s
618 +
619 + // CHECK_STATIC: "-lgcc" "-lgcc_eh"
620 + // CHECK_DYNAMIC: "-lgcc_s" "-lgcc"
621 +diff --git a/test/Driver/mingw.cpp b/test/Driver/mingw.cpp
622 +index 8dc5b96..c939c7a 100644
623 +--- a/test/Driver/mingw.cpp
624 ++++ b/test/Driver/mingw.cpp
625 +@@ -1,9 +1,9 @@
626 +-// RUN: %clang -target i686-windows-gnu -c -### --sysroot=%S/Inputs/mingw_clang_tree/mingw32 %s 2>&1 | FileCheck -check-prefix=CHECK_MINGW_CLANG_TREE %s
627 ++// RUN: %clang -target i686-windows-gnu -rtlib=platform -c -### --sysroot=%S/Inputs/mingw_clang_tree/mingw32 %s 2>&1 | FileCheck -check-prefix=CHECK_MINGW_CLANG_TREE %s
628 + // CHECK_MINGW_CLANG_TREE: "{{.*}}/Inputs/mingw_clang_tree/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include"
629 + // CHECK_MINGW_CLANG_TREE: "{{.*}}/Inputs/mingw_clang_tree/mingw32{{/|\\\\}}include"
630 +
631 +
632 +-// RUN: %clang -target i686-pc-windows-gnu -stdlib=libstdc++ -c -### --sysroot=%S/Inputs/mingw_mingw_org_tree/mingw %s 2>&1 | FileCheck -check-prefix=CHECK_MINGW_ORG_TREE %s
633 ++// RUN: %clang -target i686-pc-windows-gnu -rtlib=platform -stdlib=libstdc++ -c -### --sysroot=%S/Inputs/mingw_mingw_org_tree/mingw %s 2>&1 | FileCheck -check-prefix=CHECK_MINGW_ORG_TREE %s
634 + // CHECK_MINGW_ORG_TREE: "{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include{{/|\\\\}}c++"
635 + // CHECK_MINGW_ORG_TREE: "{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}mingw32"
636 + // CHECK_MINGW_ORG_TREE: "{{.*}}{{/|\\\\}}Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}backward"
637 +@@ -13,7 +13,7 @@
638 + // CHECK_MINGW_ORG_TREE: {{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}include
639 +
640 +
641 +-// RUN: %clang -target i686-pc-windows-gnu -stdlib=libstdc++ -c -### --sysroot=%S/Inputs/mingw_mingw_builds_tree/mingw32 %s 2>&1 | FileCheck -check-prefix=CHECK_MINGW_BUILDS_TREE %s
642 ++// RUN: %clang -target i686-pc-windows-gnu -rtlib=platform -stdlib=libstdc++ -c -### --sysroot=%S/Inputs/mingw_mingw_builds_tree/mingw32 %s 2>&1 | FileCheck -check-prefix=CHECK_MINGW_BUILDS_TREE %s
643 + // CHECK_MINGW_BUILDS_TREE: "{{.*}}/Inputs/mingw_mingw_builds_tree/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++"
644 + // CHECK_MINGW_BUILDS_TREE: "{{.*}}/Inputs/mingw_mingw_builds_tree/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}i686-w64-mingw32"
645 + // CHECK_MINGW_BUILDS_TREE: "{{.*}}/Inputs/mingw_mingw_builds_tree/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}backward"
646 +@@ -22,7 +22,7 @@
647 + // CHECK_MINGW_BUILDS_TREE: "{{.*}}/Inputs/mingw_mingw_builds_tree/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include"
648 +
649 +
650 +-// RUN: %clang -target i686-pc-windows-gnu -stdlib=libstdc++ -c -### --sysroot=%S/Inputs/mingw_msys2_tree/msys64/mingw32 %s 2>&1 | FileCheck -check-prefix=CHECK_MINGW_MSYS_TREE %s
651 ++// RUN: %clang -target i686-pc-windows-gnu -rtlib=platform -stdlib=libstdc++ -c -### --sysroot=%S/Inputs/mingw_msys2_tree/msys64/mingw32 %s 2>&1 | FileCheck -check-prefix=CHECK_MINGW_MSYS_TREE %s
652 + // CHECK_MINGW_MSYS_TREE: "{{.*}}/Inputs/mingw_msys2_tree/msys64{{/|\\\\}}mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.9.2"
653 + // CHECK_MINGW_MSYS_TREE: "{{.*}}/Inputs/mingw_msys2_tree/msys64/mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.9.2{{/|\\\\}}i686-w64-mingw32"
654 + // CHECK_MINGW_MSYS_TREE: "{{.*}}/Inputs/mingw_msys2_tree/msys64/mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.9.2{{/|\\\\}}backward"
655 +@@ -32,7 +32,7 @@
656 + // CHECK_MINGW_MSYS_TREE: "{{.*}}/Inputs/mingw_msys2_tree/msys64/mingw32{{/|\\\\}}include"
657 +
658 +
659 +-// RUN: %clang -target x86_64-pc-windows-gnu -stdlib=libstdc++ -c -### --sysroot=%S/Inputs/mingw_opensuse_tree/usr %s 2>&1 | FileCheck -check-prefix=CHECK_MINGW_OPENSUSE_TREE %s
660 ++// RUN: %clang -target x86_64-pc-windows-gnu -rtlib=platform -stdlib=libstdc++ -c -### --sysroot=%S/Inputs/mingw_opensuse_tree/usr %s 2>&1 | FileCheck -check-prefix=CHECK_MINGW_OPENSUSE_TREE %s
661 + // CHECK_MINGW_OPENSUSE_TREE: "{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}lib64{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include{{/|\\\\}}c++"
662 + // CHECK_MINGW_OPENSUSE_TREE: "{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}lib64{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}x86_64-w64-mingw32"
663 + // CHECK_MINGW_OPENSUSE_TREE: "{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}lib64{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}backward"
664 +@@ -41,7 +41,7 @@
665 + // CHECK_MINGW_OPENSUSE_TREE: "{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}lib64{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include-fixed"
666 +
667 +
668 +-// RUN: %clang -target i686-pc-windows-gnu -stdlib=libstdc++ -c -### --sysroot=%S/Inputs/mingw_arch_tree/usr %s 2>&1 | FileCheck -check-prefix=CHECK_MINGW_ARCH_TREE %s
669 ++// RUN: %clang -target i686-pc-windows-gnu -rtlib=platform -stdlib=libstdc++ -c -### --sysroot=%S/Inputs/mingw_arch_tree/usr %s 2>&1 | FileCheck -check-prefix=CHECK_MINGW_ARCH_TREE %s
670 + // CHECK_MINGW_ARCH_TREE: "{{.*}}/Inputs/mingw_arch_tree/usr{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}5.1.0"
671 + // CHECK_MINGW_ARCH_TREE: "{{.*}}/Inputs/mingw_arch_tree/usr{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}5.1.0{{/|\\\\}}i686-w64-mingw32"
672 + // CHECK_MINGW_ARCH_TREE: "{{.*}}/Inputs/mingw_arch_tree/usr{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}5.1.0{{/|\\\\}}backward"
673 +@@ -50,7 +50,7 @@
674 + // CHECK_MINGW_ARCH_TREE: "{{.*}}/Inputs/mingw_arch_tree/usr{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include"
675 +
676 +
677 +-// RUN: %clang -target x86_64-pc-windows-gnu -stdlib=libstdc++ -c -### --sysroot=%S/Inputs/mingw_ubuntu_tree/usr %s 2>&1 | FileCheck -check-prefix=CHECK_MINGW_UBUNTU_TREE %s
678 ++// RUN: %clang -target x86_64-pc-windows-gnu -rtlib=platform -stdlib=libstdc++ -c -### --sysroot=%S/Inputs/mingw_ubuntu_tree/usr %s 2>&1 | FileCheck -check-prefix=CHECK_MINGW_UBUNTU_TREE %s
679 + // CHECK_MINGW_UBUNTU_TREE: "{{.*}}/Inputs/mingw_ubuntu_tree/usr{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.8"
680 + // CHECK_MINGW_UBUNTU_TREE: "{{.*}}/Inputs/mingw_ubuntu_tree/usr{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.8{{/|\\\\}}x86_64-w64-mingw32"
681 + // CHECK_MINGW_UBUNTU_TREE: "{{.*}}/Inputs/mingw_ubuntu_tree/usr{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.8{{/|\\\\}}backward"
682 +diff --git a/test/Driver/mips-mti-linux.c b/test/Driver/mips-mti-linux.c
683 +index e3560e2..4835d79 100644
684 +--- a/test/Driver/mips-mti-linux.c
685 ++++ b/test/Driver/mips-mti-linux.c
686 +@@ -8,7 +8,7 @@
687 +
688 + // = Big-endian, mips32r2, hard float
689 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
690 +-// RUN: --target=mips-mti-linux -mips32r2 -mhard-float \
691 ++// RUN: --target=mips-mti-linux -mips32r2 -mhard-float -rtlib=platform \
692 + // RUN: --sysroot=%S/Inputs/mips_mti_linux/sysroot \
693 + // RUN: | FileCheck --check-prefix=CHECK-BE-HF-32R2 %s
694 + //
695 +@@ -26,7 +26,7 @@
696 +
697 + // = Little-endian, mips32r2, hard float
698 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
699 +-// RUN: --target=mips-mti-linux -mips32r2 -EL -mhard-float \
700 ++// RUN: --target=mips-mti-linux -mips32r2 -EL -mhard-float -rtlib=platform \
701 + // RUN: --sysroot=%S/Inputs/mips_mti_linux/sysroot \
702 + // RUN: | FileCheck --check-prefix=CHECK-LE-HF-32R2 %s
703 + //
704 +diff --git a/test/Driver/sanitizer-ld.c b/test/Driver/sanitizer-ld.c
705 +index 4d4ea29..9f6fae3 100644
706 +--- a/test/Driver/sanitizer-ld.c
707 ++++ b/test/Driver/sanitizer-ld.c
708 +@@ -343,7 +343,7 @@
709 +
710 + // CFI by itself does not link runtime libraries.
711 + // RUN: %clang -fsanitize=cfi %s -### -o %t.o 2>&1 \
712 +-// RUN: -target x86_64-unknown-linux \
713 ++// RUN: -target x86_64-unknown-linux -rtlib=platform \
714 + // RUN: --sysroot=%S/Inputs/basic_linux_tree \
715 + // RUN: | FileCheck --check-prefix=CHECK-CFI-LINUX %s
716 + // CHECK-CFI-LINUX: "{{.*}}ld{{(.exe)?}}"
717 +diff --git a/test/Driver/windows-cross.c b/test/Driver/windows-cross.c
718 +index 3812287..84ef2df 100644
719 +--- a/test/Driver/windows-cross.c
720 ++++ b/test/Driver/windows-cross.c
721 +@@ -1,4 +1,4 @@
722 +-// RUN: %clang -### -target armv7-windows-itanium --sysroot %S/Inputs/Windows/ARM/8.1 -B %S/Inputs/Windows/ARM/8.1/usr/bin -stdlib=libstdc++ -o /dev/null %s 2>&1 \
723 ++// RUN: %clang -### -target armv7-windows-itanium --sysroot %S/Inputs/Windows/ARM/8.1 -B %S/Inputs/Windows/ARM/8.1/usr/bin -stdlib=libstdc++ -rtlib=platform -o /dev/null %s 2>&1 \
724 + // RUN: | FileCheck %s --check-prefix CHECK-BASIC
725 +
726 + // CHECK-BASIC: armv7-windows-itanium-ld" "--sysroot={{.*}}/Inputs/Windows/ARM/8.1" "-m" "thumb2pe" "-Bdynamic" "--entry" "mainCRTStartup" "--allow-multiple-definition" "-o" "{{[^"]*}}" "{{.*}}/Inputs/Windows/ARM/8.1/usr/lib/crtbegin.obj" "-L{{.*}}/Inputs/Windows/ARM/8.1/usr/lib" "-L{{.*}}/Inputs/Windows/ARM/8.1/usr/lib/gcc" "{{.*}}.o" "-lmsvcrt" "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed"
727 +diff --git a/test/OpenMP/linking.c b/test/OpenMP/linking.c
728 +index 81706d4..7b30592 100644
729 +--- a/test/OpenMP/linking.c
730 ++++ b/test/OpenMP/linking.c
731 +@@ -4,42 +4,42 @@
732 + // FIXME: Replace DEFAULT_OPENMP_LIB below with the value chosen at configure time.
733 + //
734 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
735 +-// RUN: -fopenmp -target i386-unknown-linux \
736 ++// RUN: -fopenmp -target i386-unknown-linux -rtlib=platform \
737 + // RUN: | FileCheck --check-prefix=CHECK-LD-32 %s
738 + // CHECK-LD-32: "{{.*}}ld{{(.exe)?}}"
739 + // CHECK-LD-32: "-l[[DEFAULT_OPENMP_LIB:[^"]*]]" "-lgcc"
740 + // CHECK-LD-32: "-lpthread" "-lc"
741 + //
742 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
743 +-// RUN: -fopenmp -target x86_64-unknown-linux \
744 ++// RUN: -fopenmp -target x86_64-unknown-linux -rtlib=platform \
745 + // RUN: | FileCheck --check-prefix=CHECK-LD-64 %s
746 + // CHECK-LD-64: "{{.*}}ld{{(.exe)?}}"
747 + // CHECK-LD-64: "-l[[DEFAULT_OPENMP_LIB:[^"]*]]" "-lgcc"
748 + // CHECK-LD-64: "-lpthread" "-lc"
749 + //
750 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
751 +-// RUN: -fopenmp=libgomp -target i386-unknown-linux \
752 ++// RUN: -fopenmp=libgomp -target i386-unknown-linux -rtlib=platform \
753 + // RUN: | FileCheck --check-prefix=CHECK-GOMP-LD-32 %s
754 + // CHECK-GOMP-LD-32: "{{.*}}ld{{(.exe)?}}"
755 + // CHECK-GOMP-LD-32: "-lgomp" "-lrt" "-lgcc"
756 + // CHECK-GOMP-LD-32: "-lpthread" "-lc"
757 + //
758 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
759 +-// RUN: -fopenmp=libgomp -target x86_64-unknown-linux \
760 ++// RUN: -fopenmp=libgomp -target x86_64-unknown-linux -rtlib=platform \
761 + // RUN: | FileCheck --check-prefix=CHECK-GOMP-LD-64 %s
762 + // CHECK-GOMP-LD-64: "{{.*}}ld{{(.exe)?}}"
763 + // CHECK-GOMP-LD-64: "-lgomp" "-lrt" "-lgcc"
764 + // CHECK-GOMP-LD-64: "-lpthread" "-lc"
765 + //
766 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
767 +-// RUN: -fopenmp -target i386-unknown-linux \
768 ++// RUN: -fopenmp -target i386-unknown-linux -rtlib=platform \
769 + // RUN: | FileCheck --check-prefix=CHECK-IOMP5-LD-32 %s
770 + // CHECK-IOMP5-LD-32: "{{.*}}ld{{(.exe)?}}"
771 + // CHECK-IOMP5-LD-32: "-l[[DEFAULT_OPENMP_LIB:[^"]*]]" "-lgcc"
772 + // CHECK-IOMP5-LD-32: "-lpthread" "-lc"
773 + //
774 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
775 +-// RUN: -fopenmp -target x86_64-unknown-linux \
776 ++// RUN: -fopenmp -target x86_64-unknown-linux -rtlib=platform \
777 + // RUN: | FileCheck --check-prefix=CHECK-IOMP5-LD-64 %s
778 + // CHECK-IOMP5-LD-64: "{{.*}}ld{{(.exe)?}}"
779 + // CHECK-IOMP5-LD-64: "-l[[DEFAULT_OPENMP_LIB:[^"]*]]" "-lgcc"
780 +@@ -57,6 +57,7 @@
781 + //
782 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
783 + // RUN: -fopenmp -fopenmp=libgomp -target i386-unknown-linux \
784 ++// RUN: -rtlib=platform \
785 + // RUN: | FileCheck --check-prefix=CHECK-LD-OVERRIDE-32 %s
786 + // CHECK-LD-OVERRIDE-32: "{{.*}}ld{{(.exe)?}}"
787 + // CHECK-LD-OVERRIDE-32: "-lgomp" "-lrt" "-lgcc"
788 +@@ -64,13 +65,14 @@
789 + //
790 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
791 + // RUN: -fopenmp -fopenmp=libgomp -target x86_64-unknown-linux \
792 ++// RUN: -rtlib=platform \
793 + // RUN: | FileCheck --check-prefix=CHECK-LD-OVERRIDE-64 %s
794 + // CHECK-LD-OVERRIDE-64: "{{.*}}ld{{(.exe)?}}"
795 + // CHECK-LD-OVERRIDE-64: "-lgomp" "-lrt" "-lgcc"
796 + // CHECK-LD-OVERRIDE-64: "-lpthread" "-lc"
797 + //
798 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
799 +-// RUN: -fopenmp=libomp -target x86_64-msvc-win32 \
800 ++// RUN: -fopenmp=libomp -target x86_64-msvc-win32 -rtlib=platform \
801 + // RUN: | FileCheck --check-prefix=CHECK-MSVC-LINK-64 %s
802 + // CHECK-MSVC-LINK-64: link.exe
803 + // CHECK-MSVC-LINK-64-SAME: -nodefaultlib:vcomp.lib
804 +@@ -79,7 +81,7 @@
805 + // CHECK-MSVC-LINK-64-SAME: -defaultlib:libomp.lib
806 + //
807 + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
808 +-// RUN: -fopenmp=libiomp5 -target x86_64-msvc-win32 \
809 ++// RUN: -fopenmp=libiomp5 -target x86_64-msvc-win32 -rtlib=platform \
810 + // RUN: | FileCheck --check-prefix=CHECK-MSVC-ILINK-64 %s
811 + // CHECK-MSVC-ILINK-64: link.exe
812 + // CHECK-MSVC-ILINK-64-SAME: -nodefaultlib:vcomp.lib
813 +--
814 +2.9.3
815 +
816
817 diff --git a/sys-devel/llvm/files/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch b/sys-devel/llvm/files/3.9.0/clang/gentoo-runtime-gcc-detection-v3.patch
818 similarity index 100%
819 rename from sys-devel/llvm/files/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch
820 rename to sys-devel/llvm/files/3.9.0/clang/gentoo-runtime-gcc-detection-v3.patch
821
822 diff --git a/sys-devel/llvm/files/3.9.0/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch b/sys-devel/llvm/files/3.9.0/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
823 new file mode 100644
824 index 00000000..269a9a1
825 --- /dev/null
826 +++ b/sys-devel/llvm/files/3.9.0/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
827 @@ -0,0 +1,25 @@
828 +From 8bd62a681744d3c31a0837c0f84f99ea4987e017 Mon Sep 17 00:00:00 2001
829 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
830 +Date: Tue, 9 Jun 2015 12:17:57 +0200
831 +Subject: [PATCH] cmake: Install compiler-rt into /usr/lib (without suffix)
832 +
833 +---
834 + CMakeLists.txt | 2 +-
835 + 1 file changed, 1 insertion(+), 1 deletion(-)
836 +
837 +diff --git a/CMakeLists.txt b/CMakeLists.txt
838 +index 0d8a880..5ae98a9 100644
839 +--- a/projects/compiler-rt/cmake/base-config-ix.cmake
840 ++++ b/projects/compiler-rt/cmake/base-config-ix.cmake
841 +@@ -52,7 +52,7 @@ if (NOT COMPILER_RT_STANDALONE_BUILD)
842 + # Setup the paths where compiler-rt runtimes and headers should be stored.
843 + set(COMPILER_RT_OUTPUT_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION})
844 + set(COMPILER_RT_EXEC_OUTPUT_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
845 +- set(COMPILER_RT_INSTALL_PATH lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION})
846 ++ set(COMPILER_RT_INSTALL_PATH lib/clang/${CLANG_VERSION})
847 + option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests."
848 + ${LLVM_INCLUDE_TESTS})
849 + option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered"
850 +--
851 +2.4.3
852 +
853
854 diff --git a/sys-devel/llvm/files/3.8.1/lldb/six.patch b/sys-devel/llvm/files/3.9.0/lldb/six.patch
855 similarity index 100%
856 rename from sys-devel/llvm/files/3.8.1/lldb/six.patch
857 rename to sys-devel/llvm/files/3.9.0/lldb/six.patch
858
859 diff --git a/sys-devel/llvm/files/3.8.1/llvm-config-r1.patch b/sys-devel/llvm/files/3.9.0/llvm-config-r1.patch
860 similarity index 100%
861 rename from sys-devel/llvm/files/3.8.1/llvm-config-r1.patch
862 rename to sys-devel/llvm/files/3.9.0/llvm-config-r1.patch
863
864 diff --git a/sys-devel/llvm/llvm-3.5.0.ebuild b/sys-devel/llvm/llvm-3.5.0.ebuild
865 index e163d97..90e7808 100644
866 --- a/sys-devel/llvm/llvm-3.5.0.ebuild
867 +++ b/sys-devel/llvm/llvm-3.5.0.ebuild
868 @@ -151,10 +151,10 @@ src_prepare() {
869
870 if use clang; then
871 # Automatically select active system GCC's libraries, bugs #406163 and #417913
872 - epatch "${FILESDIR}"/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch
873 + epatch "${FILESDIR}"/3.9.0/clang/gentoo-runtime-gcc-detection-v3.patch
874
875 epatch "${FILESDIR}"/3.5.2/clang/gentoo-install.patch
876 - epatch "${FILESDIR}"/3.8.1/clang/darwin_prefix-include-paths.patch
877 + epatch "${FILESDIR}"/3.9.0/clang/darwin_prefix-include-paths.patch
878 eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
879 fi
880
881
882 diff --git a/sys-devel/llvm/llvm-3.5.2.ebuild b/sys-devel/llvm/llvm-3.5.2.ebuild
883 index e158a2d..a4f1139 100644
884 --- a/sys-devel/llvm/llvm-3.5.2.ebuild
885 +++ b/sys-devel/llvm/llvm-3.5.2.ebuild
886 @@ -153,10 +153,10 @@ src_prepare() {
887
888 if use clang; then
889 # Automatically select active system GCC's libraries, bugs #406163 and #417913
890 - epatch "${FILESDIR}"/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch
891 + epatch "${FILESDIR}"/3.9.0/clang/gentoo-runtime-gcc-detection-v3.patch
892
893 epatch "${FILESDIR}"/3.5.2/clang/gentoo-install.patch
894 - epatch "${FILESDIR}"/3.8.1/clang/darwin_prefix-include-paths.patch
895 + epatch "${FILESDIR}"/3.9.0/clang/darwin_prefix-include-paths.patch
896 eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
897 fi
898
899
900 diff --git a/sys-devel/llvm/llvm-3.6.2.ebuild b/sys-devel/llvm/llvm-3.6.2.ebuild
901 index c0bede2..72511d2 100644
902 --- a/sys-devel/llvm/llvm-3.6.2.ebuild
903 +++ b/sys-devel/llvm/llvm-3.6.2.ebuild
904 @@ -157,10 +157,10 @@ src_prepare() {
905
906 if use clang; then
907 # Automatically select active system GCC's libraries, bugs #406163 and #417913
908 - epatch "${FILESDIR}"/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch
909 + epatch "${FILESDIR}"/3.9.0/clang/gentoo-runtime-gcc-detection-v3.patch
910
911 epatch "${FILESDIR}"/3.7.1/clang/gentoo-install.patch
912 - epatch "${FILESDIR}"/3.8.1/clang/darwin_prefix-include-paths.patch
913 + epatch "${FILESDIR}"/3.9.0/clang/darwin_prefix-include-paths.patch
914 eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
915
916 # Fix build fails with using gcc-4.9 on Gentoo/FreeBSD, bug #548444
917
918 diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
919 index 353bbff..a933eb6 100644
920 --- a/sys-devel/llvm/llvm-3.7.1-r3.ebuild
921 +++ b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
922 @@ -143,7 +143,7 @@ src_prepare() {
923 # Fix libdir for ocaml bindings install, bug #559134
924 eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
925 # Do not build/install ocaml docs with USE=-doc, bug #562008
926 - eapply "${FILESDIR}"/3.8.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
927 + eapply "${FILESDIR}"/3.9.0/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
928
929 # Make it possible to override Sphinx HTML install dirs
930 # https://llvm.org/bugs/show_bug.cgi?id=23780
931 @@ -178,7 +178,7 @@ src_prepare() {
932
933 if use clang; then
934 # Automatically select active system GCC's libraries, bugs #406163 and #417913
935 - eapply "${FILESDIR}"/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch
936 + eapply "${FILESDIR}"/3.9.0/clang/gentoo-runtime-gcc-detection-v3.patch
937
938 # Support gcc4.9 search paths
939 # https://github.com/llvm-mirror/clang/commit/af4db76e059c1a3
940 @@ -186,7 +186,7 @@ src_prepare() {
941
942 eapply "${FILESDIR}"/3.7.1/clang/gentoo-install.patch
943
944 - eapply "${FILESDIR}"/3.8.1/clang/darwin_prefix-include-paths.patch
945 + eapply "${FILESDIR}"/3.9.0/clang/darwin_prefix-include-paths.patch
946 eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
947
948 # Fix -isystem support in ccc-analyzer
949 @@ -207,7 +207,7 @@ src_prepare() {
950 # Make it possible to override CLANG_LIBDIR_SUFFIX
951 # (that is used only to find LLVMgold.so)
952 # https://llvm.org/bugs/show_bug.cgi?id=23793
953 - eapply "${FILESDIR}"/3.8.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
954 + eapply "${FILESDIR}"/3.9.0/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
955
956 # Fix git-clang-format shebang, bug #562688
957 python_fix_shebang tools/clang/tools/clang-format/git-clang-format
958
959 diff --git a/sys-devel/llvm/llvm-3.8.0-r3.ebuild b/sys-devel/llvm/llvm-3.8.0-r3.ebuild
960 index 1f865ea..111706a 100644
961 --- a/sys-devel/llvm/llvm-3.8.0-r3.ebuild
962 +++ b/sys-devel/llvm/llvm-3.8.0-r3.ebuild
963 @@ -144,7 +144,7 @@ src_prepare() {
964 # Fix libdir for ocaml bindings install, bug #559134
965 eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
966 # Do not build/install ocaml docs with USE=-doc, bug #562008
967 - eapply "${FILESDIR}"/3.8.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
968 + eapply "${FILESDIR}"/3.9.0/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
969
970 # Make it possible to override Sphinx HTML install dirs
971 # https://llvm.org/bugs/show_bug.cgi?id=23780
972 @@ -177,13 +177,13 @@ src_prepare() {
973
974 if use clang; then
975 # Automatically select active system GCC's libraries, bugs #406163 and #417913
976 - eapply "${FILESDIR}"/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch
977 + eapply "${FILESDIR}"/3.9.0/clang/gentoo-runtime-gcc-detection-v3.patch
978
979 # Support gcc4.9 search paths
980 # https://github.com/llvm-mirror/clang/commit/af4db76e059c1a3
981 eapply "${FILESDIR}"/3.8.1/clang/gcc4.9-search-path.patch
982
983 - eapply "${FILESDIR}"/3.8.1/clang/darwin_prefix-include-paths.patch
984 + eapply "${FILESDIR}"/3.9.0/clang/darwin_prefix-include-paths.patch
985 eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
986
987 sed -i -e "s^@EPREFIX@^${EPREFIX}^" \
988 @@ -191,7 +191,7 @@ src_prepare() {
989
990 # Install clang runtime into /usr/lib/clang
991 # https://llvm.org/bugs/show_bug.cgi?id=23792
992 - eapply "${FILESDIR}"/3.8.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
993 + eapply "${FILESDIR}"/3.9.0/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
994 eapply "${FILESDIR}"/3.8.1/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
995
996 # Do not force -march flags on arm platforms
997 @@ -201,7 +201,7 @@ src_prepare() {
998 # Make it possible to override CLANG_LIBDIR_SUFFIX
999 # (that is used only to find LLVMgold.so)
1000 # https://llvm.org/bugs/show_bug.cgi?id=23793
1001 - eapply "${FILESDIR}"/3.8.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
1002 + eapply "${FILESDIR}"/3.9.0/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
1003
1004 # Fix git-clang-format shebang, bug #562688
1005 python_fix_shebang tools/clang/tools/clang-format/git-clang-format
1006 @@ -226,7 +226,7 @@ src_prepare() {
1007 sed -e 's/add_subdirectory(readline)/#&/' \
1008 -i tools/lldb/scripts/Python/modules/CMakeLists.txt || die
1009 # Do not install bundled six module
1010 - eapply "${FILESDIR}"/3.8.1/lldb/six.patch
1011 + eapply "${FILESDIR}"/3.9.0/lldb/six.patch
1012 fi
1013
1014 # User patches
1015
1016 diff --git a/sys-devel/llvm/llvm-3.8.1-r2.ebuild b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
1017 index cbead1d..de892fd 100644
1018 --- a/sys-devel/llvm/llvm-3.8.1-r2.ebuild
1019 +++ b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
1020 @@ -145,7 +145,7 @@ src_prepare() {
1021 # Fix libdir for ocaml bindings install, bug #559134
1022 eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
1023 # Do not build/install ocaml docs with USE=-doc, bug #562008
1024 - eapply "${FILESDIR}"/3.8.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
1025 + eapply "${FILESDIR}"/3.9.0/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
1026
1027 # Make it possible to override Sphinx HTML install dirs
1028 # https://llvm.org/bugs/show_bug.cgi?id=23780
1029 @@ -164,7 +164,7 @@ src_prepare() {
1030
1031 # Fix llvm-config for shared linking and sane flags
1032 # https://bugs.gentoo.org/show_bug.cgi?id=565358
1033 - eapply "${FILESDIR}"/3.8.1/llvm-config-r1.patch
1034 + eapply "${FILESDIR}"/3.9.0/llvm-config-r1.patch
1035
1036 # Restore SOVERSIONs for shared libraries
1037 # https://bugs.gentoo.org/show_bug.cgi?id=578392
1038 @@ -184,13 +184,13 @@ src_prepare() {
1039
1040 if use clang; then
1041 # Automatically select active system GCC's libraries, bugs #406163 and #417913
1042 - eapply "${FILESDIR}"/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch
1043 + eapply "${FILESDIR}"/3.9.0/clang/gentoo-runtime-gcc-detection-v3.patch
1044
1045 # Support gcc4.9 search paths
1046 # https://github.com/llvm-mirror/clang/commit/af4db76e059c1a3
1047 eapply "${FILESDIR}"/3.8.1/clang/gcc4.9-search-path.patch
1048
1049 - eapply "${FILESDIR}"/3.8.1/clang/darwin_prefix-include-paths.patch
1050 + eapply "${FILESDIR}"/3.9.0/clang/darwin_prefix-include-paths.patch
1051 eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
1052
1053 pushd "${S}"/tools/clang >/dev/null || die
1054 @@ -206,7 +206,7 @@ src_prepare() {
1055
1056 # Install clang runtime into /usr/lib/clang
1057 # https://llvm.org/bugs/show_bug.cgi?id=23792
1058 - eapply "${FILESDIR}"/3.8.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
1059 + eapply "${FILESDIR}"/3.9.0/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
1060 eapply "${FILESDIR}"/3.8.1/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
1061
1062 # Do not force -march flags on arm platforms
1063 @@ -216,7 +216,7 @@ src_prepare() {
1064 # Make it possible to override CLANG_LIBDIR_SUFFIX
1065 # (that is used only to find LLVMgold.so)
1066 # https://llvm.org/bugs/show_bug.cgi?id=23793
1067 - eapply "${FILESDIR}"/3.8.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
1068 + eapply "${FILESDIR}"/3.9.0/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
1069
1070 # Fix git-clang-format shebang, bug #562688
1071 python_fix_shebang tools/clang/tools/clang-format/git-clang-format
1072 @@ -245,7 +245,7 @@ src_prepare() {
1073 sed -e 's/add_subdirectory(readline)/#&/' \
1074 -i tools/lldb/scripts/Python/modules/CMakeLists.txt || die
1075 # Do not install bundled six module
1076 - eapply "${FILESDIR}"/3.8.1/lldb/six.patch
1077 + eapply "${FILESDIR}"/3.9.0/lldb/six.patch
1078 fi
1079
1080 # User patches
1081
1082 diff --git a/sys-devel/llvm/llvm-3.8.1.ebuild b/sys-devel/llvm/llvm-3.8.1.ebuild
1083 index e1050f2..cc390c5 100644
1084 --- a/sys-devel/llvm/llvm-3.8.1.ebuild
1085 +++ b/sys-devel/llvm/llvm-3.8.1.ebuild
1086 @@ -144,7 +144,7 @@ src_prepare() {
1087 # Fix libdir for ocaml bindings install, bug #559134
1088 eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
1089 # Do not build/install ocaml docs with USE=-doc, bug #562008
1090 - eapply "${FILESDIR}"/3.8.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
1091 + eapply "${FILESDIR}"/3.9.0/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
1092
1093 # Make it possible to override Sphinx HTML install dirs
1094 # https://llvm.org/bugs/show_bug.cgi?id=23780
1095 @@ -177,13 +177,13 @@ src_prepare() {
1096
1097 if use clang; then
1098 # Automatically select active system GCC's libraries, bugs #406163 and #417913
1099 - eapply "${FILESDIR}"/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch
1100 + eapply "${FILESDIR}"/3.9.0/clang/gentoo-runtime-gcc-detection-v3.patch
1101
1102 # Support gcc4.9 search paths
1103 # https://github.com/llvm-mirror/clang/commit/af4db76e059c1a3
1104 eapply "${FILESDIR}"/3.8.1/clang/gcc4.9-search-path.patch
1105
1106 - eapply "${FILESDIR}"/3.8.1/clang/darwin_prefix-include-paths.patch
1107 + eapply "${FILESDIR}"/3.9.0/clang/darwin_prefix-include-paths.patch
1108 eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
1109
1110 sed -i -e "s^@EPREFIX@^${EPREFIX}^" \
1111 @@ -191,7 +191,7 @@ src_prepare() {
1112
1113 # Install clang runtime into /usr/lib/clang
1114 # https://llvm.org/bugs/show_bug.cgi?id=23792
1115 - eapply "${FILESDIR}"/3.8.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
1116 + eapply "${FILESDIR}"/3.9.0/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
1117 eapply "${FILESDIR}"/3.8.1/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
1118
1119 # Do not force -march flags on arm platforms
1120 @@ -201,7 +201,7 @@ src_prepare() {
1121 # Make it possible to override CLANG_LIBDIR_SUFFIX
1122 # (that is used only to find LLVMgold.so)
1123 # https://llvm.org/bugs/show_bug.cgi?id=23793
1124 - eapply "${FILESDIR}"/3.8.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
1125 + eapply "${FILESDIR}"/3.9.0/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
1126
1127 # Fix git-clang-format shebang, bug #562688
1128 python_fix_shebang tools/clang/tools/clang-format/git-clang-format
1129 @@ -226,7 +226,7 @@ src_prepare() {
1130 sed -e 's/add_subdirectory(readline)/#&/' \
1131 -i tools/lldb/scripts/Python/modules/CMakeLists.txt || die
1132 # Do not install bundled six module
1133 - eapply "${FILESDIR}"/3.8.1/lldb/six.patch
1134 + eapply "${FILESDIR}"/3.9.0/lldb/six.patch
1135 fi
1136
1137 # User patches
1138
1139 diff --git a/sys-devel/llvm/llvm-3.8.0-r3.ebuild b/sys-devel/llvm/llvm-3.9.0_rc3.ebuild
1140 similarity index 85%
1141 copy from sys-devel/llvm/llvm-3.8.0-r3.ebuild
1142 copy to sys-devel/llvm/llvm-3.9.0_rc3.ebuild
1143 index 1f865ea..72b42b5 100644
1144 --- a/sys-devel/llvm/llvm-3.8.0-r3.ebuild
1145 +++ b/sys-devel/llvm/llvm-3.9.0_rc3.ebuild
1146 @@ -5,6 +5,8 @@
1147 EAPI=6
1148
1149 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
1150 +# (needed due to lib32 find_library fix)
1151 +CMAKE_MIN_VERSION=3.6.1-r1
1152 PYTHON_COMPAT=( python2_7 )
1153
1154 inherit check-reqs cmake-utils eutils flag-o-matic multilib \
1155 @@ -12,19 +14,19 @@ inherit check-reqs cmake-utils eutils flag-o-matic multilib \
1156
1157 DESCRIPTION="Low Level Virtual Machine"
1158 HOMEPAGE="http://llvm.org/"
1159 -SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz
1160 - clang? ( http://llvm.org/releases/${PV}/compiler-rt-${PV}.src.tar.xz
1161 - http://llvm.org/releases/${PV}/cfe-${PV}.src.tar.xz
1162 - http://llvm.org/releases/${PV}/clang-tools-extra-${PV}.src.tar.xz )
1163 - lldb? ( http://llvm.org/releases/${PV}/lldb-${PV}.src.tar.xz )
1164 - !doc? ( http://dev.gentoo.org/~voyageur/distfiles/${PN}-3.8.0-manpages.tar.bz2 )"
1165 +SRC_URI="http://llvm.org/pre-releases/${PV%_*}/${PV#*_}/${P/_/}.src.tar.xz
1166 + clang? ( http://llvm.org/pre-releases/${PV%_*}/${PV#*_}/compiler-rt-${PV/_/}.src.tar.xz
1167 + http://llvm.org/pre-releases/${PV%_*}/${PV#*_}/cfe-${PV/_/}.src.tar.xz
1168 + http://llvm.org/pre-releases/${PV%_*}/${PV#*_}/clang-tools-extra-${PV/_/}.src.tar.xz )
1169 + lldb? ( http://llvm.org/pre-releases/${PV%_*}/${PV#*_}/lldb-${PV/_/}.src.tar.xz )
1170 + !doc? ( http://dev.gentoo.org/~mgorny/dist/${PN}-3.9.0_rc3-manpages.tar.bz2 )"
1171
1172 LICENSE="UoI-NCSA"
1173 SLOT="0/${PV}"
1174 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
1175 -IUSE="clang debug doc gold libedit +libffi lldb multitarget ncurses ocaml
1176 - python +static-analyzer test xml video_cards_radeon
1177 - kernel_Darwin kernel_FreeBSD"
1178 +KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
1179 +IUSE="clang debug default-compiler-rt default-libcxx doc gold libedit +libffi
1180 + lldb multitarget ncurses ocaml python +sanitize +static-analyzer test xml
1181 + video_cards_radeon elibc_musl kernel_Darwin kernel_FreeBSD"
1182
1183 COMMON_DEPEND="
1184 sys-libs/zlib:0=
1185 @@ -67,6 +69,7 @@ DEPEND="${COMMON_DEPEND}
1186 ${PYTHON_DEPS}"
1187 RDEPEND="${COMMON_DEPEND}
1188 clang? ( !<=sys-devel/clang-${PV}-r99 )
1189 + default-libcxx? ( sys-libs/libcxx )
1190 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
1191 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
1192 PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
1193 @@ -139,12 +142,10 @@ src_unpack() {
1194 src_prepare() {
1195 python_setup
1196
1197 - # Make ocaml warnings non-fatal, bug #537308
1198 - sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml || die
1199 # Fix libdir for ocaml bindings install, bug #559134
1200 eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
1201 # Do not build/install ocaml docs with USE=-doc, bug #562008
1202 - eapply "${FILESDIR}"/3.8.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
1203 + eapply "${FILESDIR}"/3.9.0/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
1204
1205 # Make it possible to override Sphinx HTML install dirs
1206 # https://llvm.org/bugs/show_bug.cgi?id=23780
1207 @@ -154,21 +155,20 @@ src_prepare() {
1208 # https://llvm.org/bugs/show_bug.cgi?id=23781
1209 eapply "${FILESDIR}"/9999/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
1210
1211 - # Prevent installing libgtest
1212 - # https://llvm.org/bugs/show_bug.cgi?id=18341
1213 - eapply "${FILESDIR}"/3.8.1/0005-cmake-Do-not-install-libgtest.patch
1214 -
1215 # Allow custom cmake build types (like 'Gentoo')
1216 eapply "${FILESDIR}"/9999/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch
1217
1218 # Fix llvm-config for shared linking and sane flags
1219 # https://bugs.gentoo.org/show_bug.cgi?id=565358
1220 - eapply "${FILESDIR}"/3.8.1/llvm-config.patch
1221 + eapply "${FILESDIR}"/3.9.0/llvm-config-r1.patch
1222
1223 # Restore SOVERSIONs for shared libraries
1224 # https://bugs.gentoo.org/show_bug.cgi?id=578392
1225 eapply "${FILESDIR}"/9999/0008-cmake-Restore-SOVERSIONs-on-shared-libraries.patch
1226
1227 + # support building llvm against musl-libc
1228 + use elibc_musl && eapply "${FILESDIR}"/9999/musl-fixes.patch
1229 +
1230 # disable use of SDK on OSX, bug #568758
1231 sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
1232
1233 @@ -177,47 +177,31 @@ src_prepare() {
1234
1235 if use clang; then
1236 # Automatically select active system GCC's libraries, bugs #406163 and #417913
1237 - eapply "${FILESDIR}"/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch
1238 -
1239 - # Support gcc4.9 search paths
1240 - # https://github.com/llvm-mirror/clang/commit/af4db76e059c1a3
1241 - eapply "${FILESDIR}"/3.8.1/clang/gcc4.9-search-path.patch
1242 + eapply "${FILESDIR}"/3.9.0/clang/gentoo-runtime-gcc-detection-v3.patch
1243
1244 - eapply "${FILESDIR}"/3.8.1/clang/darwin_prefix-include-paths.patch
1245 + eapply "${FILESDIR}"/3.9.0/clang/darwin_prefix-include-paths.patch
1246 eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
1247
1248 + pushd "${S}"/tools/clang >/dev/null || die
1249 + # be able to specify default values for -stdlib and -rtlib at build time
1250 + eapply "${FILESDIR}"/3.9.0/clang/default-libs.patch
1251 + popd >/dev/null || die
1252 +
1253 sed -i -e "s^@EPREFIX@^${EPREFIX}^" \
1254 tools/clang/tools/scan-build/bin/scan-build || die
1255
1256 # Install clang runtime into /usr/lib/clang
1257 # https://llvm.org/bugs/show_bug.cgi?id=23792
1258 - eapply "${FILESDIR}"/3.8.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
1259 - eapply "${FILESDIR}"/3.8.1/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
1260 -
1261 - # Do not force -march flags on arm platforms
1262 - # https://bugs.gentoo.org/show_bug.cgi?id=562706
1263 - eapply "${FILESDIR}"/3.8.1/compiler-rt/arm_march_flags.patch
1264 + eapply "${FILESDIR}"/3.9.0/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
1265 + eapply "${FILESDIR}"/3.9.0/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
1266
1267 # Make it possible to override CLANG_LIBDIR_SUFFIX
1268 # (that is used only to find LLVMgold.so)
1269 # https://llvm.org/bugs/show_bug.cgi?id=23793
1270 - eapply "${FILESDIR}"/3.8.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
1271 + eapply "${FILESDIR}"/3.9.0/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
1272
1273 # Fix git-clang-format shebang, bug #562688
1274 python_fix_shebang tools/clang/tools/clang-format/git-clang-format
1275 -
1276 - # Fix 'stdarg.h' file not found on Gentoo/FreeBSD, bug #578064
1277 - # https://llvm.org/bugs/show_bug.cgi?id=26651
1278 - eapply "${FILESDIR}"/3.8.1/compiler-rt/fbsd.patch
1279 -
1280 - pushd projects/compiler-rt >/dev/null || die
1281 -
1282 - # Fix WX sections, bug #421527
1283 - find lib/builtins -type f -name '*.S' -exec sed \
1284 - -e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \
1285 - -i {} + || die
1286 -
1287 - popd >/dev/null || die
1288 fi
1289
1290 if use lldb; then
1291 @@ -226,7 +210,7 @@ src_prepare() {
1292 sed -e 's/add_subdirectory(readline)/#&/' \
1293 -i tools/lldb/scripts/Python/modules/CMakeLists.txt || die
1294 # Do not install bundled six module
1295 - eapply "${FILESDIR}"/3.8.1/lldb/six.patch
1296 + eapply "${FILESDIR}"/3.9.0/lldb/six.patch
1297 fi
1298
1299 # User patches
1300 @@ -241,7 +225,7 @@ multilib_src_configure() {
1301 if use multitarget; then
1302 targets=all
1303 else
1304 - targets='host;BPF;CppBackend'
1305 + targets='host;BPF'
1306 use video_cards_radeon && targets+=';AMDGPU'
1307 fi
1308
1309 @@ -256,7 +240,6 @@ multilib_src_configure() {
1310 -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
1311
1312 -DBUILD_SHARED_LIBS=ON
1313 - -DLLVM_ENABLE_TIMESTAMPS=OFF
1314 -DLLVM_TARGETS_TO_BUILD="${targets}"
1315 -DLLVM_BUILD_TESTS=$(usex test)
1316
1317 @@ -282,6 +265,14 @@ multilib_src_configure() {
1318 # libgomp support fails to find headers without explicit -I
1319 # furthermore, it provides only syntax checking
1320 -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
1321 +
1322 + # override default stdlib and rtlib
1323 + -DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
1324 + -DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
1325 +
1326 + # compiler-rt's test cases depend on sanitizer
1327 + -DCOMPILER_RT_BUILD_SANITIZERS=$(usex sanitize)
1328 + -DCOMPILER_RT_INCLUDE_TESTS=$(usex sanitize)
1329 )
1330 fi
1331
1332 @@ -453,9 +444,6 @@ multilib_src_install() {
1333 cmake-utils_src_install
1334
1335 if multilib_is_native_abi; then
1336 - # Install man pages.
1337 - use doc || doman "${WORKDIR}"/${PN}-3.8.0-manpages/*.1
1338 -
1339 # Symlink the gold plugin.
1340 if use gold; then
1341 dodir "/usr/${CHOST}/binutils-bin/lib/bfd-plugins"
1342 @@ -506,6 +494,15 @@ multilib_src_install_all() {
1343 # some users may find it useful
1344 dodoc utils/vim/vimrc
1345
1346 + # Install man pages from the prebuilt package
1347 + if ! use doc; then
1348 + if ! use clang; then
1349 + rm "${WORKDIR}"/${PN}-3.9.0_rc3-manpages/{clang,extraclangtools,scan-build}.1 || die
1350 + fi
1351 +
1352 + doman "${WORKDIR}"/${PN}-3.9.0_rc3-manpages/*.1
1353 + fi
1354 +
1355 if use clang; then
1356 pushd tools/clang >/dev/null || die
1357
1358
1359 diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
1360 index 834c3d2..e4be885 100644
1361 --- a/sys-devel/llvm/llvm-9999.ebuild
1362 +++ b/sys-devel/llvm/llvm-9999.ebuild
1363 @@ -5,7 +5,8 @@
1364 EAPI=6
1365
1366 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
1367 -CMAKE_MIN_VERSION=3.4.3
1368 +# (needed due to lib32 find_library fix)
1369 +CMAKE_MIN_VERSION=3.6.1-r1
1370 DISTUTILS_OPTIONAL=1
1371 PYTHON_COMPAT=( python2_7 )
1372
1373 @@ -90,8 +91,6 @@ src_prepare() {
1374 # Python is needed to run tests using lit
1375 python_setup
1376
1377 - # Make ocaml warnings non-fatal, bug #537308
1378 - sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml || die
1379 # Fix libdir for ocaml bindings install, bug #559134
1380 eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
Report Message
Find on MARC Find on Google Groups