commit:     e133e716042047ea1a0cea2469121e82f064d4c2
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 19 20:11:40 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 20:11:40 2016 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=e133e716

sys-devel/gcc: bump to gcc-4.9.4, address bug #590098

Package-Manager: portage-2.2.28

 sys-devel/gcc/Manifest                             |  6 ++
 ...gcc-4.9.3-tree-vect-data-refs-correctness.patch | 11 ++++
 sys-devel/gcc/gcc-4.9.4-r99.ebuild                 | 66 ++++++++++++++++++++++
 3 files changed, 83 insertions(+)

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index b677f3a..bb092a9 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -14,6 +14,7 @@ AUX gcc-4.8.5-posix_memalign.patch 1114 SHA256 
87370f7854063bcf5f57bff931684c228
 AUX gcc-4.9.3-musl-linker-path.patch 3556 SHA256 
22228421551806b81a1d3aff438eecf4202f64844141863fb8e665ef3b5eb5fb SHA512 
cf58b49311c1a7a4cbb04a2ffeccdaa278872512e67b72ebe292fa155f419dc6025d158b67d58265de67edbd18c6af67f28c6f6806b581a8fdb9015ad2ee0aa3
 WHIRLPOOL 
c3d5e9c7fc64cd8a8bacca714da5881ee8d94585e0064f5e3965b20bfe23c48bbe8b0bc886cf291d616e51786e80d032c19bdce59a15fdb310546b61a0ab0886
 AUX gcc-4.9.3-musl-res_state.patch 699 SHA256 
822990f5075b65dc2d1c03722daa5a215301f9ec2c4323c10e80fff2fbd04e71 SHA512 
93f59d16e026672051b5a65110f78ace0c91a4f1365b861e22741fbc42b92c4490e55068ae845bbcbb5af9221fb874e0b855a763189528a646e757b133117e28
 WHIRLPOOL 
98438e82aa8d387b5a96bc58d3a137766661cc53d7396165338448394c14996687626f46e9c93bcb6b2a2e422b97445f5097489616a0aff619cca01c8243a56a
 AUX gcc-4.9.3-secure-plt.patch 1478 SHA256 
b9435e19c3193e872bfdce8f635755655cf6e88889c57d21c7afa118d7068e95 SHA512 
95f04716bad41fe3f290d44d21d1dad35548b801b56de331acac8bdf56019583a04681418a805a0b4dbfe19e9b51cecceff984cea257be58d3e7780c6cfc58a5
 WHIRLPOOL 
8af1f0cfaf0e8197754d841d1cd2b25615968cc503344574cd9ec6b644804e029687a4ded18f6e1efd584c8c99277eceb6f1012c6519a2747bddc400d8909c1e
+AUX gcc-4.9.3-tree-vect-data-refs-correctness.patch 315 SHA256 
904ae5ce2ecd5a2f7786c54d148a7562d0bb6f51fe60761038c2f57b8cf70356 SHA512 
88d93c061ef72035522270ab60c8c2ec04e2fa2d69763f45b9eab0c37b19c23920484358d7556ad885775071ac04cf94684a2cd8ed93418d5f0c54ac3a045c9d
 WHIRLPOOL 
2b9c281401abc111d53467c51b6238c6f4c430a73d8833f161766f973138ffe3b4fa1ffe5cc5813b5e2f8a81dee2cdcaaff2b9a8f8e13089f993f3ab3d69ccbd
 AUX gcc-6.1.0-musl-cpu.patch 1277 SHA256 
6c7a28ccc5edc226fc6f3f6b9b0562fb873a9c88dfb25b608b5acd827f239c08 SHA512 
b11c5933c02dda63b40273f6cee394d52c68265931817cfeea3645e971b9c822cc841242a7c74fcd07729171bc0723c2af0db21743bf92dd3dba3430ee6627a1
 WHIRLPOOL 
e0f6068a8028052f88cef840026baa459ae77a43d9144258fe7739a80b5dade852a2aa640feb5bce51dd54d6d35e0c8df99a8c9bdc140f9ae473f16ffb2e9af7
 AUX gcc-configure-LANG.patch 2052 SHA256 
63de6d2dcfe14f21d147abeb1390405b9220c03f8e968f482d4b4c1cf279c88b SHA512 
a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129
 WHIRLPOOL 
3cc1ec912fb192ff1058de5b93e49a994ba30d1501a932290dd5b3df1cd783875621cda56edeb41894cd5fa10c04917e693a40a60be8d742ddd7992bf5d8afeb
 AUX gcc-configure-texinfo.patch 337 SHA256 
