From 8c955737958425c4eee3dcd8a9cc32625b0112b3 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 9 Jul 2013 15:31:28 +0200
Subject: [PATCH] gcc: make armv6l default to armv6 with vfp; add defs for
 armv7l.

---
 srcpkgs/gcc/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 572e5d543cb..6992452cf1d 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -2,7 +2,7 @@
 pkgname=gcc
 _majorver=4.7
 version=${_majorver}.3
-revision=2
+revision=3
 short_desc="The GNU C Compiler"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://gcc.gnu.org"
@@ -11,7 +11,7 @@ distfiles="http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2"
 checksum=2f7c37eb4fc14422ff2358a9ef59c974a75ab41204ef0e49fc34ab1d8981a9c3
 
 hostmakedepends="perl flex"
-makedepends="zlib-devel gmp-devel mpfr-devel mpc-devel ppl-devel>=1.0 cloog-devel"
+makedepends="zlib-devel gmp-devel mpfr-devel mpc-devel ppl-devel>=1.0 cloog-devel isl-devel"
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	# Required stuff for multilib packages.
@@ -43,7 +43,9 @@ do_configure() {
 		_langs="c,c++,lto"
 		_args="--disable-multilib"
 		if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
-			_args+=" --with-float=hard"
+			_args+=" --with-arch=armv6 --with-fpu=vfp --with-float=hard"
+		elif [ "$XBPS_TARGET_MACHINE" = "armv7l" ]; then
+			_args+=" --with-arch=armv7-a --with-fpu=vfpv3-d16 --with-float=hard"
 		fi
 		_args+=" --host=$XBPS_CROSS_TRIPLET"
 	else
@@ -500,6 +502,6 @@ gcc-c++_package() {
 gcc_package() {
 	depends="binutils libgomp>=${_majorver} libitm>=${_majorver} libssp-devel>=${_majorver}"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }