From f7a750308a43de50996115ea2008c52cbee1703f Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Mon, 14 Jun 2010 01:34:43 +0200
Subject: [PATCH] config/path: - use i686 as default cpu type - disable use of
 fast-math support - build with -Os - dont use -mtune - use $TARGET_CPU as
 -march - dont use -fwhole-program flag

---
 config/path | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/config/path b/config/path
index 234ccdcb68..ee0d357748 100644
--- a/config/path
+++ b/config/path
@@ -17,11 +17,11 @@ esac
 if [ -z "$TARGET_CPU" ]; then
   case $TARGET_ARCH in
     i386)
-      TARGET_CPU=generic
+      TARGET_CPU=i686
       ;;
 
     x86_64)
-      TARGET_CPU=generic
+      TARGET_CPU=i686
       ;;
   esac
 fi
@@ -79,7 +79,8 @@ XORG_PATH_DRIVERS=/usr/lib/xorg/modules/drivers
 TOOLCHAIN_LANGUAGES=c
 [ "$TOOLCHAIN_CXX" = yes ] && TOOLCHAIN_LANGUAGES=${TOOLCHAIN_LANGUAGES},c++
 
-[ "$OPTIMIZATIONS" = speed ] && GCC_OPTIM="-Os -ffast-math $PROJECT_CFLAGS" || GCC_OPTIM="-Os"
+#[ "$OPTIMIZATIONS" = speed ] && GCC_OPTIM="-O3 -ffast-math $PROJECT_CFLAGS" || GCC_OPTIM="-Os"
+[ "$OPTIMIZATIONS" = speed ] && GCC_OPTIM="-Os $PROJECT_CFLAGS" || GCC_OPTIM="-Os"
 
 TARGET_CC=${TARGET_PREFIX}gcc
 TARGET_CXX=${TARGET_PREFIX}g++
@@ -91,19 +92,19 @@ TARGET_RANLIB=${TARGET_PREFIX}ranlib
 TARGET_OBJCOPY=${TARGET_PREFIX}objcopy
 TARGET_STRIP=${TARGET_PREFIX}strip
 TARGET_CPPFLAGS=
-TARGET_CFLAGS="$GCC_OPTIM -Wall -pipe -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -mtune=$TARGET_CPU"
+TARGET_CFLAGS="$GCC_OPTIM -Wall -pipe -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
 TARGET_CXXFLAGS="$TARGET_CFLAGS"
 TARGET_LDFLAGS=
 TARGET_PKG_CONFIG_PATH="$SYSROOT_PREFIX/usr/lib/pkgconfig"
 
 case $TARGET_ARCH in
     i386)
-     TARGET_CFLAGS="$TARGET_CFLAGS -march=$TARGET_FAMILY -m32"
-     TARGET_CXXFLAGS="$TARGET_CXXFLAGS -march=$TARGET_FAMILY -m32"
+     TARGET_CFLAGS="$TARGET_CFLAGS -march=$TARGET_CPU -m32"
+     TARGET_CXXFLAGS="$TARGET_CXXFLAGS -march=$TARGET_CPU -m32"
      ;;
     x86_64)
-     TARGET_CFLAGS="$TARGET_CFLAGS -fPIC -m64"
-     TARGET_CXXFLAGS="$TARGET_CXXFLAGS -fPIC -m64"
+     TARGET_CFLAGS="$TARGET_CFLAGS -fPIC -march=$TARGET_CPU -m64"
+     TARGET_CXXFLAGS="$TARGET_CXXFLAGS -fPIC -march=$TARGET_CPU -m64"
      ;;
 esac
 
@@ -130,7 +131,7 @@ if [ "$OPTIMIZATIONS" = speed -a "$DEBUG" != yes ]; then
   TARGET_CXXFLAGS="$TARGET_CFLAGS"
 
   TARGET_LDFLAGS="$TARGET_LDFLAGS -flto"
-  TARGET_LDFLAGS="$TARGET_LDFLAGS -fwhole-program"
+#  TARGET_LDFLAGS="$TARGET_LDFLAGS -fwhole-program"
   TARGET_LDFLAGS="$TARGET_LDFLAGS -fuse-linker-plugin"
   TARGET_LDFLAGS="$TARGET_LDFLAGS -fuse-ld=gold"
   TARGET_LDFLAGS="$TARGET_LDFLAGS -Wl,--as-needed"