74b73a7ecec2d88889876b4db480cd173632f49d5396bb8e5b3c93673f9b5b98 SHA512 
a15fba8bf2ff02bdeca54d6f186bfa08c1079c6a8ba0a3beef154483ce5c1b8c497e7ffeec32371968f0037e0ff8384609eb0c367d0155a4e5a7eef8aad084d5
 WHIRLPOOL 
39d008aad06f7621e4e5db15f5e85a59e583b43f8d247029bd4944466bb60a9795bda157d185c45c329294078e282703a243aad5c468d90c77665dd6336870d4
@@ -51,6 +52,10 @@ DIST gcc-4.9.3-patches-1.5.tar.bz2 25384 SHA256 
e1c43125fab5a4db1997a01b362b3611
 DIST gcc-4.9.3-piepatches-v0.6.4.tar.bz2 14431 SHA256 
012c3025ac2e14781ff25028c0b1d42a07f510b125006116e268bcd90fb6c9db SHA512 
3bbeacbca5e8ef6ab0b1d58add42f5e8e82328afe024666f9585b5398c8722e7d012abfd2009a98ad47b1f1b26afaf421402a9e7719a5662516b32dcbe5608be
 WHIRLPOOL 
9e68d981aed42ece2f481f62efc078ad370ac780e96ba39c4273c8675d552b845cd52c588bd41839868f430b0a532789858914f4ef32a1bc187e2983264ebfd3
 DIST gcc-4.9.3-uclibc-patches-1.0.tar.bz2 2515 SHA256 
dd19904d4ab005ef142056228f326e75b3d4d79b8056189a505129b5940a575c SHA512 
825092620a3c554ef06219fd1152c3677f1456315563b9e65282a73096e75600389e93298ed76cad41ce3eeecc6a7009ca722585b93c04095bd2d0a06c4404e6
 WHIRLPOOL 
0c184a5cc74f80a61f354ee85bc5a0f5b44d93bc9fa2e1892fbfe899958cfa5263b8b72cc4f905bc69bd1cc90cf870a6056c4003ec493b815646a72a0fe2e44e
 DIST gcc-4.9.3.tar.bz2 90006707 SHA256 
2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e SHA512 
9ac57377a6975fc7adac704ec81355262b9f537def6955576753b87715470a20ee6a2a3144a79cc8fcba3443f7b44c7337d79d704b522d053f54f79aa6b442df
 WHIRLPOOL 
085e4cc1825b031652cbe9e098671f761acfeca64c6cc9b8ad2a8961c13fcac9e02b4538b44dc38181a355266f2c55c99ce5a1bff3f2860b870285cf3f0e84a5
+DIST gcc-4.9.4-patches-1.0.tar.bz2 22266 SHA256 
1a394abb77c75e2212896ad3a62ae1f6bfd3660b1c176c608298733c740a00e4 SHA512 
cc2407221f858bad38b57d31f635314f91794293695e23d255685d8bec20b9db19c7dc76bbf5e8184c2ba0ccb530958b09bae4d8a402ca27cadf463f46bfb995
 WHIRLPOOL 
c74e5273c718020b591911d589d8eff5e366c902c479e566f966577efcbf424b19669a54843b2ddd60c51c81fd2851bc86aec1c647482b4789a518f01dd62561
+DIST gcc-4.9.4-piepatches-v0.6.4.tar.bz2 14414 SHA256 
c67b56f04c653e6a19e36abed8391f8b6bed426bfcfc907237cc37f02dbb5015 SHA512 
243fa272ea0e49f700a76508bab3e03bbb353bcb930581b2f87f9a47df5cd3880e29f20b71612b21190adc463849e1e6ac2a38a49c0002b562d93d436f538285
 WHIRLPOOL 
1e5959441210af6f690398efab96444ab11d136238a9428912e8441eaf0509fe6db359a8aca92a446fce0c75777385475af73b20165a8593f9969e3a25fd0b0f
+DIST gcc-4.9.4-uclibc-patches-1.0.tar.bz2 2618 SHA256 
95f290d0b68114d835515afc424d6096476a45665671784aa71a7a506296e465 SHA512 
5a1f44caa9261f4947101379628143869b31dec67fa28605e8e1f3894d4b7120c3f68ba6deb59da7a74fa906e27ab32cd3767761837dc3dfebc37865d349d6db
 WHIRLPOOL 
