# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1393975459 -3600
# Node ID b357bbf78c7b036f92a8d13a9b07791b2ed1aa65
# Parent  818b7f937fcfa241227fa3772314d6f743efb48b
Improve CFLAGS and cross tools build

diff -r 818b7f937fcf -r b357bbf78c7b cook
--- a/cook	Tue Mar 04 19:42:17 2014 +0100
+++ b/cook	Wed Mar 05 00:24:19 2014 +0100
@@ -1132,7 +1132,7 @@
 				flags="-Os -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp -pipe"
 				host="$ARCH-slitaz-linux-gnueabi" ;;
 			x86_64)
-				flags="-march=nocona -O2 -pipe"
+				flags="-02 -march=generic -pipe"
 				host="$ARCH-slitaz-linux" ;;
 		esac
 		sed -i \
diff -r 818b7f937fcf -r b357bbf78c7b cross
--- a/cross	Tue Mar 04 19:42:17 2014 +0100
+++ b/cross	Wed Mar 05 00:24:19 2014 +0100
@@ -95,7 +95,7 @@
 # Some arch may need custom CFLAGS to build Glibc/Eglibc
 init_cflags() {
 	case "$ARCH" in
-		arm|armv6) export CFLAGS="-march=armv6 -O2" ;;
+		arm|armv6) export CFLAGS="-O2 -march=armv6" ;;
 		armv6hf) export CFLAGS="-O2 -march=armv6j -mfpu=vfp -mfloat-abi=hard" ;;
 		armv7) export CFLAGS="-Os -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp -pipe" ;;
 	esac
@@ -221,7 +221,7 @@
 			mv glibc-ports-$GLIBC_VERSION glibc-$GLIBC_VERSION/ports
 			libexec=/usr/lib/glibc ;;
 		x86_64)
-			#export CFLAGS="-march=nocona -O2 -pipe"
+			#export CFLAGS="-02 -march=generic -pipe"
 			ccflags="-m64"
 			libexec=/usr/lib64/glibc ;;
 	esac
diff -r 818b7f937fcf -r b357bbf78c7b data/cross-arm.conf
--- a/data/cross-arm.conf	Tue Mar 04 19:42:17 2014 +0100
+++ b/data/cross-arm.conf	Wed Mar 05 00:24:19 2014 +0100
@@ -1,5 +1,7 @@
 # SliTaz Cross Toolchain configuration file
 #
+# ARM v6
+#
 
 # Main settings
 ARCH=arm
diff -r 818b7f937fcf -r b357bbf78c7b data/cross-armv6hf.conf
--- a/data/cross-armv6hf.conf	Tue Mar 04 19:42:17 2014 +0100
+++ b/data/cross-armv6hf.conf	Wed Mar 05 00:24:19 2014 +0100
@@ -22,4 +22,5 @@
 BINUTILS_ARGS="--enable-shared"
 EGLIBC_ARGS="--enable-add-ons --with-tls"
 GCC_STATIC_ARGS="--enable-languages=c"
-GCC_FINAL_ARGS="--enable-languages=c,c++ --with-float=hard"
+GCC_FINAL_ARGS="--enable-languages=c,c++ \
+	--with-arch=armv6 --with-fpu=vfp --with-float=hard"
diff -r 818b7f937fcf -r b357bbf78c7b data/cross-x86_64.conf
--- a/data/cross-x86_64.conf	Tue Mar 04 19:42:17 2014 +0100
+++ b/data/cross-x86_64.conf	Wed Mar 05 00:24:19 2014 +0100
@@ -1,6 +1,7 @@
 # SliTaz Cross Toolchain configuration file
 #
-# x86_64 cross tools settings
+# x86_64 architecture
+# CFLAGS="-02 -march=generic -pipe"
 #
 
 # Main settings