From 43c059a5d0515258edd46b64f46c6fe42e3ad797 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 15 May 2014 13:25:29 +0200
Subject: [PATCH] cross-arm-linux-gnueabihf: switch to gcc-4.9.0.

---
 srcpkgs/cross-arm-linux-gnueabihf/template | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index a3f133b0f3..3ea18cb56f 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -1,7 +1,7 @@
 # Template build file for 'cross-arm-linux-gnueabihf'
 #
 _binutils_version=2.24
-_gcc_version=4.7.3
+_gcc_version=4.9.0
 _glibc_version=2.19
 _linux_version=3.10.6
 
@@ -11,7 +11,7 @@ _archflags="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
 _CROSS_SYSROOT="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.15
+version=0.16
 revision=1
 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -24,7 +24,7 @@ distfiles="
  http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_linux_version}.tar.xz"
 checksum="
  e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137 
- 2f7c37eb4fc14422ff2358a9ef59c974a75ab41204ef0e49fc34ab1d8981a9c3
+ b9b047a97bade9c1c89970bc8e211ff57b7b8998a1730a80a653d329f8ed1257
  2d3997f588401ea095a0b27227b1d50cdfdd416236f6567b564549d3b46ea2a2
  ed4dfd9f56b7c82e9c71331bbf8d2ea01ddfddc1b6209bd3f3c8640aa24065cf"
 
@@ -97,7 +97,8 @@ _gcc_bootstrap() {
 		--target=${_triplet} --without-headers \
 		--disable-nls --disable-shared --disable-libquadmath \
 		--disable-decimal-float --disable-libgomp --disable-libmudflap \
-		--disable-libssp --disable-threads --enable-languages=c \
+		--disable-libssp --disable-libitm --disable-libatomic \
+		--disable-threads --enable-languages=c \
 		--disable-sjlj-exceptions --disable-multilib \
 		--with-gnu-ld --with-gnu-as ${_fpuflags}
 
@@ -152,7 +153,7 @@ _glibc_build() {
 	export CFLAGS="-Os -pipe ${_archflags}"
 
 	../glibc-${_glibc_version}/configure \
-		--host=${_triplet} --prefix=/usr \
+		--host=${_triplet} --prefix=/usr --libdir=/usr/lib \
 		--with-headers=${_CROSS_SYSROOT}/usr/include \
 		--config-cache --enable-add-ons=nptl,ports \
 		--enable-obsolete-rpc --disable-profile \
@@ -184,14 +185,18 @@ _gcc_build() {
 	fi
 	
 	../gcc-${_gcc_version}/configure \
-		--target=${_triplet} --prefix=/usr \
+		--target=${_triplet} --prefix=/usr --libdir=/usr/lib \
 		--with-sysroot=${_CROSS_SYSROOT} --enable-languages=c,c++,lto \
 		--with-gnu-as --with-gnu-ld --disable-multilib \
 		--disable-nls --disable-sjlj-exceptions \
 		--enable-threads=posix --enable-long-longx \
 		--enable-shared --enable-linker-build-id \
 		--enable-gnu-unique-object --enable-lto \
-		--enable-libstdcxx-time ${_fpuflags}
+		--disable-libquadmath --disable-libatomic \
+		--disable-libssp --disable-libmudflap \
+		--disable-libsanitizer --disable-libcilkrts \
+		--disable-libitm --disable-libvtv --disable-libstdcxx-pch \
+		--enable-libstdcxx-time --with-linker-hash-style=gnu ${_fpuflags}
 
 	make ${makejobs}