Reordered some CFLAGS and so on...

diff --git a/tools/make-constants b/tools/make-constants
index a0773cb642628b13d479b21880980a4f961a913a..11f466e1910a64b85deae52eada4d580c4cde1a6 100644 (file)
--- a/tools/make-constants
+++ b/tools/make-constants
@@ -92,50 +92,48 @@ else
 fi
 
 LINKER=/lib/ld-linux.so.2
-GLOBAL_CFLAGS="-pipe"
+GLOBAL_CFLAGS="-fomit-frame-pointer -fPIC -pipe -g"
 if [ 'i686' = $TARGET -o 'i586' = $TARGET \
        -o 'i486' = $TARGET ]; then
        MACHINE=${TARGET}
        IFS_TARGET="${MACHINE}-pc-linux-gnu"
-       CFLAGS="-O2 -march=${MACHINE} -fomit-frame-pointer $GLOBAL_CFLAGS"
+       CFLAGS="-O2 -march=${MACHINE} $GLOBAL_CFLAGS"
        CXXFLAGS="${CFLAGS}"
 elif [ 'atom' = $TARGET ]; then
        MACHINE=i686
        IFS_TARGET="${MACHINE}-atom-linux-gnu"
-       CFLAGS="-O2 -march=${MACHINE} -mmmx -msse -msse2 -msse3 -mssse3 -fomit-frame-pointer $GLOBAL_CFLAGS"
+       CFLAGS="-O2 -march=${MACHINE} $GLOBAL_CFLAGS -mmmx -msse -msse2 -msse3 -mssse3"
        CXXFLAGS="${CFLAGS}"
 elif [ 'core2duo' = $TARGET ]; then
        MACHINE=i686
        IFS_TARGET="${MACHINE}-c2d-linux-gnu"
-       CFLAGS="-O2 -march=pentium-m -msse2 $GLOBAL_CFLAGS"
+       CFLAGS="-O2 -march=pentium-m $GLOBAL_CFLAGS -msse2"
        CXXFLAGS="${CFLAGS}"
 elif [ 'via-c7' = $TARGET ]; then
        MACHINE=i686
        IFS_TARGET="${MACHINE}-via-linux-gnu"
-       CFLAGS="-O2 -march=${MACHINE} -mmmx -msse -msse2 -msse3 $GLOBAL_CFLAGS"
+       CFLAGS="-O2 -march=${MACHINE} $GLOBAL_CFLAGS -mmmx -msse -msse2 -msse3"
        CXXFLAGS="${CFLAGS}"
 elif [ 'via-c3' = $TARGET ]; then
        MACHINE=i586
        IFS_TARGET="${MACHINE}-via-linux-gnu"
-       CFLAGS="-O2 -march=c3 -m3dnow -fomit-frame-pointer $GLOBAL_CFLAGS"
+       CFLAGS="-O2 -march=c3 -m3dnow $GLOBAL_CFLAGS"
        CXXFLAGS="${CFLAGS}"
 elif [ 'geodelx' = $TARGET ]; then
        MACHINE=i586
        IFS_TARGET="${MACHINE}-geode-linux-gnu"
-       CFLAGS="-Os -march=geode -fomit-frame-pointer $GLOBAL_CFLAGS"
+       CFLAGS="-Os -march=geode $GLOBAL_CFLAGS"
        CXXFLAGS="${CFLAGS}"
 else
        beautify message FAIL
-       echo "Not a valid target arch (i686|i586|i486|via-c7|via-c3|geodelx) - $TARGET"
+       echo "Not a valid target arch ($POSSIBLE_TARGETS) - $TARGET"
        exit 1
 fi
 
 # Make debugging symbols
 if [ "$BUILD_DEBUG" == "1" ]; then
        CFLAGS=$(sed -e "s/-O[123s]/-O0/g" <<< $CFLAGS)
-       CFLAGS="$CFLAGS -g"
        CXXFLAGS=$(sed -e "s/-O[123s]/-O0/g" <<< $CXXFLAGS)
-       CXXFLAGS="$CXXFLAGS -g"
 fi
 
 # Define IMAGENAME