commit: 25ad860eaaae3690dd43b6b7e59ceb86d8cee884 Author: Felix Janda <felix.janda <AT> posteo <DOT> de> AuthorDate: Mon Jan 25 22:17:14 2016 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Mon Jan 25 22:40:35 2016 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=25ad860e
sys-devel/gcc-4.9.3-r999: Use musl-gcc-patches Patches taken from https://github.com/GregorR/musl-gcc-patches/tree/gcc-4.9.3 sys-devel/gcc/Manifest | 18 ++ .../gcc/files/musl-gcc-patches-4.9.3/aarch64.diff | 12 ++ .../gcc/files/musl-gcc-patches-4.9.3/arm.diff | 46 +++++ .../musl-gcc-patches-4.9.3/gcc-autoconf-musl.diff | 62 ++++++ .../musl-gcc-patches-4.9.3/gcc-config-musl.diff | 207 +++++++++++++++++++++ .../gcc/files/musl-gcc-patches-4.9.3/gcc-ssp.diff | 12 ++ .../files/musl-gcc-patches-4.9.3/gomp-posix.diff | 16 ++ .../gcc/files/musl-gcc-patches-4.9.3/gthread.diff | 16 ++ .../musl-gcc-patches-4.9.3/kill-fixincludes.diff | 17 ++ .../musl-gcc-patches-4.9.3/libstdc++-generic.diff | 31 +++ .../musl-gcc-patches-4.9.3/microblaze-size_t.diff | 39 ++++ .../files/musl-gcc-patches-4.9.3/microblaze.diff | 31 +++ .../gcc/files/musl-gcc-patches-4.9.3/mips.diff | 18 ++ .../gcc/files/musl-gcc-patches-4.9.3/powerpc.diff | 108 +++++++++++ sys-devel/gcc/files/musl-gcc-patches-4.9.3/sh.diff | 18 ++ .../musl-gcc-patches-4.9.3/unwind-dliterate.diff | 43 +++++ .../gcc/files/musl-gcc-patches-4.9.3/vis_hide.diff | 15 ++ .../gcc/files/musl-gcc-patches-4.9.3/x86.diff | 55 ++++++ sys-devel/gcc/gcc-4.9.3-r999.ebuild | 61 ++++++ 19 files changed, 825 insertions(+) diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index 245ca2d..bf65c5c 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -19,6 +19,23 @@ AUX gcc-configure-texinfo.patch 337 SHA256 74b73a7ecec2d88889876b4db480cd173632f AUX gcc-spec-env-r1.patch 3148 SHA256 da0a6442eb42bce58cbdc7858b110a2e65fc5bd5b4b780b9b491033de6e302fa SHA512 ecae71577543772cfe1711f1b4a8815c0b5d706ebd01edacd1f07586637d4805e25771f970a6e6d1bb696d4b1b5ef3e0036088a96a9f6beff7ddaee704175d16 WHIRLPOOL 3535605998eabccdee71ba396ed5cefbb8b0a8cb073101f6444c7d01233f3b3904c1b29f4daf0a3417c68de8dbd62a0b7dc367cacfcbfa0c4ee1b69b7df8c6fb AUX gcc-spec-env.patch 1544 SHA256 64b01f29fb853fee5ecda998b66eeaa7ec86ff1fc3b21432bfd69eb543c93e6a SHA512 ce9c1f923e2c6d17347ec2d3d8482351a9644194b2753627389294d43bb4f11b9c2ef41eda1b46ad83d09901a0bedebd5b6b8a57a198646030ab61e8d2d8cb48 WHIRLPOOL b88c9c18e20868b3ff535c3390408ebe8f1304bcec6e70b6472781f684671265860dff4335f2301d3b4d3b73395283b29673f0f5da62414e1094cfcb8130e8d8 AUX mkinfodir 7324 SHA256 0565353e767e253207adb8b5c9be9ba215a628447e075a4dc7bb3183ed099d2a SHA512 a05f9130d98e4cb4d3254b757de06d772d0a965ac4b5a9a15082b1cb694a2fd32c9c8f550745a9423ba3cfdd1c5e87b6d568a809301772a24cc6e1a414d5f98b WHIRLPOOL 4001ae3f7fb666a84e12432a1a41eacf62ebf922181c279e4d06dad32e44d0b499d13e098e794fdd19a9cff5c438a28e5e9e125fb78e72bb913fa5ddd8e44bae +AUX musl-gcc-patches-4.9.3/aarch64.diff 447 SHA256 73acdb1aaec6874236ae23a3283c55ed7675f32d5561f583bab9315b3c85dab7 SHA512 748de2e03e7974b89e0201f1908b3825192ac8d7a2fbe7f5390cb663cee22aa3776162e30e6abd8d7203ad772d2186ff67adf20e9618a1bdda2f25a671cfe4af WHIRLPOOL 50f548b344c33bfbc186fbbd1b385cbbd2651cad07bc531f387b109db736a9f2a293614697aaee6e98a3c21f0a709c9d93b1e4f50c56cca138775514892f354f +AUX musl-gcc-patches-4.9.3/arm.diff 1682 SHA256 872312775232ae0e35a94631f67a3163db4e0767206a103ad42edf6b4ca1ed84 SHA512 743f5118c2bc083214cea40f24e641ec31354cafe792c5244a2a8305eafabb88efe03a55c275d69c93073a4dd9cfff82d81ab68bea6faa2da326dbba0644063c WHIRLPOOL a94b6249d24a3e15f7bb450f9405ca6e8f2ae9f2135f2df494454168b8cb6d4a3ba644f9d1014aecc0c8c1db418671ef5e48eb2c942307911a975f376167b05c +AUX musl-gcc-patches-4.9.3/gcc-autoconf-musl.diff 2361 SHA256 0b49f18b67a91d809d26b2dab187ae196000549d3837382cf6f70ef605360fcd SHA512 0b7351361a947448e4aa3d022e317523c8cce3f69691e78fae5fb6941d410622d44fb3ade9d8a0ee06fa2212e9fc0abf2b86470592e92dca41d312bf320c07c6 WHIRLPOOL 45dcf5bf5c8a40b7fb1e83d54b4731d834c6fde59a7d6613b7af26e6a8c6ff15b302f9f2f786a0de42a30b34f2271c5c99634a0fecc55118e5513bd199d50559 +AUX musl-gcc-patches-4.9.3/gcc-config-musl.diff 7556 SHA256 e16706a9344c2db7a1c14ab0f46cbac6368546d655cc9bdee05aa1fd041529da SHA512 812d23df546cdeaa46eb238a9e2e16933f971e964a8805d951c232a38198184be8c34a38a75d483dfb1c84c4d8533027cb5a718e4bb1f069499677dd8fe6ba2b WHIRLPOOL 71a5fc894ffc82556924409355f35459cbdec8584240763dc39d95529794c6bb6b30821079f32e401eb3bf622df9afbebabf79fb59c3e22f992260f68855fcc3 +AUX musl-gcc-patches-4.9.3/gcc-ssp.diff 458 SHA256 8aa53a7e81f512ab6a85cca6c421cc24f89894376814ec4150231e63192b52d5 SHA512 0b106c9c31aec38e24e0003a0db2c096d54d115ad166d9e53b780b8e3d7b1c02123a49ad87dc5625da5550eb7a3c59244f88f055afa1c95316eaa0706bad22f6 WHIRLPOOL 44ff33bd0c2a85c20e7eff5bed196dd8527069f8dae35d3d48bb2002153cf7f9233e2751d002c9fd712b4e323343cbf8731dfdce058a27a4e09d2f91e737ee69 +AUX musl-gcc-patches-4.9.3/gomp-posix.diff 592 SHA256 f93abc2a09010a7875e622718c65689169b48bb80dbaadda695c4e916939584c SHA512 6370ddb8666822589c77d44ee281e46dbcb64198cf2ab147f25e2fad26a91fd3b27755c88c5aec9b8250195bce2b27d64cf8b1f240b338aa82dbce1a810629ef WHIRLPOOL f50a8ecd55dea2046db22d7508d2b8516cdf2b8c6b16bbc51525b4c19204787928cfc91e414eb8cd2babe75b0c07e02e48ad10ff0e4e116bd2814e924b58b51b +AUX musl-gcc-patches-4.9.3/gthread.diff 589 SHA256 9854b80d6b4854f48438f6784e86411fbc607763a6be80faae5a36c508c3cf9e SHA512 74f9138383d91eafb8b69949773c3ed90fb57c0c718a02319d37b495b10fffeb8855254317f7645a81a8cb597aedae64140aafc2411701b4a22427910d0cc498 WHIRLPOOL 85f577f67556d4ea5d154ab8455c59cf8ece4e1f397d6d49c6fbe5b70929b64c631bc1c79622da27d474841957c854c206539fd3e57f74060ebd7bf1de7614dc +AUX musl-gcc-patches-4.9.3/kill-fixincludes.diff 581 SHA256 11867bcc7d87f4a9c971bacbaf45f4bedd944ff906ab0f719a097234a200fba2 SHA512 63367cce74ab5ebb4edf12bf42c2b8d58134ecabea76b4c43d6c96f66870e23ee061ac0d400ea5b20926a2e73994b44ca4efcd1f83350aa580abd6f9d339fa84 WHIRLPOOL fcccd3a88aad33d040b3b52410675e11f5c1215cc759a78a817397f2c24f931d68bc6528adf3edd8dfc6a99202e9b362c269c99a04c518eed57d1751f6c4ae7c +AUX musl-gcc-patches-4.9.3/libstdc++-generic.diff 844 SHA256 fdf725758a79f037e733dec5cbd9197fb0f3e4484ad7772bba4f7253c114445d SHA512 1950a6dd56478993fbb70004109e617e2336453aff342b8acad02e7f2b5309abd039f6bc0f22f4f6c3b698b6dac8ef87d59dea5e3396549276ba39d43293d106 WHIRLPOOL 86f8246d6989902b863af3e98432c3a864983dbb93671c7483ae6b56bc5cde01d848f9b776d4ade5ebd766b3308516a3458cec864a97c5d5b053461e9c1d2de5 +AUX musl-gcc-patches-4.9.3/microblaze-size_t.diff 1212 SHA256 aa02035986df8eb0f9c13c1ba17ec9695a92af2e758901fb87487eebb046860e SHA512 0864f69ed2fd9ceaf89547c4493d8a28cefd141b6d85b3c9c128f21f37b4298dc6ba434d02bc996bcefd0d22edd6d616ac8b0401c1c3af9d192c12bd3ea93b1d WHIRLPOOL bdd4a960b7da86f12ea23b1d317a6be492e3266fd3940901458d113e76f11397278cd03b1ac4e74505f3a68f17e2e9d9c7e2bf97a9a427f2dfdd45cdef04dbb0 +AUX musl-gcc-patches-4.9.3/microblaze.diff 915 SHA256 226db10b3b061c5ca02bb28b3d86715091571ab452dc1caa43ba631e5c831c51 SHA512 38bb2c4f041ec161f98ef6bf2d7639f54f26d446a40085be65d2ec693b2f15adcfb6318a47e317d440c9438fcce5018cb994cdb233c8ab982f754b0f9a7d61ec WHIRLPOOL f2d6303fff299fd90ccc6f2514e74753cde819e7879940efbe16a1d8ead5ccdd8ad1d54b3678731bdfdb66a4ef2cf8a07f3bc5ee5121a3115325f9d5fbff64fb +AUX musl-gcc-patches-4.9.3/mips.diff 657 SHA256 796add26a4e0b097112f775660649c9c408d60d334a952716142091d8ade3db0 SHA512 6bca1fc5b9194ca19396979cb18177f90f67e9a3a1302e87c1ba20fb96c8bd5b7ad8ca6c187e93f2497614501b559244277fb4bed9ccd2a8a7c5570e69be1a24 WHIRLPOOL 7dd1cde4fc535b40b1afc4403da4bce6f1b8a8470dabd579fa46e757e0e44ecda99ca64cbea5d8d0178e4fa0d81703c676ad0d8c360ee17e8fb54e0a81a758b9 +AUX musl-gcc-patches-4.9.3/powerpc.diff 4563 SHA256 afa7fb6ac04c09b59fabc22c1af5aeddecab5881646ea85063acb57e56001b50 SHA512 aafb985debb98fb8709a7d30a9faff467ffce4601807f39de97ee72fc737484b1ddae3cec74a7472f008f5e07902e886afcbbd2e56a8209fe5ec37e7b4523c1c WHIRLPOOL 380a7d6ebf37a59af3f886becd6844f62e49ee53faaa29cce79b30114685260e23cc4a07b5889388a77ba809239ad50e71ae50d1ddff3cb99ce7708c3f5cf5cd +AUX musl-gcc-patches-4.9.3/sh.diff 576 SHA256 369210878352a296ec152a569b4f2e5eb48f59853b80779cda33f9c7c2b6c559 SHA512 1a762db4a44638a5d969e36a3b614dc2e60c9d1c04479507958ba545fc46bc1451088d27827fc8724159563a611159e9aa1b1db06558563d8bac945cbd444d31 WHIRLPOOL 58f60e5a268664bb16ed644f845cc63264521e3d6a2d01bda0e272c7a6eb7a035d0e52fb4d61ef056703640f107789b0afb490dc5ecde7a64c5ce0d322e53a65 +AUX musl-gcc-patches-4.9.3/unwind-dliterate.diff 1413 SHA256 ee74aee3d7638ba228f8de410220f8aee4397e814c8871929ba0a6200c663920 SHA512 9993b2492eed96030fee231417178e27d600ae05d2e8d63adf87464938c11484754ea2f061c3059c0742a7cdef6ec7a234d7e10100b800b8964e758ef9d0ff9d WHIRLPOOL 9afe6a6a642e1344ac6f0ffd4840eda2f9425d86ef50fd8a36b051feff7c8442f11a81e584f75e5724a84e6ba3578ca042f8e9a4579b802c6bec8dbe65df7abc +AUX musl-gcc-patches-4.9.3/vis_hide.diff 578 SHA256 0c315644cfc4802c01ac60dab08cbf9ac5fb313335c78d15c818cea0de60ee1d SHA512 91aa840673c25345775907cbf64ad5494751e07069d30a19c887f976615ee61c2e05e8077879d108d4ff42963d62edc0a861c182ceeb25475c45a7fda6d148d4 WHIRLPOOL 6f9529a14da37ab5c824bef439b1060c2c31cb1fcd468a850462d64ee151e82e11c146f84f7ea514b3e4b8f5485d960e6eb88c266e028de473563d77b2738af2 +AUX musl-gcc-patches-4.9.3/x86.diff 1869 SHA256 35363d0f34d81a4071abc88d0652b64b284c5dcbcd79eefe5c304be1a3b3327b SHA512 d7c3efcf9debc2f45bf5332f90da5a0dd1ed8c937326410d9f7537c8f19f7fab054d9a5e6023dd0cc2d3851a440f28e1243c9ef827f98953186b3eba64fdf3f6 WHIRLPOOL fad408e204b8afefec4dad0ba646b91bca143b8ddf3ed173376c959ddf47db9473879f42bf5fcd346a4a6b06610addafa64ae6b565f2b1df689acba539164e52 DIST ecj-4.5.jar 1470676 SHA256 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e WHIRLPOOL db54206cfd5eba935e707b8d36ebac40f3c4ed3c1f06ede794288cbdd9c7da9d90c0898e8c98b383af276ea4c1b40c861ebd9e1fc1dce712946184321339d3ad DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 SHA256 f6c7cb99beead66dd4d06f7004c5731a9360330cbe878ce79792c618e008eed2 SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517 WHIRLPOOL 8a1e45aad9d306cb19de93c63b5854a97e629d90852feb6861dcfca042b6257705304fc13ad65655a4cb227d36b83fc6063648c94f270821574ee0e85307094e DIST gcc-4.7.4-patches-1.4.tar.bz2 18072 SHA256 cef0f9d5624fd583eddffe060fb882e2e3b7ed43e517e03df7b3472189237327 SHA512 9f5d68ba62aee909023542dcece81e4e448ea750254258107d4f70291d8ae99469c4518e42ffddbe6b622b258f463127be6e6ef7eaaeeeb0f59b3b719f3eadca WHIRLPOOL a5d76b577615de7a472f591bc031552f7b3e4dec7fb58385709235d763d416f47c2fa8ff4c73531ad023ee50dfd25b1e0c1752dbdca4ae19f736cc79428d63bd @@ -37,4 +54,5 @@ EBUILD gcc-4.7.4-r99.ebuild 2071 SHA256 f377102a20f4fa18305855de53b66e1b27af2e96 EBUILD gcc-4.8.5-r99.ebuild 2139 SHA256 4531cbe9549980d5df32bd76395dc874b8769a11621cbd39d2a2f28446b90284 SHA512 f23df7053432618579fbd40805f20cb2a6c3e853a50a942b1aff368f15f8b320206b5c32933ba1350382aef77c99570edfa1657d4631aaf17994bf71db340212 WHIRLPOOL 80f3f23614619d25caa013ea88d09cb1c722aea9d17cc9e6b139ae41ed8a84d9f73947911ae540be2da27140a19df5e237cd94ba2c112cc73ba2dd1392c54cec EBUILD gcc-4.8.5-r999.ebuild 2185 SHA256 979287614b304df1054bd5ce0f296f6ee1e7d7ed0cd8299d3810a379757d2145 SHA512 c12b551ecbe7e2ae29d19608b8c64fdbc3fc4cb6ac2fb8f95ec2f1a5a52f3dd89b7f3496375c4f22ff9fc4ac80a6503645d6cb7e045a8e6c6dd07278350b4c31 WHIRLPOOL 9616615a24bf1bbbf72e01d008c8b7635e77d8489a049e455e1cb167ae117926bf6284df220bbad7e253be7e62a5ecc09e3c31c189d6f3a6f568bd0654126806 EBUILD gcc-4.9.3-r99.ebuild 2195 SHA256 6bbc9fb6e85d1cec054602a3af368f8b10c2f5ca8f7ddbdc17e07663283d5aa4 SHA512 934b06b2f421af49848f2cfc29e89c0f97f9e5a49d538313d8801c86c1da1871a294beefbb797681db010cfef788747ac75a9aee3e1091e6bd2d10465142569f WHIRLPOOL 5a1411b68a50d84e5878874a97126f9fd3c3b9fab58610687f3b035ce5102af7e6655e6ad549269f884c0c076a342dff299cbd40fa7d15bb0fc4bd04b7712f91 +EBUILD gcc-4.9.3-r999.ebuild 1811 SHA256 aa935c1b0e41f6a7702cd7fcb65382d28f2c8d4ea83bc61f3239c29a7b834a48 SHA512 57e415433751b70f12490c96ca91dc91790f201d4260d4f950577e7805e9ef20d1cc239fddb052fc79c84cfc794baf41af0714199a96c6bfe777bd2dd3158ab3 WHIRLPOOL 065aa638796935c3f4939b11b5cab0e0002133f3570d6b7ec160d6615627b959e502e9fc22879ea4791eb95f21fd919cb82a41e9bfda8c4dec2fb78b8340d1aa MISC metadata.xml 1910 SHA256 2f6c2f19316b90d4b829aab2dd6fb66319c158c0955e81533aba54b6c1af00d8 SHA512 b5144578028c73be85bff609538399e832a7205aba451374973b640f83c1e9fa6a6684bb6c26043912ad649e6ea3e4115621b9a84b157399d13027a1f514f947 WHIRLPOOL 29e0ec175732d52d13345d22ae73711b394af62eb852e0a997b6a656834ad60e6be5fdf27ba174ed75310912dd730950be7966e7a8ca038f9f5686744ccef888 diff --git a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/aarch64.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/aarch64.diff new file mode 100644 index 0000000..90eb4fa --- /dev/null +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/aarch64.diff @@ -0,0 +1,12 @@ +diff -r 7c6d89fb1832 gcc/config/aarch64/aarch64-linux.h +--- a/gcc/config/aarch64/aarch64-linux.h Sun Jul 26 15:32:28 2015 -0400 ++++ b/gcc/config/aarch64/aarch64-linux.h Sun Jul 26 15:32:30 2015 -0400 +@@ -23,6 +23,8 @@ + + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}.so.1" + ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64.so.1" ++ + #define CPP_SPEC "%{pthread:-D_REENTRANT}" + + #define LINUX_TARGET_LINK_SPEC "%{h*} \ diff --git a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/arm.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/arm.diff new file mode 100644 index 0000000..777e0f6 --- /dev/null +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/arm.diff @@ -0,0 +1,46 @@ +# HG changeset patch +# Parent 92d83561106d17ca896328fcb4ec36cd4e2e9e16 +Support for arm-linux-musl. + +diff -r 92d83561106d gcc/config/arm/linux-eabi.h +--- a/gcc/config/arm/linux-eabi.h Sun Jul 26 15:32:23 2015 -0400 ++++ b/gcc/config/arm/linux-eabi.h Sun Jul 26 15:32:25 2015 -0400 +@@ -77,6 +77,23 @@ + %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \ + %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}" + ++/* For ARM musl currently supports four dynamic linkers: ++ - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI ++ - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI ++ - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB ++ - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB ++ musl does not support the legacy OABI mode. ++ All the dynamic linkers live in /lib. ++ We default to soft-float, EL. */ ++#undef MUSL_DYNAMIC_LINKER ++#if TARGET_BIG_ENDIAN_DEFAULT ++#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}" ++#else ++#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}" ++#endif ++#define MUSL_DYNAMIC_LINKER \ ++ "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1" ++ + /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to + use the GNU/Linux version, not the generic BPABI version. */ + #undef LINK_SPEC +diff -r 92d83561106d libitm/config/arm/hwcap.cc +--- a/libitm/config/arm/hwcap.cc Sun Jul 26 15:32:23 2015 -0400 ++++ b/libitm/config/arm/hwcap.cc Sun Jul 26 15:32:25 2015 -0400 +@@ -40,7 +40,11 @@ + + #ifdef __linux__ + #include <unistd.h> ++#ifdef __GLIBC__ + #include <sys/fcntl.h> ++#else ++#include <fcntl.h> ++#endif + #include <elf.h> + + static void __attribute__((constructor)) diff --git a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gcc-autoconf-musl.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gcc-autoconf-musl.diff new file mode 100644 index 0000000..dba0077 --- /dev/null +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gcc-autoconf-musl.diff @@ -0,0 +1,62 @@ +diff -r 3baeaed6c155 gcc/configure +--- a/gcc/configure Sun Jul 26 15:32:15 2015 -0400 ++++ b/gcc/configure Sun Jul 26 15:32:17 2015 -0400 +@@ -27449,6 +27449,9 @@ + else + gcc_cv_libc_provides_ssp=no + case "$target" in ++ *-*-musl*) ++ # All versions of musl provide stack protector ++ gcc_cv_libc_provides_ssp=yes;; + *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu) + # glibc 2.4 and later provides __stack_chk_fail and + # either __stack_chk_guard, or TLS access to stack guard canary. +@@ -27481,6 +27484,7 @@ + # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now + # simply assert that glibc does provide this, which is true for all + # realistically usable GNU/Hurd configurations. ++ # All supported versions of musl provide it as well + gcc_cv_libc_provides_ssp=yes;; + *-*-darwin* | *-*-freebsd*) + ac_fn_c_check_func "$LINENO" "__stack_chk_fail" "ac_cv_func___stack_chk_fail" +@@ -27570,6 +27574,9 @@ + gcc_cv_target_dl_iterate_phdr=no + fi + ;; ++ *-linux-musl*) ++ gcc_cv_target_dl_iterate_phdr=yes ++ ;; + esac + + if test x$gcc_cv_target_dl_iterate_phdr = xyes; then +diff -r 3baeaed6c155 gcc/configure.ac +--- a/gcc/configure.ac Sun Jul 26 15:32:15 2015 -0400 ++++ b/gcc/configure.ac Sun Jul 26 15:32:17 2015 -0400 +@@ -5076,6 +5076,9 @@ + gcc_cv_libc_provides_ssp, + [gcc_cv_libc_provides_ssp=no + case "$target" in ++ *-*-musl*) ++ # All versions of musl provide stack protector ++ gcc_cv_libc_provides_ssp=yes;; + *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu) + # glibc 2.4 and later provides __stack_chk_fail and + # either __stack_chk_guard, or TLS access to stack guard canary. +@@ -5102,6 +5105,7 @@ + # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now + # simply assert that glibc does provide this, which is true for all + # realistically usable GNU/Hurd configurations. ++ # All supported versions of musl provide it as well + gcc_cv_libc_provides_ssp=yes;; + *-*-darwin* | *-*-freebsd*) + AC_CHECK_FUNC(__stack_chk_fail,[gcc_cv_libc_provides_ssp=yes], +@@ -5168,6 +5172,9 @@ + gcc_cv_target_dl_iterate_phdr=no + fi + ;; ++ *-linux-musl*) ++ gcc_cv_target_dl_iterate_phdr=yes ++ ;; + esac + GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR]) + if test x$gcc_cv_target_dl_iterate_phdr = xyes; then diff --git a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gcc-config-musl.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gcc-config-musl.diff new file mode 100644 index 0000000..e635573 --- /dev/null +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gcc-config-musl.diff @@ -0,0 +1,207 @@ +# HG changeset patch +# Parent fef9a6ed009159f294d8524a0bc1dda731990754 +Adding -mmusl as a musl libc specifier, and the necessary hacks for it to know how to find musl's dynamic linker. + +diff -r fef9a6ed0091 gcc/config.gcc +--- a/gcc/config.gcc Sun Jul 26 15:32:09 2015 -0400 ++++ b/gcc/config.gcc Sun Jul 26 15:32:11 2015 -0400 +@@ -594,7 +594,7 @@ + esac + + # Common C libraries. +-tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3" ++tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4" + + # 32-bit x86 processors supported by --with-arch=. Each processor + # MUST be separated by exactly one space. +@@ -719,6 +719,9 @@ + *-*-*uclibc*) + tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC" + ;; ++ *-*-*musl*) ++ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL" ++ ;; + *) + tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC" + ;; +diff -r fef9a6ed0091 gcc/config/linux.h +--- a/gcc/config/linux.h Sun Jul 26 15:32:09 2015 -0400 ++++ b/gcc/config/linux.h Sun Jul 26 15:32:11 2015 -0400 +@@ -32,10 +32,12 @@ + #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) + #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) + #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) ++#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL) + #else + #define OPTION_GLIBC (linux_libc == LIBC_GLIBC) + #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC) + #define OPTION_BIONIC (linux_libc == LIBC_BIONIC) ++#define OPTION_MUSL (linux_libc == LIBC_MUSL) + #endif + + #define GNU_USER_TARGET_OS_CPP_BUILTINS() \ +@@ -53,18 +55,21 @@ + uClibc or Bionic is the default C library and whether + -muclibc or -mglibc or -mbionic has been passed to change the default. */ + +-#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3) \ +- "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}" ++#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4) \ ++ "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}" + + #if DEFAULT_LIBC == LIBC_GLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ +- CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B) ++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ ++ CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M) + #elif DEFAULT_LIBC == LIBC_UCLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ +- CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B) ++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ ++ CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M) + #elif DEFAULT_LIBC == LIBC_BIONIC +-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ +- CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U) ++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ ++ CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M) ++#elif DEFAULT_LIBC == LIBC_MUSL ++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ ++ CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B) + #else + #error "Unsupported DEFAULT_LIBC" + #endif /* DEFAULT_LIBC */ +@@ -84,21 +89,92 @@ + + #define GNU_USER_DYNAMIC_LINKER \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \ +- BIONIC_DYNAMIC_LINKER) ++ BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) + #define GNU_USER_DYNAMIC_LINKER32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \ +- BIONIC_DYNAMIC_LINKER32) ++ BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) + #define GNU_USER_DYNAMIC_LINKER64 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \ +- BIONIC_DYNAMIC_LINKER64) ++ BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) + #define GNU_USER_DYNAMIC_LINKERX32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \ +- BIONIC_DYNAMIC_LINKERX32) ++ BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32) + + /* Whether we have Bionic libc runtime */ + #undef TARGET_HAS_BIONIC + #define TARGET_HAS_BIONIC (OPTION_BIONIC) + ++/* musl avoids problematic includes by rearranging the include directories. ++ * Unfortunately, this is mostly duplicated from cppdefault.c */ ++#if DEFAULT_LIBC == LIBC_MUSL ++#define INCLUDE_DEFAULTS_MUSL_GPP \ ++ { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, \ ++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, \ ++ { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, \ ++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, \ ++ { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, \ ++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, ++ ++#ifdef LOCAL_INCLUDE_DIR ++#define INCLUDE_DEFAULTS_MUSL_LOCAL \ ++ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, \ ++ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 }, ++#else ++#define INCLUDE_DEFAULTS_MUSL_LOCAL ++#endif ++ ++#ifdef PREFIX_INCLUDE_DIR ++#define INCLUDE_DEFAULTS_MUSL_PREFIX \ ++ { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0}, ++#else ++#define INCLUDE_DEFAULTS_MUSL_PREFIX ++#endif ++ ++#ifdef CROSS_INCLUDE_DIR ++#define INCLUDE_DEFAULTS_MUSL_CROSS \ ++ { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0}, ++#else ++#define INCLUDE_DEFAULTS_MUSL_CROSS ++#endif ++ ++#ifdef TOOL_INCLUDE_DIR ++#define INCLUDE_DEFAULTS_MUSL_TOOL \ ++ { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0}, ++#else ++#define INCLUDE_DEFAULTS_MUSL_TOOL ++#endif ++ ++#ifdef NATIVE_SYSTEM_HEADER_DIR ++#define INCLUDE_DEFAULTS_MUSL_NATIVE \ ++ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \ ++ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 }, ++#else ++#define INCLUDE_DEFAULTS_MUSL_NATIVE ++#endif ++ ++#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT) ++# undef INCLUDE_DEFAULTS_MUSL_LOCAL ++# define INCLUDE_DEFAULTS_MUSL_LOCAL ++# undef INCLUDE_DEFAULTS_MUSL_NATIVE ++# define INCLUDE_DEFAULTS_MUSL_NATIVE ++#else ++# undef INCLUDE_DEFAULTS_MUSL_CROSS ++# define INCLUDE_DEFAULTS_MUSL_CROSS ++#endif ++ ++#undef INCLUDE_DEFAULTS ++#define INCLUDE_DEFAULTS \ ++ { \ ++ INCLUDE_DEFAULTS_MUSL_GPP \ ++ INCLUDE_DEFAULTS_MUSL_PREFIX \ ++ INCLUDE_DEFAULTS_MUSL_CROSS \ ++ INCLUDE_DEFAULTS_MUSL_TOOL \ ++ INCLUDE_DEFAULTS_MUSL_NATIVE \ ++ { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ ++ { 0, 0, 0, 0, 0, 0 } \ ++ } ++#endif ++ + #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */ + /* This is a *uclinux* target. We don't define below macros to normal linux + versions, because doing so would require *uclinux* targets to include +diff -r fef9a6ed0091 gcc/config/linux.opt +--- a/gcc/config/linux.opt Sun Jul 26 15:32:09 2015 -0400 ++++ b/gcc/config/linux.opt Sun Jul 26 15:32:11 2015 -0400 +@@ -30,3 +30,7 @@ + muclibc + Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic) + Use uClibc C library ++ ++mmusl ++Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc) ++Use musl C library +diff -r fef9a6ed0091 gcc/ginclude/stddef.h +--- a/gcc/ginclude/stddef.h Sun Jul 26 15:32:09 2015 -0400 ++++ b/gcc/ginclude/stddef.h Sun Jul 26 15:32:11 2015 -0400 +@@ -181,6 +181,7 @@ + #ifndef _GCC_SIZE_T + #ifndef _SIZET_ + #ifndef __size_t ++#ifndef __DEFINED_size_t /* musl */ + #define __size_t__ /* BeOS */ + #define __SIZE_T__ /* Cray Unicos/Mk */ + #define _SIZE_T +@@ -197,6 +198,7 @@ + #define ___int_size_t_h + #define _GCC_SIZE_T + #define _SIZET_ ++#define __DEFINED_size_t /* musl */ + #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \ + || defined(__FreeBSD_kernel__) + /* __size_t is a typedef on FreeBSD 5, must not trash it. */ +@@ -214,6 +216,7 @@ + typedef long ssize_t; + #endif /* __BEOS__ */ + #endif /* !(defined (__GNUG__) && defined (size_t)) */ ++#endif /* __DEFINED_size_t */ + #endif /* __size_t */ + #endif /* _SIZET_ */ + #endif /* _GCC_SIZE_T */ diff --git a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gcc-ssp.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gcc-ssp.diff new file mode 100644 index 0000000..7846623 --- /dev/null +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gcc-ssp.diff @@ -0,0 +1,12 @@ +diff -r 581c4dd64733 gcc/gcc.c +--- a/gcc/gcc.c Sun Jul 26 15:32:17 2015 -0400 ++++ b/gcc/gcc.c Sun Jul 26 15:32:19 2015 -0400 +@@ -670,7 +670,7 @@ + + #ifndef LINK_SSP_SPEC + #ifdef TARGET_LIBC_PROVIDES_SSP +-#define LINK_SSP_SPEC "%{fstack-protector:}" ++#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all:-lssp_nonshared}" + #else + #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-strong|fstack-protector-all:-lssp_nonshared -lssp}" + #endif diff --git a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gomp-posix.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gomp-posix.diff new file mode 100644 index 0000000..7b80fdf --- /dev/null +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gomp-posix.diff @@ -0,0 +1,16 @@ +# HG changeset patch +# Parent 47dcb1f7b3a9c1b5d6b9d56303e7603fbe5a51f9 +A fix for libgomp to correctly request a POSIX version for time support. + +diff -r 47dcb1f7b3a9 libgomp/config/posix/time.c +--- a/libgomp/config/posix/time.c Sun Jul 26 15:32:11 2015 -0400 ++++ b/libgomp/config/posix/time.c Sun Jul 26 15:32:13 2015 -0400 +@@ -28,6 +28,8 @@ + The following implementation uses the most simple POSIX routines. + If present, POSIX 4 clocks should be used instead. */ + ++#define _POSIX_C_SOURCE 199309L /* for clocks */ ++ + #include "libgomp.h" + #include <unistd.h> + #if TIME_WITH_SYS_TIME diff --git a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gthread.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gthread.diff new file mode 100644 index 0000000..af74e50 --- /dev/null +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gthread.diff @@ -0,0 +1,16 @@ +Do not use weak references on any targets for gthread. Necessary on musl, safe elsewhere. + +diff -r d2b373a6ad39 libgcc/gthr.h +--- a/libgcc/gthr.h Thu Jan 29 18:59:33 2015 -0500 ++++ b/libgcc/gthr.h Thu Jan 29 19:00:03 2015 -0500 +@@ -136,10 +136,8 @@ + /* The pe-coff weak support isn't fully compatible to ELF's weak. + For static libraries it might would work, but as we need to deal + with shared versions too, we disable it for mingw-targets. */ +-#ifdef __MINGW32__ + #undef GTHREAD_USE_WEAK + #define GTHREAD_USE_WEAK 0 +-#endif + + #ifndef GTHREAD_USE_WEAK + #define GTHREAD_USE_WEAK 1 diff --git a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/kill-fixincludes.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/kill-fixincludes.diff new file mode 100644 index 0000000..b8f8d0c --- /dev/null +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/kill-fixincludes.diff @@ -0,0 +1,17 @@ +# HG changeset patch +# Parent 9f2f4e02fced4d4810910db6cced26ed0d47c23f +Get rid of ever-broken fixincludes on musl. + +diff -r 9f2f4e02fced fixincludes/mkfixinc.sh +--- a/fixincludes/mkfixinc.sh Sun Jul 26 15:32:19 2015 -0400 ++++ b/fixincludes/mkfixinc.sh Sun Jul 26 15:32:21 2015 -0400 +@@ -19,7 +19,8 @@ + powerpc-*-eabi* | \ + powerpc-*-rtems* | \ + powerpcle-*-eabisim* | \ +- powerpcle-*-eabi* ) ++ powerpcle-*-eabi* | \ ++ *-musl* ) + # IF there is no include fixing, + # THEN create a no-op fixer and exit + (echo "#! /bin/sh" ; echo "exit 0" ) > ${target} diff --git a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/libstdc++-generic.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/libstdc++-generic.diff new file mode 100644 index 0000000..de7acff --- /dev/null +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/libstdc++-generic.diff @@ -0,0 +1,31 @@ +# HG changeset patch +# Parent 889b7d97216603795ba8c5f4da8e616bef8feb9d +Use the generic implementation of libstdc++ primitives when we're on musl, not the glibc one. + +diff -r 889b7d972166 libstdc++-v3/configure.host +--- a/libstdc++-v3/configure.host Sun Jul 26 15:30:11 2015 -0400 ++++ b/libstdc++-v3/configure.host Sun Jul 26 15:32:09 2015 -0400 +@@ -266,6 +266,13 @@ + os_include_dir="os/bsd/freebsd" + ;; + gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) ++ # check for musl by target ++ case "${host_os}" in ++ *-musl*) ++ os_include_dir="os/generic" ++ ;; ++ *) ++ + if [ "$uclibc" = "yes" ]; then + os_include_dir="os/uclibc" + elif [ "$bionic" = "yes" ]; then +@@ -274,6 +281,9 @@ + os_include_dir="os/gnu-linux" + fi + ;; ++ ++ esac ++ ;; + hpux*) + os_include_dir="os/hpux" + ;; diff --git a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/microblaze-size_t.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/microblaze-size_t.diff new file mode 100644 index 0000000..9ddc092 --- /dev/null +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/microblaze-size_t.diff @@ -0,0 +1,39 @@ +From 478ee0c03a08e2ef9371fd88d516738936943e78 Mon Sep 17 00:00:00 2001 +From: David Holsgrove <[email protected]> +Date: Fri, 28 Sep 2012 16:32:03 +1000 +Subject: [PATCH 06/11] [Patch, microblaze]: Add SIZE_TYPE and PTRDIFF_TYPE to + microblaze.h + +Fixes warnings like; + +warning: format '%zX' expects argument of type 'size_t', +but argument 3 has type 'unsigned int' [-Wformat] + +Changelog + +2013-03-18 David Holsgrove <[email protected]> + + * gcc/config/microblaze/microblaze.h: Define SIZE_TYPE + and PTRDIFF_TYPE. + +Signed-off-by: David Holsgrove <[email protected]> +--- + gcc/config/microblaze/microblaze.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff -r 97f8346ce240 gcc/config/microblaze/microblaze.h +--- a/gcc/config/microblaze/microblaze.h Sun Jul 26 15:32:32 2015 -0400 ++++ b/gcc/config/microblaze/microblaze.h Sun Jul 26 15:32:34 2015 -0400 +@@ -218,6 +218,12 @@ + #undef PTRDIFF_TYPE + #define PTRDIFF_TYPE "int" + ++#undef SIZE_TYPE ++#define SIZE_TYPE "unsigned int" ++ ++#undef PTRDIFF_TYPE ++#define PTRDIFF_TYPE "int" ++ + #define CONSTANT_ALIGNMENT(EXP, ALIGN) \ + ((TREE_CODE (EXP) == STRING_CST || TREE_CODE (EXP) == CONSTRUCTOR) \ + && (ALIGN) < BITS_PER_WORD \ diff --git a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/microblaze.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/microblaze.diff new file mode 100644 index 0000000..ac5a87f --- /dev/null +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/microblaze.diff @@ -0,0 +1,31 @@ +# HG changeset patch +# Parent d548cc2d1cfea3241205efc347caec8ad78c21d4 +Microblaze support (again). + +diff -r d548cc2d1cfe gcc/config/microblaze/linux.h +--- a/gcc/config/microblaze/linux.h Sun Jul 26 15:32:30 2015 -0400 ++++ b/gcc/config/microblaze/linux.h Sun Jul 26 15:32:32 2015 -0400 +@@ -28,7 +28,22 @@ + #undef TLS_NEEDS_GOT + #define TLS_NEEDS_GOT 1 + +-#define DYNAMIC_LINKER "/lib/ld.so.1" ++#if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */ ++#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}" ++#else ++#define MUSL_DYNAMIC_LINKER_E "%{EL:el}" ++#endif ++ ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1" ++#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++ ++#if DEFAULT_LIBC == LIBC_MUSL ++#define DYNAMIC_LINKER MUSL_DYNAMIC_LINKER ++#else ++#define DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER ++#endif ++ ++ + #undef SUBTARGET_EXTRA_SPECS + #define SUBTARGET_EXTRA_SPECS \ + { "dynamic_linker", DYNAMIC_LINKER } diff --git a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/mips.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/mips.diff new file mode 100644 index 0000000..9ccc516 --- /dev/null +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/mips.diff @@ -0,0 +1,18 @@ +# HG changeset patch +# Parent 270d6afd029dd396b69553e1d96f35d2ebdd2f99 +Support for mips-linux-musl. + +diff -r 270d6afd029d gcc/config/mips/linux.h +--- a/gcc/config/mips/linux.h Sun Jul 26 15:32:25 2015 -0400 ++++ b/gcc/config/mips/linux.h Sun Jul 26 15:32:26 2015 -0400 +@@ -23,3 +23,10 @@ + #undef UCLIBC_DYNAMIC_LINKER + #define UCLIBC_DYNAMIC_LINKER \ + "%{mnan=2008:/lib/ld-uClibc-mipsn8.so.0;:/lib/ld-uClibc.so.0}" ++ ++#if TARGET_ENDIAN_DEFAULT == 0 /* LE */ ++#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}" ++#else ++#define MUSL_DYNAMIC_LINKER_E "%{EL:el}" ++#endif ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" diff --git a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/powerpc.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/powerpc.diff new file mode 100644 index 0000000..92276e2 --- /dev/null +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/powerpc.diff @@ -0,0 +1,108 @@ +# HG changeset patch +# Parent 3974ad9269f7e4c5605e0bb38db7418a69e6ee95 +Support for powerpc-linux-musl. + +diff -r 3974ad9269f7 gcc/config.gcc +--- a/gcc/config.gcc Sun Jul 26 15:32:26 2015 -0400 ++++ b/gcc/config.gcc Sun Jul 26 15:32:28 2015 -0400 +@@ -2344,6 +2344,10 @@ + powerpc*-*-linux*paired*) + tm_file="${tm_file} rs6000/750cl.h" ;; + esac ++ case ${target} in ++ *-linux*-musl*) ++ enable_secureplt=yes ;; ++ esac + if test x${enable_secureplt} = xyes; then + tm_file="rs6000/secureplt.h ${tm_file}" + fi +diff -r 3974ad9269f7 gcc/config/rs6000/linux64.h +--- a/gcc/config/rs6000/linux64.h Sun Jul 26 15:32:26 2015 -0400 ++++ b/gcc/config/rs6000/linux64.h Sun Jul 26 15:32:28 2015 -0400 +@@ -371,17 +371,21 @@ + #endif + #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" + #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" ++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1" ++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1" + #if DEFAULT_LIBC == LIBC_UCLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" + #elif DEFAULT_LIBC == LIBC_GLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" ++#elif DEFAULT_LIBC == LIBC_MUSL ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" + #else + #error "Unsupported DEFAULT_LIBC" + #endif + #define GNU_USER_DYNAMIC_LINKER32 \ +- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32) ++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) + #define GNU_USER_DYNAMIC_LINKER64 \ +- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) ++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) + + #undef DEFAULT_ASM_ENDIAN + #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN) +diff -r 3974ad9269f7 gcc/config/rs6000/secureplt.h +--- a/gcc/config/rs6000/secureplt.h Sun Jul 26 15:32:26 2015 -0400 ++++ b/gcc/config/rs6000/secureplt.h Sun Jul 26 15:32:28 2015 -0400 +@@ -18,3 +18,4 @@ + <http://www.gnu.org/licenses/>. */ + + #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt" ++#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt" +diff -r 3974ad9269f7 gcc/config/rs6000/sysv4.h +--- a/gcc/config/rs6000/sysv4.h Sun Jul 26 15:32:26 2015 -0400 ++++ b/gcc/config/rs6000/sysv4.h Sun Jul 26 15:32:28 2015 -0400 +@@ -537,6 +537,9 @@ + #ifndef CC1_SECURE_PLT_DEFAULT_SPEC + #define CC1_SECURE_PLT_DEFAULT_SPEC "" + #endif ++#ifndef LINK_SECURE_PLT_DEFAULT_SPEC ++#define LINK_SECURE_PLT_DEFAULT_SPEC "" ++#endif + + /* Pass -G xxx to the compiler. */ + #define CC1_SPEC "%{G*} %(cc1_cpu)" \ +@@ -585,7 +588,8 @@ + + /* Override the default target of the linker. */ + #define LINK_TARGET_SPEC \ +- ENDIAN_SELECT("", " --oformat elf32-powerpcle", "") ++ ENDIAN_SELECT("", " --oformat elf32-powerpcle", "") \ ++ "%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}" + + /* Any specific OS flags. */ + #define LINK_OS_SPEC "\ +@@ -763,15 +767,18 @@ + + #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" + #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1" + #if DEFAULT_LIBC == LIBC_UCLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" ++#elif DEFAULT_LIBC == LIBC_MUSL ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" + #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" + #else + #error "Unsupported DEFAULT_LIBC" + #endif + #define GNU_USER_DYNAMIC_LINKER \ +- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) ++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) + + #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ +@@ -894,6 +901,7 @@ + { "link_os_openbsd", LINK_OS_OPENBSD_SPEC }, \ + { "link_os_default", LINK_OS_DEFAULT_SPEC }, \ + { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \ ++ { "link_secure_plt_default", LINK_SECURE_PLT_DEFAULT_SPEC }, \ + { "cpp_os_ads", CPP_OS_ADS_SPEC }, \ + { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \ + { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \ diff --git a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/sh.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/sh.diff new file mode 100644 index 0000000..f7be443 --- /dev/null +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/sh.diff @@ -0,0 +1,18 @@ +diff -r c5b39ce7672b gcc/config/sh/linux.h +--- a/gcc/config/sh/linux.h Fri Sep 28 16:32:03 2012 +1000 ++++ b/gcc/config/sh/linux.h Sun Jul 26 15:32:36 2015 -0400 +@@ -43,7 +43,14 @@ + + #define TARGET_ASM_FILE_END file_end_indicate_exec_stack + ++#if TARGET_BIG_ENDIAN_DEFAULT /* BE */ ++#define MUSL_DYNAMIC_LINKER_E "eb" ++#else ++#define MUSL_DYNAMIC_LINKER_E ++#endif ++ + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E ".so.1" + + #undef SUBTARGET_LINK_EMUL_SUFFIX + #define SUBTARGET_LINK_EMUL_SUFFIX "_linux" diff --git a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/unwind-dliterate.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/unwind-dliterate.diff new file mode 100644 index 0000000..2add290 --- /dev/null +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/unwind-dliterate.diff @@ -0,0 +1,43 @@ +diff -r ddc4b4034e51 libgcc/unwind-dw2-fde-dip.c +--- a/libgcc/unwind-dw2-fde-dip.c Sun Jul 26 15:32:13 2015 -0400 ++++ b/libgcc/unwind-dw2-fde-dip.c Sun Jul 26 15:32:15 2015 -0400 +@@ -46,33 +46,13 @@ + #include "unwind-compat.h" + #include "gthr.h" + +-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ +- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \ +- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) ++#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR) + # define USE_PT_GNU_EH_FRAME +-#endif +- +-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ +- && defined(__BIONIC__) +-# define USE_PT_GNU_EH_FRAME +-#endif +- +-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ +- && defined(__FreeBSD__) && __FreeBSD__ >= 7 +-# define ElfW __ElfN +-# define USE_PT_GNU_EH_FRAME +-#endif +- +-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ +- && defined(__OpenBSD__) +-# define ElfW(type) Elf_##type +-# define USE_PT_GNU_EH_FRAME +-#endif +- +-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ +- && defined(TARGET_DL_ITERATE_PHDR) \ +- && defined(__sun__) && defined(__svr4__) +-# define USE_PT_GNU_EH_FRAME ++# ifdef __OpenBSD__ ++# define ElfW(type) Elf_##type ++# elif defined(__FreeBSD__) && __FreeBSD__ >= 7 ++# define ElfW __ElfN ++# endif + #endif + + #if defined(USE_PT_GNU_EH_FRAME) diff --git a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/vis_hide.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/vis_hide.diff new file mode 100644 index 0000000..16df34a --- /dev/null +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/vis_hide.diff @@ -0,0 +1,15 @@ +Fix hidden visibility of libgcc.a symbols when building gcc stage 2 with + --disable-shared, as per musl ml: +http://www.openwall.com/lists/musl/2014/01/12/4 + +diff -Naur gcc-4.7.3.orig/libgcc/Makefile.in gcc-4.7.3/libgcc/Makefile.in +--- gcc-4.7.3.orig/libgcc/Makefile.in 2012-12-04 14:09:59.000000000 -0500 ++++ gcc-4.7.3/libgcc/Makefile.in 2014-02-27 08:33:31.537611370 -0500 +@@ -388,7 +388,7 @@ + else + # Not enable_shared. + iterator = $(srcdir)/empty.mk $(patsubst %,$(srcdir)/static-object.mk,$(iter-items)) +-vis_hide = ++vis_hide = @vis_hide@ + gen-hide-list = echo > \$@ + endif diff --git a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/x86.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/x86.diff new file mode 100644 index 0000000..f62f27e --- /dev/null +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/x86.diff @@ -0,0 +1,55 @@ +# HG changeset patch +# Parent ab9383ed51ae0c261e0c860fc6b953eb57976eef +Support for i386-linux-musl and x86_64-linux-musl. + +diff -r ab9383ed51ae gcc/config/i386/linux.h +--- a/gcc/config/i386/linux.h Sun Jul 26 15:32:21 2015 -0400 ++++ b/gcc/config/i386/linux.h Sun Jul 26 15:32:23 2015 -0400 +@@ -21,3 +21,4 @@ + + #define GNU_USER_LINK_EMULATION "elf_i386" + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" +diff -r ab9383ed51ae gcc/config/i386/linux64.h +--- a/gcc/config/i386/linux64.h Sun Jul 26 15:32:21 2015 -0400 ++++ b/gcc/config/i386/linux64.h Sun Jul 26 15:32:23 2015 -0400 +@@ -30,3 +30,7 @@ + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" + #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" + #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" ++ ++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1" ++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1" ++#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1" +diff -r ab9383ed51ae libitm/config/linux/x86/tls.h +--- a/libitm/config/linux/x86/tls.h Sun Jul 26 15:32:21 2015 -0400 ++++ b/libitm/config/linux/x86/tls.h Sun Jul 26 15:32:23 2015 -0400 +@@ -25,16 +25,19 @@ + #ifndef LIBITM_X86_TLS_H + #define LIBITM_X86_TLS_H 1 + +-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) ++#if defined(__GLIBC_PREREQ) ++#if __GLIBC_PREREQ(2, 10) + /* Use slots in the TCB head rather than __thread lookups. + GLIBC has reserved words 10 through 13 for TM. */ + #define HAVE_ARCH_GTM_THREAD 1 + #define HAVE_ARCH_GTM_THREAD_DISP 1 + #endif ++#endif + + #include "config/generic/tls.h" + +-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) ++#if defined(__GLIBC_PREREQ) ++#if __GLIBC_PREREQ(2, 10) + namespace GTM HIDDEN { + + #ifdef __x86_64__ +@@ -101,5 +104,6 @@ + + } // namespace GTM + #endif /* >= GLIBC 2.10 */ ++#endif + + #endif // LIBITM_X86_TLS_H diff --git a/sys-devel/gcc/gcc-4.9.3-r999.ebuild b/sys-devel/gcc/gcc-4.9.3-r999.ebuild new file mode 100644 index 0000000..fbf2b81 --- /dev/null +++ b/sys-devel/gcc/gcc-4.9.3-r999.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" + +PATCH_VER="1.2" +UCLIBC_VER="1.0" + +# Hardened gcc 4 stuff +PIE_VER="0.6.3" +SPECS_VER="0.2.0" +SPECS_GCC_VER="4.4.3" +# arch/libc configurations known to be stable with {PIE,SSP}-by-default +PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64" +PIE_UCLIBC_STABLE="x86 arm amd64 mips ppc ppc64" +SSP_STABLE="amd64 x86 mips ppc ppc64 arm" +# uclibc need tls and nptl support for SSP support +# uclibc need to be >= 0.9.33 +SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm" +PIE_MUSL_STABLE="amd64 arm ppc mips x86" +SSP_MUSL_STABLE="amd64 arm ppc mips" +#end Hardened stuff + +inherit eutils toolchain + +KEYWORDS="amd64 arm ~mips x86" + +RDEPEND="" +DEPEND="${RDEPEND} + elibc_glibc? ( >=sys-libs/glibc-2.8 ) + >=${CATEGORY}/binutils-2.20" + +if [[ ${CATEGORY} != cross-* ]] ; then + PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )" +fi + +src_prepare() { + if has_version '<sys-libs/glibc-2.12' ; then + ewarn "Your host glibc is too old; disabling automatic fortify." + ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315" + EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch" + fi + + toolchain_src_prepare + + if use elibc_musl || [[ ${CATEGORY} = cross-*-musl ]]; then + epatch "${FILESDIR}"/${PN}-4.8.3-musl-res_state.patch + epatch "${FILESDIR}"/${PN}-4.8.3-musl-fix-libc5-assumption.patch + epatch "${FILESDIR}"/${PN}-4.8.5-posix_memalign.patch + + local EPATCH_EXCLUDE="gcc-ssp.diff vis_hide.diff" + local EPATCH_SUFFIX="diff" + local EPATCH_FORCE="yes" + epatch ${FILESDIR}/musl-gcc-patches-${PV} + fi + + use vanilla && return 0 + #Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs. + [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch +}
