main/gcc: upgrade to 4.8.2

1 files changed, 58 insertions, 26 deletions

diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index de2e30b07..b41fb3799 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gcc
-pkgver=4.8.1
-_piepatchver=0.5.6
+pkgver=4.8.2
+_pie_gcc_ver=4.8.1
+_piepatchver=0.5.7
 _specs_ver=0.2.0
 _specs_gcc_ver=4.4.3
 _uclibc_abiver=0.9.32
@@ -12,7 +13,7 @@ _cross=""
 	&& _cross="-$CTARGET"
 
 pkgname="$pkgname$_cross"
-pkgrel=5
+pkgrel=0
 pkgdesc="The GNU Compiler Collection"
 url="http://gcc.gnu.org"
 arch="all"
@@ -144,10 +145,20 @@ if $LANG_ADA; then
 fi
 
 source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-$pkgver.tar.bz2
-	http://distfiles.gentoo.org/distfiles/gcc-$pkgver-piepatches-v${_piepatchver}.tar.bz2
 	http://distfiles.gentoo.org/distfiles/gcc-$_specs_gcc_ver-specs-$_specs_ver.tar.bz2
 	ftp://sourceware.org/pub/java/ecj-latest.jar
 
+	01_all_gcc48_configure.patch
+	02_all_gcc48_config.in.patch
+	03_all_gcc48_Makefile.in.patch
+	05_all_gcc48_gcc.c.patch
+	16_all_gcc47_nopie_option.patch
+	20_all_gcc46_config_crtbeginp.patch
+	24_all_gcc44_invoke.texi.patch
+	34_all_gcc48_config_i386.patch
+	35_all_gcc48_config_arm.patch
+	40_all_gcc48_config_esp.patch
+
 	12_all_default-warn-trampolines.patch
 	15_all_libgfortran-Werror.patch
 	16_all_libgomp-Werror.patch
@@ -183,8 +194,6 @@ source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-$pkgver.tar.bz2
 	ada-musl.patch
 	"
 
-#	gcc-go.patch
-
 # we build out-of-tree
 _gccdir="$srcdir"/gcc-$pkgver
 _gcclibdir=/usr/lib/gcc/${CTARGET}/$pkgver
