| 1 |
commit: 8bea90662216e99158a580b72cbeca64a492c293 |
| 2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun May 7 18:47:25 2017 +0000 |
| 4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 5 |
CommitDate: Sun May 7 18:47:25 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=8bea9066 |
| 7 |
|
| 8 |
sys-devel/gcc: version bump to 7.1.0 |
| 9 |
|
| 10 |
split 6.3.0 patch in half. |
| 11 |
|
| 12 |
eclass/toolchain.eclass | 3 +- |
| 13 |
sys-devel/gcc/Manifest | 9 ++++-- |
| 14 |
.../6.3.0/{musl.patch => cpu_indicator.patch} | 33 ---------------------- |
| 15 |
sys-devel/gcc/files/6.3.0/musl.patch | 30 -------------------- |
| 16 |
sys-devel/gcc/files/7.1.0/posix_memalign.patch | 29 +++++++++++++++++++ |
| 17 |
sys-devel/gcc/gcc-6.3.0.ebuild | 1 + |
| 18 |
.../gcc/{gcc-6.3.0.ebuild => gcc-7.1.0.ebuild} | 10 +++---- |
| 19 |
7 files changed, 43 insertions(+), 72 deletions(-) |
| 20 |
|
| 21 |
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass |
| 22 |
index f42e58e..77cad2c 100644 |
| 23 |
--- a/eclass/toolchain.eclass |
| 24 |
+++ b/eclass/toolchain.eclass |
| 25 |
@@ -233,7 +233,8 @@ S=$( |
| 26 |
|
| 27 |
gentoo_urls() { |
| 28 |
local devspace="HTTP~vapier/dist/URI HTTP~rhill/dist/URI |
| 29 |
- HTTP~zorry/patches/gcc/URI HTTP~blueness/dist/URI" |
| 30 |
+ HTTP~zorry/patches/gcc/URI HTTP~blueness/dist/URI |
| 31 |
+ HTTP~tamiko/distfiles/URI" |
| 32 |
devspace=${devspace//HTTP/https:\/\/dev.gentoo.org\/} |
| 33 |
echo mirror://gentoo/$1 ${devspace//URI/$1} |
| 34 |
} |
| 35 |
|
| 36 |
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest |
| 37 |
index af6386d..aa4aff3 100644 |
| 38 |
--- a/sys-devel/gcc/Manifest |
| 39 |
+++ b/sys-devel/gcc/Manifest |
| 40 |
@@ -5,7 +5,9 @@ AUX 5.4.0/cilkrts.patch 1798 SHA256 a8d859d2be3b86f1fa14bd85ee10b3ef250ab24acc78 |
| 41 |
AUX 5.4.0/linker_path.patch 9241 SHA256 e1c9479807a186ba1fd5cf4de2fa025fb72ae038b66721e2aa8eee45e9c741c6 SHA512 f5997d46772517f9538cabbfd01f78225301f6747a8106198c9fe0a591e53ed1c490bf89310848ae89135079928c8325880294c766d4983394b0eec0fcfd8046 WHIRLPOOL 4010e23e4cf306e29ba774788192261c74d1fee98dcdc1cc82d9267dd128345773c46db65224b42bcb161d32691e83467a0c8f7453d02123116486ad5f5f5ce6 |
| 42 |
AUX 5.4.0/musl.patch 19066 SHA256 537dd351a7695fb6335cf943e5845578f325fb6fc8fbdf02a312ee7ef79c2a0d SHA512 56020b6759929053e0256150dbf5ba824fc0c1d4f574e1f4af066d6cdcb8199d8b8986008aaf46727454054091f7e9c4bd33bd2dd4e27c21a60fcbc4312103bc WHIRLPOOL 7ae62962e269e0032d3ed1446e876387d711bec310c2fbbfbec04e62e2f416ebe0486016d2520dd05157dd527af4eda05e886e63cd9b77817f4ed10639b33fa7 |
| 43 |
AUX 5.4.0/ppc-secure_plt.patch 2161 SHA256 40649792d02e98717fb9a361004f332a98bebf77b5ad83b05678f13760337dd3 SHA512 4ba9780f4cbbe30afe9e40831f2ee57d9979ada093dc15511bef6ec69f97198034a8d07a8efa0884b66d904c7ad5b86a69b52a0ba41c3110680bf01d7b051388 WHIRLPOOL dedc5db47ef2b405a268b417a0323cf3c2f7b5956c1fdb5722f14628f32657f92b381a70c6412b940b0ed740037ee20cbedf8032ef093a62deba847249288975 |
| 44 |
-AUX 6.3.0/musl.patch 2559 SHA256 0d53a7b29f8ea6e337444e412cd07e80a620446eca0763edf1674e1544311acc SHA512 764437a1c86bf97598a93aaa1a41cf9252350bcb6bfa5d70140e56387b230287875c5e4cb361ff8eb8f8e2f7ae6af8f5667c3e090ee7d6331bc4fb5daac9f023 WHIRLPOOL 35ecf4c3fd7c81c24775663a578f1befb6866545372313a1d0e961605ff065538b1e5c267d3db9a7853a75ddec880750bd4ede76eb13f078e4a8f29001bf2cf2 |
| 45 |
+AUX 6.3.0/cpu_indicator.patch 1357 SHA256 69774c4cf74bb99e70d705a535041097973c5c316c972cd6d4a39d244fabddb0 SHA512 a656b9760fd11111c1237d168d099d4b3c2ddc5e9e632780f8468f60f8dfdb5235d251a03f9b4c3e029255171ca57ad742ec4164cbd1336584ce28cb64af15a9 WHIRLPOOL 5841e84c77994214603d58b309631ddcdef18b8030ef3eaa42940d89ae849b9de440a55e23e804738f7f974c9733afe754dedf958ce49d2eb91422aae0671cd8 |
| 46 |
+AUX 6.3.0/musl.patch 1202 SHA256 08891bd560cd5f416bdc91947fd38708c206cf2a5aec96814b815aea3c9c5429 SHA512 dd9b6b5f57177afcde51880a1f20c37fc24f5d078a248672ea1695a10359d8defd1c6cd9eb96986ba166ac8289d751e0a0eefe7f370c82568f3a44c858df174e WHIRLPOOL dc778ba1b3aea6b63921d9de95dadb8f7d1b0bc6380549180e7ee241f668b74d94f4f4ae40d97366831bb95786d493f476353ec318c66cf85335325adddd00b3 |
| 47 |
+AUX 7.1.0/posix_memalign.patch 1183 SHA256 05bf3206710921e88c014a2aaaf55f8597cd75fc1660c8a85aff7e16c7fbef4c SHA512 a782e0aec9cb9406c90a83b1933e4d6ba1356b33b82a99422528c3a50c9b4832b7c0501f620dc1c7bb2c6802255277a60b2aec19c2a60289c0d4eb1040a85c86 WHIRLPOOL ff43b6f21311a529735a65f6f907d1df073ad496385705dd5c3f02f5d36270706244d104c0a869ec96338b7a1ca01d883832ec9acc781693254163e68189a008 |
| 48 |
AUX awk/fixlafiles.awk 7700 SHA256 5289279eb5df3dce696c56ce253980b9a9ae0968703f200970bbc24396a1ae62 SHA512 5ed208e116769741dda7274f15c5b3bdfd482cd926261038bc696644b73aa0d0e950d7fbfc0eb1a90529dd134fa548c46499a18c77470a05d87ae76bc1b3acd2 WHIRLPOOL 06826b65ffdbcc1c624ffed16104301bebc47f4b44358197fd7f0f78d0805a5228e346a8eaf5ee79355e1921878f94d3dd527d39e2975ea3b919140139d884e0 |
| 49 |
AUX awk/fixlafiles.awk-no_gcc_la 8480 SHA256 9697196d45cc47d3846021c0dfd0a24208a75b10d32c74cef53aa253031f2efb SHA512 7487115a3c4d6cf0edaf4b0ffeb87225d8fbcb7e595e2e99974582e0cce5868d7e292044db2631380c185553866554763eac4c3024347dbdb2cbf68679923294 WHIRLPOOL 24ac7f49bff29cc0abc5c4e502112e3dc2f42517244b8c9a4b8fdf73c9a31fcecdcc42989bbda8faa5feb54dde37c1d7374e1360a0c4de8c136b0523107c6ad4 |
| 50 |
AUX c89 412 SHA256 29ad5dd697135c2892067e780447894dc1cd071708157e46d21773ab99c5022c SHA512 71d33a147339d8d70a62aa22a95d3e70e445d8435d6ac05893f7da19ae851b89bea851f6ce213fbd22470f13572ae13b83cf02f0621333f07d7b0c68a79b7924 WHIRLPOOL d9707a2be8da7a709b54fcb1154cfa05e479f8c3bdd6173822ee1f1bc265b2a0d04741c0685bfb0db68e1e4297fb032d2f8ff94da88014575d947054474d8295 |
| 51 |
@@ -70,6 +72,8 @@ DIST gcc-5.4.0-uclibc-patches-1.0.tar.bz2 3731 SHA256 a3145faa6c81c0753ba754b735 |
| 52 |
DIST gcc-5.4.0.tar.bz2 95661481 SHA256 608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a SHA512 2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d1ef16ea39def408a644ba48f97519ec7a7dd37d260c3e9423514265b WHIRLPOOL ec81c8143e48bc8d9d0bbdc0fa3ca553c805193f53ac46c86127b54565894780dd97281485e396a130567464c753f043458c8e450018c957813f50ff90a40708 |
| 53 |
DIST gcc-6.3.0-patches-1.0.tar.bz2 7596 SHA256 6c880468ffa4ad2b324fd18c762dbdf10646089c8ab865c228e166f99a0e049c SHA512 8fc96086bd3da3726687ee9d180d3b5d0a7d5814141d44eac8eb01566a783ec780c8fb8f55f75d6e9c9006b2e407e20cdb5835d541b0b66a47dd60642861734c WHIRLPOOL b1bce94d6134db6c9aff4298c6c7af003e39d0411aa40cd027d2c7d6a256971c81fb557e85b25f1107e9a474cb7d772c3bc62a7a4ab7ff7fca5eeae5b2ca0c94 |
| 54 |
DIST gcc-6.3.0.tar.bz2 99903185 SHA256 f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f SHA512 234dd9b1bdc9a9c6e352216a7ef4ccadc6c07f156006a59759c5e0e6a69f0abcdc14630eff11e3826dd6ba5933a8faa43043f3d1d62df6bd5ab1e82862f9bf78 WHIRLPOOL e79a2d6ad199396b6efd835c1129d049a367174ea33dd3b6247d72461f117c2dd81e5a66f3dd6427ce500e768d3a4453efd0debcb56966d00c7df79d05d54b7d |
| 55 |
+DIST gcc-7.1.0-patches-1.0.tar.bz2 7609 SHA256 8213cd597e80c6951ec06273100ce0933c2c138044ccdc752eee9a0887209146 SHA512 92727d2b57a498f6540d3ec9d0764b7698bd70ac4d795f87610eddebf69bd80f81a130e042182ec672964af987e239e0dbab72f619189538240fe75dd7facb10 WHIRLPOOL 713cfc6652b320a2fa083bfb1521762f7b09cd1baf9f9d7c24ac22c90173576ff4b20fc206e490135af95c800d399d528171d9e057311fb3bef5e4eff8722a33 |
| 56 |
+DIST gcc-7.1.0.tar.bz2 84303533 SHA256 8a8136c235f64c6fef69cac0d73a46a1a09bb250776a050aec8f9fc880bebc17 SHA512 b5d952be9a10f0e0926bb2868877d10544039d6d2f35ba0a08f51231dd622a007650764a03e173194701467547789ad7d2d9cbc10adcdf118d619cdedbd14aec WHIRLPOOL 1dce5f89d4110bacd7f65140a1dee7b1a4898682e2ae8621832bda6f101354d226743acf77974b5e97d861c6eb6c47637138987dfb6ba222ad81b751e80ff6e6 |
| 57 |
EBUILD gcc-4.7.4-r99.ebuild 2064 SHA256 d44222e1b4b6a51fbe8bd021b1fdcb240be7c040c5cd91b06984a355fe598bb4 SHA512 53897fb9053f884f7f0bdd55bcfdf426c853ebde2a9b64502b9b203f77ad90f4bad5f91ef01752c212b96ea97546ad1400b85617d518063c9753eca0fb75d64e WHIRLPOOL f16b4623e8d6ef21d996637966d3597674bab87eff1a43ca4099ad8d643d6026f9c1c14197d2a7e312bd6d47033fae383c0f7f10cda34da1f0446a7237e01f9a |
| 58 |
EBUILD gcc-4.8.5-r99.ebuild 2132 SHA256 7177fbd399c4a21ad5d310a8fdc6eb763e4fcbef8c6fe633d842a9dfa2aa18e3 SHA512 14bb56b2d1990966f557c1c7e40479c9b02084dacfe5f0c92053f323ac455f269ee5caf9c5b43aeac10bf7d399d74060b4ba366e71f65d4a3276a7f93cb0a4e1 WHIRLPOOL f2d7b275cc318a4e1447c82ad73fae92a18ebfe0abccd0d1ac7842e8633f9173ba0fef1d8fd5c7b9cfb54ff3d7b9501d65778fcf7ab4c328a161b2dd6d999b8e |
| 59 |
EBUILD gcc-4.8.5-r999.ebuild 2178 SHA256 baba9e2473b253749175d4a34a8e578dd4a4b0159609a8090404348442ad1af2 SHA512 ff78ae0c4079757c0920f9167283296e8456d123d2746ab80558da7274a082f3a481083668c66c2aac7b3a981a6215cfc2cc3d219e21d602ebd4e8bfd579a664 WHIRLPOOL 9b428343bd1d1e57030445f8fe67d5c4f72e8415c516de600271993937b61ba311d66b412911667ae52f1a776c4b6c1d331dbdea2e643581660c7824dc766b45 |
| 60 |
@@ -78,5 +82,6 @@ EBUILD gcc-4.9.3-r999.ebuild 1787 SHA256 f2620bf8ff9ebd84e298e3e433ee427398e6381 |
| 61 |
EBUILD gcc-4.9.4-r100.ebuild 2313 SHA256 08ca3c854dc7fdf863a659f0c745bbe92a094a60b71beb12aca2bcef8a555c1c SHA512 780400349b18484bfa253091bc0d9f17319fb892d202b226f72f114ee48d843665bf1ec00e08ef9ea0bf77ea72e13c4f1e2b732d63a252528e6d4ffcf92e151f WHIRLPOOL 9333b35db26f056416975313e4510d775b23844c2c4c8a3847b9ccb8b010fa983adf940ba2a1577d4de45c522de26d56d638115a814bde44084d3b3bcb06ce07 |
| 62 |
EBUILD gcc-4.9.4-r99.ebuild 2261 SHA256 770df64ec98bcc6071a482abfa68b3b38a0187b6e13d58ad8b26ef8495e7ec07 SHA512 ba472cc558a94e3ed8632681c7678287fadc0303f1ff88b575e5b41e9087f9efff7332621523618eabc2fac85f71dad6a16194b9b8d55d023f77af2fe2d235b8 WHIRLPOOL d0bbcf867f789e469171f30d8188264ee66426fba8662f26b47bb0befe91fea2d9d2ac50e640816e5c746648b478414ac62ff5db2d97452becc4d1863159a725 |
| 63 |
EBUILD gcc-5.4.0-r3.ebuild 1887 SHA256 b3861f388bdcf6bb307c9011f2b2f11b9b6fe86a5ccd7ff2f4674a57796d932c SHA512 0b337cfa74dd246d702b5cb4aa64d8cd452f2ae17f9fb988f18318c871f51f0fa718c297e6904193f0499ec7184e9f4d7b503b47d6bd971091e65d53235645d6 WHIRLPOOL 0cc9f48d5a78d3f602a44be4e9a29df2c8c3bac70616c426f8cdd7b730b19f05d567901a993335e04c326230d6717737a6c78dd9d9ea05a2470b0441224aed1c |
| 64 |
-EBUILD gcc-6.3.0.ebuild 786 SHA256 1f12de0f326b6f4260871cf18fdc24c0203f8370a9f67a54890800157fe2fe0e SHA512 f8f92b7ca71f134cb7740025079eba0369f048c27440f4057a97b95b3d51ffd577996b30303d64e098732f838abe281d19c99b8c8cfb5eecd53bd79073d13973 WHIRLPOOL 37ec52d3e06944bb4a75567b435da32fdb829c8fd45ee604a613979dbbccbed4dc17e19df5da67f2f108376ecfe0790f989b7b1b943ac076e4b22d3ee3cb6b33 |
| 65 |
+EBUILD gcc-6.3.0.ebuild 835 SHA256 e66794320f8ab7bfc19a9c9f79abe20e4b18a12d84ccdb1fc7df3bf02cb6a224 SHA512 c1d09cab9b39f7ae68db577b30acadd9011794e7d92ee6a80edb0e4508eecb46903f53474743c5832e97a3361821a803b14010c98f8e6358cc0d3c44046c5fbb WHIRLPOOL 51ed759e2686e217fc4b4983b2c26c7843150df8cc1fddf0379e9a973bacd4e242a17a02fdff3f8b71ca762e670d8c63fc2c073d193b74218eecee353db50216 |
| 66 |
+EBUILD gcc-7.1.0.ebuild 603 SHA256 95d496eeff5ca37bb03914c029329c5965095b4c2ab6bbf91ae18c2f4277fba6 SHA512 2b3a5b038b0c96b2212194c816e8f02805887dabe9fca218c48fa07432b59df92c9186f96609c464396e56c3f938629f84e460246f3adecf554622aac7302adc WHIRLPOOL f3ecae98f2661dd0229301e9890a41a959b91143b8d2d13d941eb79fb921ef7f6ee69ead19743619fb33af51c40ff92d67d1f675535a393a97f2deef10160d3d |
| 67 |
MISC metadata.xml 2370 SHA256 88c4368c971e8bd943882901a833afcd03a541677a755310556470268b9024b2 SHA512 a5e8c2f8524f37881f422ef39d4a2ad74802f6e99bb7224cd48482f5b80964292ae6c760f8c39551b150875e721e654d29138cfb4b68b305dba181ce959265ff WHIRLPOOL a4b9abcf4cbd0e4c6a42cce373df9edf1cfd6fcd66efc7c04d7fd3748d5e82126e94bac5b25335aadb3c7ef379358e3402adc0a19c200d9c68ebb2773d0d323e |
| 68 |
|
| 69 |
diff --git a/sys-devel/gcc/files/6.3.0/musl.patch b/sys-devel/gcc/files/6.3.0/cpu_indicator.patch |
| 70 |
similarity index 53% |
| 71 |
copy from sys-devel/gcc/files/6.3.0/musl.patch |
| 72 |
copy to sys-devel/gcc/files/6.3.0/cpu_indicator.patch |
| 73 |
index 03a5dc2..cdd3fff 100644 |
| 74 |
--- a/sys-devel/gcc/files/6.3.0/musl.patch |
| 75 |
+++ b/sys-devel/gcc/files/6.3.0/cpu_indicator.patch |
| 76 |
@@ -14,39 +14,6 @@ diff -Naur gcc-6.2.0.orig/gcc/config/i386/i386.c gcc-6.2.0/gcc/config/i386/i386. |
| 77 |
call_expr = build_call_expr (fndecl, 0); |
| 78 |
return expand_expr (call_expr, target, mode, EXPAND_NORMAL); |
| 79 |
} |
| 80 |
-diff -Naur gcc-6.2.0.orig/gcc/config/linux.c gcc-6.2.0/gcc/config/linux.c |
| 81 |
---- gcc-6.2.0.orig/gcc/config/linux.c 2016-12-24 15:55:23.308342638 -0800 |
| 82 |
-+++ gcc-6.2.0/gcc/config/linux.c 2016-12-24 16:00:51.852488459 -0800 |
| 83 |
-@@ -26,7 +26,7 @@ |
| 84 |
- bool |
| 85 |
- linux_libc_has_function (enum function_class fn_class) |
| 86 |
- { |
| 87 |
-- if (OPTION_GLIBC) |
| 88 |
-+ if (OPTION_GLIBC || OPTION_MUSL) |
| 89 |
- return true; |
| 90 |
- if (OPTION_BIONIC) |
| 91 |
- if (fn_class == function_c94 |
| 92 |
-diff -Naur gcc-6.2.0.orig/gcc/config.gcc gcc-6.2.0/gcc/config.gcc |
| 93 |
---- gcc-6.2.0.orig/gcc/config.gcc 2016-12-24 15:55:15.957272251 -0800 |
| 94 |
-+++ gcc-6.2.0/gcc/config.gcc 2016-12-24 16:02:12.297258721 -0800 |
| 95 |
-@@ -1484,7 +1484,7 @@ |
| 96 |
- extra_options="${extra_options} linux-android.opt" |
| 97 |
- # Assume modern glibc if not targeting Android nor uclibc. |
| 98 |
- case ${target} in |
| 99 |
-- *-*-*android*|*-*-*uclibc*) |
| 100 |
-+ *-*-*android*|*-*-*uclibc*|*-*-*musl*) |
| 101 |
- ;; |
| 102 |
- *) |
| 103 |
- default_gnu_indirect_function=yes |
| 104 |
-@@ -1553,7 +1553,7 @@ |
| 105 |
- extra_options="${extra_options} linux-android.opt" |
| 106 |
- # Assume modern glibc if not targeting Android nor uclibc. |
| 107 |
- case ${target} in |
| 108 |
-- *-*-*android*|*-*-*uclibc*) |
| 109 |
-+ *-*-*android*|*-*-*uclibc*|*-*-*musl*) |
| 110 |
- ;; |
| 111 |
- *) |
| 112 |
- default_gnu_indirect_function=yes |
| 113 |
diff -Naur gcc-6.2.0.orig/libgcc/config/i386/cpuinfo.c gcc-6.2.0/libgcc/config/i386/cpuinfo.c |
| 114 |
--- gcc-6.2.0.orig/libgcc/config/i386/cpuinfo.c 2016-12-24 15:55:15.817270911 -0800 |
| 115 |
+++ gcc-6.2.0/libgcc/config/i386/cpuinfo.c 2016-12-24 15:57:05.399320163 -0800 |
| 116 |
|
| 117 |
diff --git a/sys-devel/gcc/files/6.3.0/musl.patch b/sys-devel/gcc/files/6.3.0/musl.patch |
| 118 |
index 03a5dc2..2d56a5c 100644 |
| 119 |
--- a/sys-devel/gcc/files/6.3.0/musl.patch |
| 120 |
+++ b/sys-devel/gcc/files/6.3.0/musl.patch |
| 121 |
@@ -1,19 +1,3 @@ |
| 122 |
-diff -Naur gcc-6.2.0.orig/gcc/config/i386/i386.c gcc-6.2.0/gcc/config/i386/i386.c |
| 123 |
---- gcc-6.2.0.orig/gcc/config/i386/i386.c 2016-12-24 15:55:23.355343088 -0800 |
| 124 |
-+++ gcc-6.2.0/gcc/config/i386/i386.c 2016-12-24 15:55:58.718681693 -0800 |
| 125 |
-@@ -40325,10 +40325,10 @@ |
| 126 |
- { |
| 127 |
- case IX86_BUILTIN_CPU_INIT: |
| 128 |
- { |
| 129 |
-- /* Make it call __cpu_indicator_init in libgcc. */ |
| 130 |
-+ /* Make it call __cpu_indicator_init_local in libgcc. */ |
| 131 |
- tree call_expr, fndecl, type; |
| 132 |
- type = build_function_type_list (integer_type_node, NULL_TREE); |
| 133 |
-- fndecl = build_fn_decl ("__cpu_indicator_init", type); |
| 134 |
-+ fndecl = build_fn_decl ("__cpu_indicator_init_local", type); |
| 135 |
- call_expr = build_call_expr (fndecl, 0); |
| 136 |
- return expand_expr (call_expr, target, mode, EXPAND_NORMAL); |
| 137 |
- } |
| 138 |
diff -Naur gcc-6.2.0.orig/gcc/config/linux.c gcc-6.2.0/gcc/config/linux.c |
| 139 |
--- gcc-6.2.0.orig/gcc/config/linux.c 2016-12-24 15:55:23.308342638 -0800 |
| 140 |
+++ gcc-6.2.0/gcc/config/linux.c 2016-12-24 16:00:51.852488459 -0800 |
| 141 |
@@ -47,17 +31,3 @@ diff -Naur gcc-6.2.0.orig/gcc/config.gcc gcc-6.2.0/gcc/config.gcc |
| 142 |
;; |
| 143 |
*) |
| 144 |
default_gnu_indirect_function=yes |
| 145 |
-diff -Naur gcc-6.2.0.orig/libgcc/config/i386/cpuinfo.c gcc-6.2.0/libgcc/config/i386/cpuinfo.c |
| 146 |
---- gcc-6.2.0.orig/libgcc/config/i386/cpuinfo.c 2016-12-24 15:55:15.817270911 -0800 |
| 147 |
-+++ gcc-6.2.0/libgcc/config/i386/cpuinfo.c 2016-12-24 15:57:05.399320163 -0800 |
| 148 |
-@@ -485,7 +485,7 @@ |
| 149 |
- return 0; |
| 150 |
- } |
| 151 |
- |
| 152 |
--#if defined SHARED && defined USE_ELF_SYMVER |
| 153 |
--__asm__ (".symver __cpu_indicator_init, __cpu_indicator_init@GCC_4.8.0"); |
| 154 |
--__asm__ (".symver __cpu_model, __cpu_model@GCC_4.8.0"); |
| 155 |
-+#ifndef SHARED |
| 156 |
-+int __cpu_indicator_init_local (void) |
| 157 |
-+ __attribute__ ((weak, alias ("__cpu_indicator_init"))); |
| 158 |
- #endif |
| 159 |
|
| 160 |
diff --git a/sys-devel/gcc/files/7.1.0/posix_memalign.patch b/sys-devel/gcc/files/7.1.0/posix_memalign.patch |
| 161 |
new file mode 100644 |
| 162 |
index 0000000..eb198e7 |
| 163 |
--- /dev/null |
| 164 |
+++ b/sys-devel/gcc/files/7.1.0/posix_memalign.patch |
| 165 |
@@ -0,0 +1,29 @@ |
| 166 |
+diff -Naur gcc-7.1.0.orig/gcc/config/i386/pmm_malloc.h gcc-7.1.0/gcc/config/i386/pmm_malloc.h |
| 167 |
+--- gcc-7.1.0.orig/gcc/config/i386/pmm_malloc.h 2017-01-01 04:07:43.000000000 -0800 |
| 168 |
++++ gcc-7.1.0/gcc/config/i386/pmm_malloc.h 2017-05-07 11:35:22.878398460 -0700 |
| 169 |
+@@ -27,12 +27,13 @@ |
| 170 |
+ #include <stdlib.h> |
| 171 |
+ |
| 172 |
+ /* We can't depend on <stdlib.h> since the prototype of posix_memalign |
| 173 |
+- may not be visible. */ |
| 174 |
++ may not be visible and we can't pollute the namespace either. */ |
| 175 |
+ #ifndef __cplusplus |
| 176 |
+-extern int posix_memalign (void **, size_t, size_t); |
| 177 |
++extern int __gcc_posix_memalign (void **, size_t, size_t); |
| 178 |
+ #else |
| 179 |
+-extern "C" int posix_memalign (void **, size_t, size_t) throw (); |
| 180 |
++extern "C" int __gcc_posix_memalign (void **, size_t, size_t) throw (); |
| 181 |
+ #endif |
| 182 |
++__asm__("posix_memalign"); |
| 183 |
+ |
| 184 |
+ static __inline void * |
| 185 |
+ _mm_malloc (size_t __size, size_t __alignment) |
| 186 |
+@@ -42,7 +43,7 @@ |
| 187 |
+ return malloc (__size); |
| 188 |
+ if (__alignment == 2 || (sizeof (void *) == 8 && __alignment == 4)) |
| 189 |
+ __alignment = sizeof (void *); |
| 190 |
+- if (posix_memalign (&__ptr, __alignment, __size) == 0) |
| 191 |
++ if (__gcc_posix_memalign (&__ptr, __alignment, __size) == 0) |
| 192 |
+ return __ptr; |
| 193 |
+ else |
| 194 |
+ return NULL; |
| 195 |
|
| 196 |
diff --git a/sys-devel/gcc/gcc-6.3.0.ebuild b/sys-devel/gcc/gcc-6.3.0.ebuild |
| 197 |
index 3cbe2bc..f7e78f9 100644 |
| 198 |
--- a/sys-devel/gcc/gcc-6.3.0.ebuild |
| 199 |
+++ b/sys-devel/gcc/gcc-6.3.0.ebuild |
| 200 |
@@ -26,6 +26,7 @@ src_prepare() { |
| 201 |
epatch "${FILESDIR}"/4.9.4/boehm_gc.patch |
| 202 |
epatch "${FILESDIR}"/4.9.4/posix_memalign.patch |
| 203 |
epatch "${FILESDIR}"/5.4.0/cilkrts.patch |
| 204 |
+ epatch "${FILESDIR}"/6.3.0/cpu_indicator.patch |
| 205 |
epatch "${FILESDIR}"/6.3.0/musl.patch |
| 206 |
fi |
| 207 |
} |
| 208 |
|
| 209 |
diff --git a/sys-devel/gcc/gcc-6.3.0.ebuild b/sys-devel/gcc/gcc-7.1.0.ebuild |
| 210 |
similarity index 61% |
| 211 |
copy from sys-devel/gcc/gcc-6.3.0.ebuild |
| 212 |
copy to sys-devel/gcc/gcc-7.1.0.ebuild |
| 213 |
index 3cbe2bc..2c310d9 100644 |
| 214 |
--- a/sys-devel/gcc/gcc-6.3.0.ebuild |
| 215 |
+++ b/sys-devel/gcc/gcc-7.1.0.ebuild |
| 216 |
@@ -1,14 +1,14 @@ |
| 217 |
# Copyright 1999-2017 Gentoo Foundation |
| 218 |
# Distributed under the terms of the GNU General Public License v2 |
| 219 |
|
| 220 |
-EAPI="4" |
| 221 |
+EAPI="5" |
| 222 |
|
| 223 |
PATCH_VER="1.0" |
| 224 |
#UCLIBC_VER="1.0" |
| 225 |
|
| 226 |
inherit epatch toolchain |
| 227 |
|
| 228 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" |
| 229 |
+KEYWORDS="" |
| 230 |
|
| 231 |
RDEPEND="" |
| 232 |
DEPEND="${RDEPEND} |
| 233 |
@@ -23,9 +23,7 @@ src_prepare() { |
| 234 |
toolchain_src_prepare |
| 235 |
|
| 236 |
if use elibc_musl || [[ ${CATEGORY} = cross-*-musl ]]; then |
| 237 |
- epatch "${FILESDIR}"/4.9.4/boehm_gc.patch |
| 238 |
- epatch "${FILESDIR}"/4.9.4/posix_memalign.patch |
| 239 |
- epatch "${FILESDIR}"/5.4.0/cilkrts.patch |
| 240 |
- epatch "${FILESDIR}"/6.3.0/musl.patch |
| 241 |
+ epatch "${FILESDIR}"/6.3.0/cpu_indicator.patch |
| 242 |
+ epatch "${FILESDIR}"/7.1.0/posix_memalign.patch |
| 243 |
fi |
| 244 |
} |
Archives