main/gcc: upgrade to gcc 6 snapshot 20160721

this includes additional arm fixes that fix u-boot compilation.

_pkgbase is expected to be the release tarball, and we have
cumulative diff to bring up to the snapshot.

gcc marks the snapshot releases as 6.1.1 too, so we use this
version for our packaging too. gcc -v reports:
  gcc version 6.1.1 20160721 (Alpine 6.1.1)

so the actual snapshot date is visible too. next release is
due to be 6.2.

1 files changed, 12 insertions, 23 deletions

diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index e149e2db90..63f3660f28 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -1,6 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gcc
-pkgver=6.1.0
+pkgver=6.1.1
+_pkgbase=6.1.0
 _cross=""
 [ "$BOOTSTRAP" = "noheaders" ] && pkgname="gcc-pass1"
 [ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
@@ -8,7 +9,7 @@ _cross=""
 	&& _cross="-$CTARGET"
 
 pkgname="$pkgname$_cross"
-pkgrel=4
+pkgrel=0
 pkgdesc="The GNU Compiler Collection"
 url="http://gcc.gnu.org"
 arch="all"
@@ -143,8 +144,9 @@ if $LANG_ADA; then
 	makedepends="$makedepends gcc-gnat"
 fi
 
-source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-$pkgver.tar.bz2
+source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-${_pkgbase:-$pkgver}.tar.bz2
 	ftp://sourceware.org/pub/java/ecj-4.9.jar
+	gcc-6-20160721.patch
 
 	001_all_default-ssp-strong.patch
 	002_all_default-relro.patch
@@ -171,7 +173,6 @@ source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-$pkgver.tar.bz2
 	libada-cross-shared.patch
 	gcc-4.9-musl-fortify.patch
 	gcc-6.1-musl-libssp.patch
-	gcc-6.1-71056-Don-t-use-vectorized-builtins-when-N.patch
 	boehm-gc-musl.patch
 	gcc-pure64.patch
 	fix-gcj-stdgnu14-link.patch
@@ -183,12 +184,10 @@ source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-$pkgver.tar.bz2
 	ada-fixes.patch
 	ada-shared.patch
 	ada-musl.patch
-
-	pr70839.patch
 	"
 
 # we build out-of-tree
-_gccdir="$srcdir"/gcc-$pkgver
+_gccdir="$srcdir"/gcc-${_pkgbase:-$pkgver}
 _gcclibdir=/usr/lib/gcc/${CTARGET}/$pkgver
 _gcclibexec=/usr/libexec/gcc/${CTARGET}/$pkgver
 
@@ -200,7 +199,6 @@ prepare() {
 		return 1
 	fi
 
-	# Gentoo, PIE and uclibc patches
 	_err=
 	for i in $source; do
 		case "$i" in
@@ -219,12 +217,6 @@ prepare() {
 		return 1
 	fi
 
-	# 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
-	sed -i gcc/Makefile.in -e 's|^build/genautomata$(build_exeext) .*|& -fno-PIC|' \
-		|| return 1
-
 	# see http://gcc.gnu.org/ml/java/2008-04/msg00027.html
 	mv "$srcdir"/ecj-*.jar ecj.jar
 
@@ -616,6 +608,7 @@ gnat() {
 
 md5sums="8fb6cb98b8459f5863328380fbf06bd1  gcc-6.1.0.tar.bz2
 7339f199ba11c941890031fd9981d7be  ecj-4.9.jar
+7b942873ee7e0df5dfdd8abe4eacff04  gcc-6-20160721.patch
 3634a8f58065805809273b105071c1f3  001_all_default-ssp-strong.patch
 28ca9eac639e88869ac975d593ff7a89  002_all_default-relro.patch
 b7235f279097e28295b6bbaa0804302f  003_all_default-fortify-source.patch
@@ -639,7 +632,6 @@ a7836fe20d35f91ddf623e3c62a920fe  205-nopie.patch
 246aef378ea9730d9bf97bc42fd392d2  libada-cross-shared.patch
 9e658e590bc51be611f39945183f6aa2  gcc-4.9-musl-fortify.patch
 32c40cd9c22a01621c2b7d60ac4255a0  gcc-6.1-musl-libssp.patch
-fad1bba965c4fd341eb027950d35111d  gcc-6.1-71056-Don-t-use-vectorized-builtins-when-N.patch
 0ea0f556d4ef9c260d1353b7fd33970c  boehm-gc-musl.patch
 3cb420ef6240a8b96f52fb1b479ddaab  gcc-pure64.patch
 1e143d6a88cdcbc4e3266b19208df0fd  fix-gcj-stdgnu14-link.patch
@@ -649,10 +641,10 @@ e17bbb0fe802974e20645b4182b4c410  fix-gcj-iconv-musl.patch
 4aea37d334ab00bb6bba37cd8c481367  fix-cxxflags-passing.patch
 d00d7e4b0c00cb7448576af9cd7fcea8  ada-fixes.patch
 20e2731c02ce50739ebdead2795f9c41  ada-shared.patch
-221773e09429ae2aba03780fb1089290  ada-musl.patch
-243bf5804799d2e70c4e51d3a6ca9d1a  pr70839.patch"
+221773e09429ae2aba03780fb1089290  ada-musl.patch"
 sha256sums="09c4c85cabebb971b1de732a0219609f93fc0af5f86f6e437fd8d7f832f1a351  gcc-6.1.0.tar.bz2
 9506e75b862f782213df61af67338eb7a23c35ff425d328affc65585477d34cd  ecj-4.9.jar
+3e2c8350a354b54d8f2ffb3db17d103adf7e45dd4bbe94620b25b3c63d839b28  gcc-6-20160721.patch
 deb22792f37e107d0afff5f4ea6b2a9fc9de4f48e1c7133bf658b6e0d057b1d6  001_all_default-ssp-strong.patch
 2c7fcbc3879cce0775e37306441110dc63e7f457e2e5ad890f6b0800eb520ef6  002_all_default-relro.patch
 611d3d101351c134d3c03f6d8265a90268cef71c682bf72e02a6cd2d99315ef8  003_all_default-fortify-source.patch
@@ -676,7 +668,6 @@ df92e2f03615c1591278c132cd38ee0ed2c576cd942d8ea751a44d0521057e6b  207-static-pie
 aa3e570f9ccd9dcaadf00369ed2c4ae26ba640c49256f32aee7e631e2b836771  libada-cross-shared.patch
 dc93f97dff28b872f9c7e241fb87a3eca0271f706534d196b3517781b05667fa  gcc-4.9-musl-fortify.patch
 4ece19529edb8e681e1778e977e2ba1d47984ccfcb82505e8b898bb29d659625  gcc-6.1-musl-libssp.patch
-2b61762aa8c5fe2f1fe896dfd2aaa3238235fb63842b04a4c79c0b6a0b92a3c5  gcc-6.1-71056-Don-t-use-vectorized-builtins-when-N.patch
 6ccca88695ef84c0d038cd315cad5ae5b799672ecb009fdaab34e68ba60b733c  boehm-gc-musl.patch
 0625ab76ec3f7b47364becdb9ddc66bec9215ebfbeab1d58df8e1855a1cd76bb  gcc-pure64.patch
 c03165e7ce812c93a33fdb0893847b4f9eb892e353d32d85b23249610fb24396  fix-gcj-stdgnu14-link.patch
@@ -686,10 +677,10 @@ bd7a6f514fcc457f29e5fda157203f3bcd013aeba5d53b3459196eef3ce752ab  gcc-4.8-build-
 a395ba4cf047c48cac56985726fddf0948f4425c9f1a0c9ddba1812b2b3d8300  fix-cxxflags-passing.patch
 d2a67a7ae0304cd10532883df19923b98dbc9b7a24957b619d4a6e04f19c5507  ada-fixes.patch
 d6c7fc1820a4fa285297c299c255fe2f19ce1695486f20edd098252a97545e6a  ada-shared.patch
-23d99e94060972bb25de4687da88ecb4fce9a7f0afa4b71a05161246917cd75d  ada-musl.patch
-2c4836eeac884e96fbf35c01862820efd0ff08fa73b580e2747d457f761fe80e  pr70839.patch"
+23d99e94060972bb25de4687da88ecb4fce9a7f0afa4b71a05161246917cd75d  ada-musl.patch"
 sha512sums="eeed3e2018b8c012aabce419e8d718fde701e5c3c179b4486c61ba46e5736eecc8fccdd18b01fcd973a42c6ad3116dbbe2ee247fe3757d622d373f93ebaf8d2e  gcc-6.1.0.tar.bz2
 28f8c6fdbcb19e950b1d0bafb3bcc7a8cba87bc673aa6027cece116599cdee80f0cf5e95a1440544890239f5c754e8a93ab46d9daedd937faef445d7ea33b226  ecj-4.9.jar
+435ac5e2ec041c70c2508242dbdc3a56da9633bf0549fa9cd8c4e3aa4dfc9a02539bd4d81fba4f5c72eeda4f4c25c5b4998ae2f84ce5f64b4edf574833160b68  gcc-6-20160721.patch
 a1335adc2fbee98e36c4437ff2587771b98ed4180726779020f65039498235626a411cdb0100dbd20cd19d12f0d94f9a21af179ff624676c28cead9d60598b5d  001_all_default-ssp-strong.patch
 e36e95b81489163abd6fe9d58f7867bdca43e61143afacbfb17f4698c0b16ec5fd0061d8fab7b2ae615540bebd721c2e2227f80401b4e7fc253da9da62e6b513  002_all_default-relro.patch
 f86466c62b8291fac46f9c250c7ad8fa5ab7b1cce2504442fd07ddc4543665b317ae28951f244e39aba29aeaf3fff252ec4f6a147aa16adb2b7aed747dd89188  003_all_default-fortify-source.patch
@@ -713,7 +704,6 @@ d08d7ead2de0429e5c9055d5b029ec2be9a8c821d22cecaf9b51f633652c493333f98963d9267fa2
 497e73650b4e7ac1cc92158b993f543b1506d3af4f9df9cb1e9504af4db657a9fc6e4429b4cb2bf5b3c1c8c06a5cec5d8b19bc958fd57b92d7b4d5e58b34554c  libada-cross-shared.patch
 600fe5098dc54edaa9808fd5717af9dec058953f9ad37d49cfba1db4f7e9a7a8f02019342f75157fc575946fa693259422184de27b7ecc8386d9f3ecc0f7cc5d  gcc-4.9-musl-fortify.patch
 dbe0ee917fc7668571722364ab7c806731e3a31e8bfa30b4941b28b16b877d2a32b4a3897ef533399a28f82d43cac9b28e92de0493f0e779046db56584e07fa4  gcc-6.1-musl-libssp.patch
-df8ca05b82250977354d4677e5e90b3d597c77281ff697c699ef129fe1dbbccd39a736c9257405c76aaf4bc51ab9f128381e40ee72f163a771c7e1f52b15ad17  gcc-6.1-71056-Don-t-use-vectorized-builtins-when-N.patch
 bda845a6aa1854d2c883910b115f79ccfa93dfc2b5eac69a3a236d83eb34cadc140731d616ffc24698c7abc8878dd15f231bcc5119f1860e575a120b311706c7  boehm-gc-musl.patch
 cd94f7be10de7511b17355dbb6b86dc70919b4a41c8aec1d7c5961820248aa00cf1594ed66fdd412c12b02a94605600530f674b32ab4cbd0ca6456968475ecbb  gcc-pure64.patch
 2253941f3d19b6d08801d3782f5f5ed56c3b73fbc9d3561a8f01c702963ac4fab91599c686076e7081eb6a80c37ccd33591ae978996d6eee1dc0ce0f1c50259a  fix-gcj-stdgnu14-link.patch
@@ -723,5 +713,4 @@ abe9aaf9aa956058d0386a4396a511d176a46bb3906b90e952383646cdc158cbeb0a5dc616a1ccb1
 35d6d59f0b7b968f282f56767c9e0823a7bdc5aa0d450aca50fbd802649a7ca608b47671244a3faa208a9b0d6832cabb5a22724157dc817b2c0ad63d09f93282  fix-cxxflags-passing.patch
 9016b257abd8fa981de44a49512e35db814d1cbb47c1a87cd31c12d4ae20b13e9e149fe41691a7ec3c95bbcfde8a79194a8d2eaf547ceade3a246fad67c47dd8  ada-fixes.patch
 3f5bc334d9f73d06f5f7c876738d02356acdd08958bea0e4d2095ebf15c2c2ec4e411abdae0297505ae9a1699ca01b17338e853184e84663203b192b0d35fc19  ada-shared.patch
-a13c6acd864933bd7b12501686da57b09cbff9471c7f630f5bc9a92902a4006a9024a08ee41574707e4c232a754a21633ea89e0bb45dc0d5967e50b299ef6a5e  ada-musl.patch
-15f91fe67939e153ac096c4cc64600a457b637c9e8a96b0e691c89f2339821b0c7b32477e0f66bf27ed8650d5c5a7e9cbae4006ea4639a386d47bf66a8a1ecc7  pr70839.patch"
+a13c6acd864933bd7b12501686da57b09cbff9471c7f630f5bc9a92902a4006a9024a08ee41574707e4c232a754a21633ea89e0bb45dc0d5967e50b299ef6a5e  ada-musl.patch"