@@ -198,17 +207,7 @@ prepare() {
 		return 1
 	fi
 
-	# PIE patches from gentoo
-	# thanks to Zorry for hard work on those patches
-	for i in "$srcdir"/piepatch/*.patch; do
-		msg "Applying $i"
-		patch -t -p0 -i $i || patch -t -p1 -i $i || return 1
-	done
-
-	sed -i -e 's/stage1_cflags="$stage1_cflags -fno-stack-protector"/stage1_cflags="$stage1_cflags -fno-stack-protector -fno-stack-check"/g' \
-		configure
-
-	# Gentoo and uclibc patches
+	# Gentoo, PIE and uclibc patches
 	_err=
 	for i in $source; do
 		case "$i" in
@@ -227,6 +226,12 @@ prepare() {
 		return 1
 	fi
 
+	# fix ada bootstrap
+	# piepatches adds -fstack-check to spec which breaks ada bootstrap
+	# TODO: upstream this to piepatches
+	sed -i -e 's/stage1_cflags="$stage1_cflags -fno-stack-protector"/stage1_cflags="$stage1_cflags -fno-stack-protector -fno-stack-check"/g' \
+		configure
+
 	# genautomata crashes with a "Bus Error" when compiled with PIC
 	# mostly affecting cross-builds as on native build bootstrapping
 	# somehow seems to build proper genautomata
@@ -639,10 +644,19 @@ gnat() {
 	mv "$pkgdir"/usr/bin/*gnat* "$subpkgdir"/usr/bin/ || return 1
 }
 
-md5sums="3b2386c114cd74185aa3754b58a79304  gcc-4.8.1.tar.bz2
-f8ab875eee18868b319ad04dc19adcf6  gcc-4.8.1-piepatches-v0.5.6.tar.bz2
+md5sums="a3d7d63b9cb6b6ea049469a0c4a43c9d  gcc-4.8.2.tar.bz2
 441c76504e1d97170117c294e65c7a72  gcc-4.4.3-specs-0.2.0.tar.bz2
 d7cd6a27c8801e66cbaa964a039ecfdb  ecj-latest.jar
+485b2b9da364ad700f25de1c64d9cd06  01_all_gcc48_configure.patch
+2a8d6a9046efc9f44449b012cf12d7fd  02_all_gcc48_config.in.patch
+77c070fb506bbe33ca93cee4cccb9b38  03_all_gcc48_Makefile.in.patch
+bcc6826afc77ae77a5dd5f164b51c746  05_all_gcc48_gcc.c.patch
+c4e4451863b021963645d904fc847105  16_all_gcc47_nopie_option.patch
+ad7dbd7ac3fdcfb30d430b1d6069816f  20_all_gcc46_config_crtbeginp.patch
+607a1144179e47cfc06df8eb674eb7d0  24_all_gcc44_invoke.texi.patch
+b0910da9f2eb4fe6a684e680f6336491  34_all_gcc48_config_i386.patch
+adcc78e93f54b80210bc436041c1a6e7  35_all_gcc48_config_arm.patch
+d43214e763cba712f2afc0301147b313  40_all_gcc48_config_esp.patch
 f28e9334c58ce14f69a9e988026bc772  12_all_default-warn-trampolines.patch
 7eb9ad894dfdf1b3d4a8a407a339a6f1  15_all_libgfortran-Werror.patch
 452e457a0ac45e6f8f75eb6d6ba4d04b  16_all_libgomp-Werror.patch
@@ -658,7 +672,7 @@ ab83248e10b2bf4b3d9240de0fefb52b  pt_gnu_eh_frame.patch
 6cc2385c5bbd6d0da6eaedd53c8bf547  uclibc-getipinfo.patch
 32e8e4c0e23ed8f5de95a591cb30f1da  gcc-4.6-pr32219.patch
 79d00ee1284fac5192456f7f7d3908aa  gcc-4.8-dynamic-linker.patch
-ae660a0cb265b3115cde8f7efb41f7cc  gcc-4.8-musl.patch
+87a1725ab79bb98b3a45f7763e889290  gcc-4.8-musl.patch
 6e5c32243a86ff35b7b47d18c95b31bd  gcc-4.8-musl-fix-iteratephdr.patch
 0d0a41c02802b85c8f1b78ce28544f92  gcc-4.8-musl-libssp.patch
 2c6cb49bb9bfd8b6e690222e66ccc901  boehm-gc-uclibc.patch
@@ -674,10 +688,19 @@ fb28fd941c110627b7b9ca523d66b8d6  pr57748.patch
 d77c99bf7c03d082a540aaba1193be40  ada-crossbuild.patch
 20e2731c02ce50739ebdead2795f9c41  ada-shared.patch
 4e47bdae120129462244da0d89a573b3  ada-musl.patch"
-sha256sums="545b44be3ad9f2c4e90e6880f5c9d4f0a8f0e5f67e1ffb0d45da9fa01bb05813  gcc-4.8.1.tar.bz2
-4aa0ab0f114b0ff8af5d0c19c18930e3fcd5e5b0956f56ca24e58e5a243964b1  gcc-4.8.1-piepatches-v0.5.6.tar.bz2
+sha256sums="09dc2276c73424bbbfda1dbddc62bbbf900c9f185acf7f3e1d773ce2d7e3cdc8  gcc-4.8.2.tar.bz2
 f6c7cb99beead66dd4d06f7004c5731a9360330cbe878ce79792c618e008eed2  gcc-4.4.3-specs-0.2.0.tar.bz2
 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781  ecj-latest.jar
+8dee116f723861166cfd137d5cc457e0c11fb2be8b1271e199b41e02bf70a102  01_all_gcc48_configure.patch
+f301cce95609650f57c5212b38daf5288b4e7c5fa37ae2892664d4c8ceaadfbf  02_all_gcc48_config.in.patch
+13418c6acf689c82caf512a3edac8c7c6db0488a43ba7b914e39c12721dcfba9  03_all_gcc48_Makefile.in.patch
+5fbe104dedff59b5faf9f11a51ea31b26913e8baa23fc724fc0238a4ef03b4e9  05_all_gcc48_gcc.c.patch
+40a54195784bb613a27724518b6d6f1dc5475c47acccdade43cc1707d331f7f9  16_all_gcc47_nopie_option.patch
+776d0843a86571544b36cfc58eb4ee476bc689b3cfbf61f4a903ff60a271c849  20_all_gcc46_config_crtbeginp.patch
+38c9f4fdbf25a2e032a99f85d1a6428dd446ecc0ec3b9df7078ae61afecd368f  24_all_gcc44_invoke.texi.patch
+150f17367d7f514fda9e0aac283e059b190a2251d7d9dfa2b5686b2bdc67b725  34_all_gcc48_config_i386.patch
+48e22b2794ae70985c418832f7845814d65e78abcf56d38205db4b760a1c5ffa  35_all_gcc48_config_arm.patch
+5ecd7153106f36c607ae55c7a2db67849725a41afcb9454b9cca1b7f4982d4a8  40_all_gcc48_config_esp.patch
 ce7774aa13be5da274220258772ccbdd6f54abdad97a3798ba282865c809f042  12_all_default-warn-trampolines.patch
 8b1450d5a7756af2b890588005690785a663601e2b1533671b609aa8cce0f718  15_all_libgfortran-Werror.patch
 1f106fe03cede7c697bde7d81732e0d3bb2c7197e4967789182a5fd8db532900  16_all_libgomp-Werror.patch
@@ -693,7 +716,7 @@ da6bbb5dc654d5e1df8ecae5c9ebb56265426c405931f14f5878248b8c79f78d  51_all_libiber
 53184f842477569973c232dac7c85e71b0018cbe5c4962f95dd9e0273f42083e  uclibc-getipinfo.patch
 89207a8b62137a857ee2c43499d6b5247d37b530d1338844dbb330a6846b2ad2  gcc-4.6-pr32219.patch
 f3863b997acf8fdf5ad1d3626b41a8a0670b896505e9b7afb517916c7599fb1c  gcc-4.8-dynamic-linker.patch
-847075eb79c94e062ab8fb566f3bbea007875e2fde6fe2ddf51a18e731796a67  gcc-4.8-musl.patch
+fffdcf25b71526be739685f927ab0d66c72afff34ec54dc147ba62b262935007  gcc-4.8-musl.patch
 151c11c3303233e6ff06e27aa6dc889140bc46a7b5e4870587c40e37d36ede2c  gcc-4.8-musl-fix-iteratephdr.patch
 80b76ca30dcaf07481ab102869d741f044c7e5235f462182bc27467baacda9a4  gcc-4.8-musl-libssp.patch
 02751ccf223dcfc898c0ce2214cd0859d275e90b742f1a66e38db5c50f94b38c  boehm-gc-uclibc.patch
@@ -709,10 +732,19 @@ ca0db7f59e7af0c621751eee9e3775d4c00c4b663f82f9e04c53a2efb16edca1  ada-fixes.patc
 324524490c60d84ef040f79589e0f93fbaeb253dbe031484afaf963b881047e9  ada-crossbuild.patch
 d6c7fc1820a4fa285297c299c255fe2f19ce1695486f20edd098252a97545e6a  ada-shared.patch
 f20c34f3e0a1bf717f5e22fd66b57c8b69f0411d063203c017ed8209f349e1d4  ada-musl.patch"
-sha512sums="1becc874aad77a469069b6d9da4158aae9e013e24afa9364fe4feff9a5094d0673ee7694b3840e892c860f73a56b3ece6174338a8214438c42b9f86dd6c35ea7  gcc-4.8.1.tar.bz2
-274e16ef5136348415898d4e5a3bc71763078de8ae7c18645e8b07f54d705609b08c0efadbdb55117fdfb5f6490529b446d09def448174c2747372829d029a9d  gcc-4.8.1-piepatches-v0.5.6.tar.bz2
+sha512sums="2a3927481707b3bb7171076b596d9b69084edac82460df6fb35395592dd1e8fc5665577702ca746d5b454dec68b1c4e31b9de6adc9865d482f4b8736ec648b10  gcc-4.8.2.tar.bz2
 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517  gcc-4.4.3-specs-0.2.0.tar.bz2
 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e  ecj-latest.jar
+da16931bd0103388991cfc932540a1641ee3b81c10184baefa1e6a90061f0910efedc1118e45eb4a65a34965315d12a3ff2802a2058b31c8f57fa4f3655f8eee  01_all_gcc48_configure.patch
+21770259c7916e55568027926e4a543eea468b04436cc61c28f749be5a6635c48e68b7924a8eb19a76733a9d2f00921ba06faddaedbf14b1cdad5ab1810cc6c6  02_all_gcc48_config.in.patch
+42d791f94a91c059ab6f200e071b02355f87e974c15cb9a7c44edd4a18818469d86044d460021bb1dbb79742e51a4c19cfe2e570bb57ad27a85dd0cdf2fbe8de  03_all_gcc48_Makefile.in.patch
+e98cc321d71e5bb62c6116b30ed6f11044bda440e238026a83dec63f04a0587440bdae50ec211b07976fcd9deb329f9dd1dac1317dae5003088a8a8bddbb97c1  05_all_gcc48_gcc.c.patch
+98a4da3137177c5cad7dd7d35ad39cd416aa36f07867714e09ab8c0d8b759d2659063aa87b16ac1b708a283afd2ac54e20b327a32d1147720996d7bc11dcbd63  16_all_gcc47_nopie_option.patch
+b0dd448e25d4ca8313eb2004b2bb020d5e1c0ff51d347686312625d1102093ba95a3b1267b4ec10bb67f93d62c793f07aa6b6f71bbfd3443d25911ee3f9759fa  20_all_gcc46_config_crtbeginp.patch
+5d3f5ea46eef4cdbb3172c65b17dcf55acf936c9319177a7958ac283ea3651f5e00a76da3ee323bc39302210add36861329f085ba54c737f2942c19dd243b7d5  24_all_gcc44_invoke.texi.patch
+dd5b9b30eb7716cb3c010ca79a83ed6219ff6e6f2557deb4e1d26cecac0f2b14c4ef7bf4dc5c2aec88aae5463763f5f64454b8a627ebd1d0a5c92984017025ad  34_all_gcc48_config_i386.patch
+8829f85323d8b11e26e3c19ced4a51875fc63f1483cfdc4d0f579a6cb37e1b6e23fcf33a87a574a6e0007250374ea46d117a136e73a40fbe43f0e39d9b2dd1a8  35_all_gcc48_config_arm.patch
+3d7c39d35c10e155c835ef07400490aa17fa3913350b2b8c668af882f645f579b25d1de65ed8da9dd7b935091e029c3e7e7cc6c6da95dcf63e94c8f21706aad5  40_all_gcc48_config_esp.patch
 5069e4b741488913a646a9b5d871af8e7f7a606158ea09305d0ddd46257c5b659770627bc2ca3abeaae039da1717b3ba6c9cd90554a441da74eb4ecf24c13074  12_all_default-warn-trampolines.patch
 c18a99b7303a734fe4dca9d4e90e21d18e5bd71c7d91e1a26c86b1354c73f567590a875941bfe64ce59f0393023b91c606c96b30885c55b98a790c3ab0c84ca7  15_all_libgfortran-Werror.patch
 433404fd9bfa172d69fff4a5505e8648cbbbf5f052d2b4235608ff7af0c4063d557d25d80c85c5bd0d1e1ed64b568e7bbc0cdbce11cc74db4c0189af3a01634a  16_all_libgomp-Werror.patch
@@ -728,7 +760,7 @@ d08d7ead2de0429e5c9055d5b029ec2be9a8c821d22cecaf9b51f633652c493333f98963d9267fa2
 e3edf75df1f27af8771bd263e1bd607f6207c4eb5b2a5e11032577deba43ea201825e3b5008a720105f24e49d2821dd77a61c7ceba7ed91b3621c0dbd9292fc6  uclibc-getipinfo.patch
 9fc5e32f2573ae67b6cf22119d636d10a47c42718635bceff7d457a93a3f664ae1ed10e154f70964ba2d26b0de04f879a8c05de6411112760d40433373dd0a80  gcc-4.6-pr32219.patch
 db84b6582950378116723116be4f277881f7bdd05add216c58c2b86c0fb3a70abeb7798507a74a64b9b949d5b311167bd4df84a048d2d2d32f5836ea1d34c42e  gcc-4.8-dynamic-linker.patch
-12871b62d31a8e524547f2f0b37e711bae027aaadc487d893f8dc4cef2c2fee09f5c558cd7e1d28e0c687bc3be0465d1088c5ef7b87e8ac43ac06d86dc455761  gcc-4.8-musl.patch
+334a474af73a9c43301c1fbe354cfaa97a0a532409f84a8404ca1b18af89319581e8779c0eac04801e9243e382bfc6869a1925335c998998a2a8a031583e6d64  gcc-4.8-musl.patch
 b5b0210dfaccfe0b06f0a9090666b1fae2a3faa4140b7930146b29531f0da9beb1f2c1f7e7bc2bd29179f9fe05dc30e246e96220b8ff75a90f75e8350c9058a1  gcc-4.8-musl-fix-iteratephdr.patch
 e6d9b103c128e5d4eca515b1496d78b05708de770597c883daddd95ea41e77b5ef1be613b989357cc870a7efd9e43b011022c2d302e7056cff7b69e764906ff2  gcc-4.8-musl-libssp.patch
 e1d6a450dfb40b134ad7f759c4c10174d2490b0093fe47cb33479245f26a3a8c54ebcf6255943c0ccfcb5095600d1c05e530baeed35609c8ffe75caac8e57c49  boehm-gc-uclibc.patch