e46b08737cfdc235bfb80117e0389f3969167adf59bcba2a0a1094a20eab2b62f0c952dac44781e43957cb1507cd4e80f37bd8aecbc55dbda6382d93b3a4cf94
+DIST gcc-4.9.4.tar.bz2 90097606 SHA256 
6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092 SHA512 
93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe
 WHIRLPOOL 
e20045126c21a3edea1fa4a2185ec2bc5feec77ddf967ab9d1e8c33322ad4eafe013bfcaab1ed4e35971d3b70ef373ea3585ebb089c9bbf91bbfca1f1da71236
 DIST gcc-6.1.0-patches-1.0.tar.bz2 4193 SHA256 
48882d00b3327fe6578e421d4d90d5f03c22fe30ee80542fc828432ba505dc77 SHA512 
ff3fc21bdbc5391058759d7e61e9636665d0cbeb3f3fdb724e1bd09e4d6ae778f7c836e59e8b21540458bde99b503428b190736d3ee7a3764f56ddc1da754d39
 WHIRLPOOL 
4b648a92aadbdb4bf72652ba83cdd8352ef992449b089311c8e20760317dc0fd008dcc2f797880c869dd1b79cf1162943a323681954dea490f09e7682f28b3cb
 DIST gcc-6.1.0.tar.bz2 99267556 SHA256 
09c4c85cabebb971b1de732a0219609f93fc0af5f86f6e437fd8d7f832f1a351 SHA512 
eeed3e2018b8c012aabce419e8d718fde701e5c3c179b4486c61ba46e5736eecc8fccdd18b01fcd973a42c6ad3116dbbe2ee247fe3757d622d373f93ebaf8d2e
 WHIRLPOOL 
fa11fca6c85a31f7c896f0ded40a9208a8588c2b3fddd2cca51f440c712ff83374528b7d1571f8d98dad96e24cb5b14b6af624ef42aff2a85ae99e8621c9b479
 EBUILD gcc-4.7.4-r99.ebuild 2071 SHA256 
67b45e6941cd3d7b4b075884295da5ed7cae18f4a0ab4630ac8e64cda70c3aab SHA512 
383a1986e74a1ef333a666f298200d7ab9423f30c25da9cf460986fe5bf95f6c43ecf829f90313076108508b2f64f06e188dda8fec9f014f861adca27d876e9b
 WHIRLPOOL 
9dbe06a64f35a0d5f12a968274152e95cf332b87c9e8b689d70a99db6a93a097960604c363dc608932c96250cd634ce65dc544368b4e361ed5bfef535243f3c7
@@ -58,5 +63,6 @@ EBUILD gcc-4.8.5-r99.ebuild 2139 SHA256 
0b762e2fb8c2bf92488b598c01977b07a3786afe
 EBUILD gcc-4.8.5-r999.ebuild 2185 SHA256 
7b8b261c0d3ea2e34a2f099b4f0a23a5bfd61e814dead44aeb4e45071be2c3f1 SHA512 
e8f6e8bba4fd7818c30a555adcf25acbe818919c98204f91e27be04566aa267b9394547045e05e5486437853ceb1b75229d86089f69409a626a9e81e363c12db
 WHIRLPOOL 
872e4f0e40e2b9a0a51002c64e682eca1990c2b968c8917b9a1a7c309075a048ceffd7925bf7f67cb3f304badbf29ee5e94772f5a86503e1e5e42fa7682fb87e
 EBUILD gcc-4.9.3-r99.ebuild 2195 SHA256 
3f5be66ffc6fb064e14a24cb9005d1835685573f245ed1aa5143c5f5e7ba1a90 SHA512 
c49043c69947bc37ab31142f51060ebc8d922bb13d4aae17957c60bb45e2494cba4724e8af3ac2f0d4f09ca4b3676645657a08b4893ca01175917bc07ce827d9
 WHIRLPOOL 
9b1bec2a6fe2ae003a94ba73bcf4b207db0f5a2988288820581508de7649d3e46a163852514755f49051be00fc43846844cd24cd1a8fe2462315ddeb53faf0a6
 EBUILD gcc-4.9.3-r999.ebuild 1794 SHA256 
514b9f6cddb5e6a43c53f866aa501812319bfccf7fb7713316563d55cb139aff SHA512 
c7f4aad21658d6acb99f14b3b51707a74387206b9fc3629d962c755a7eb8a963b3df844ba60172305fc2e753fc7178d4723f02a487aeae643c85ff00062b4bd3
 WHIRLPOOL 
c6372f1014c5b8d22023f04b7223db4ae5d898f450f3d5cf286ccd82553f916978fba8d0910dc72fd5cdd1d92ecce9749597b09e252a58ff898d3616221af685
+EBUILD gcc-4.9.4-r99.ebuild 2271 SHA256 
d1736950223f5d3a8e9f19f4305eadf850c089cb37b5110191b0153c9f464a5a SHA512 
02591b3bcf781a07c7283b9901ad789f7f57e7493d7d965da9b1b0a97ef8ad0041524eb65c46ead9eb3abdc562544f92c3b448f8264c8a4a3ff4fd9a4f7468f3
 WHIRLPOOL 
de255e364c4003f4bbc3b6090a361621abe794cca1bb80e0af9b7db32a084a852e70397de9c3f5fb3d9216a56410da0c7817bc5d246817633a33951eec21889c
 EBUILD gcc-6.1.0.ebuild 1076 SHA256 
6d5acd2030e949af48922a3da83541c0720037212c71c1867e5de8373e8bc0b0 SHA512 
7f4c657c930a7cb0cfdd34ff8fa811eb2e62834ed0ec094db6bbc5123ea8c86b72df1cf32d6660c0ef2dc3863276081665b95af0a1c47a1ba14802a5559e776d
 WHIRLPOOL 
73f9a4277585013050291df58b6d0c7db7fa65baed51c0a1b9462c212281de9d98d50c63be9d703fd45efb61e596fb74861aa41e17f4ac1917adb4f44961c18a
 MISC metadata.xml 2039 SHA256 
b200834baf1ac8adf966540ee7e50dbf1397248f08eeff35a8bde6bb16dbcc50 SHA512 
b8fe281c88017b4d5d2ac05ea4e074d740b3943bc0d4cd361ec4f161f2549fb6401a2fa7881c06a4eae33ffd9755b6ebc4fa608654ec04838bff49ff22ee74a8
 WHIRLPOOL 
e063f7657a00a1e675a57000fed2fac1c05e986488f3a705c95909ac7a2e74ca8f97c6fb8bfffdb81388a967228a78adbcfa93b166d4095aade5875aaf350fa0

diff --git 
a/sys-devel/gcc/files/gcc-4.9.3-tree-vect-data-refs-correctness.patch 
b/sys-devel/gcc/files/gcc-4.9.3-tree-vect-data-refs-correctness.patch
new file mode 100644
index 0000000..d865e25
--- /dev/null
+++ b/sys-devel/gcc/files/gcc-4.9.3-tree-vect-data-refs-correctness.patch
@@ -0,0 +1,11 @@
+--- trunk/gcc/tree-vect-data-refs.c    2015/11/20 16:15:57     230666
++++ trunk/gcc/tree-vect-data-refs.c    2015/11/20 16:27:17
+@@ -2545,6 +2545,8 @@ 
+   if (t2 == NULL)
+     return 1;
+ 
++  STRIP_NOPS (t1);
++  STRIP_NOPS (t2);
+ 
+   if (TREE_CODE (t1) != TREE_CODE (t2))
+     return TREE_CODE (t1) < TREE_CODE (t2) ? -1 : 1;

diff --git a/sys-devel/gcc/gcc-4.9.4-r99.ebuild 
b/sys-devel/gcc/gcc-4.9.4-r99.ebuild
new file mode 100644
index 0000000..4d9e5ae
--- /dev/null
+++ b/sys-devel/gcc/gcc-4.9.4-r99.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PATCH_VER="1.0"
+UCLIBC_VER="1.0"
+
+# Hardened gcc 4 stuff
+PIE_VER="0.6.4"
+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
+               cd "${S}"
+               sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
+               mv libstdc\+\+-v3/config/os/gnu-linux 
libstdc\+\+-v3/config/os/gnu-linux.org
+               cp -r libstdc\+\+-v3/config/os/generic 
libstdc\+\+-v3/config/os/gnu-linux
+               cp libstdc++-v3/config/os/gnu-linux.org/arm-eabi-extra.ver 
libstdc++-v3/config/os/gnu-linux/
+               mv libitm/config/linux/x86 libitm/config/linux/x86_glibc
+               cp -r libitm/config/generic libitm/config/linux/x86
+               epatch "${FILESDIR}"/${PN}-4.9.3-musl-linker-path.patch
+               epatch "${FILESDIR}"/${PN}-4.9.3-secure-plt.patch
+               epatch "${FILESDIR}"/${PN}-4.9.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
+               epatch 
"${FILESDIR}"/${PN}-4.9.3-tree-vect-data-refs-correctness.patch
+       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
+}

Reply via email to