Changlog libcpp

[pf3gnuchains/gcc-fork.git] / gcc / config.gcc

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 0e3d52b..0002563 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -373,12 +373,6 @@ then
 fi
 
 case ${target} in
-i[34567]86-w64-*)
-       tm_file="i386/biarch32.h ${tm_file}"
-       ;;
-esac
-
-case ${target} in
 i[34567]86-*-*)
        if test "x$enable_cld" = xyes; then
                tm_defines="${tm_defines} USE_IX86_CLD=1"
@@ -1319,11 +1313,35 @@ i[34567]86-*-pe | i[34567]86-*-cygwin*)
 i[34567]86-*-mingw* | x86_64-*-mingw*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygming.h i386/mingw32.h"
        xm_file=i386/xm-mingw32.h
+       case ${target} in
+               x86_64-*-* | *-w64-*)
+                       need_64bit_hwint=yes
+                       ;;
+               *)
+                       ;;
+       esac
        # This makes the logic if mingw's or the w64 feature set has to be used
        case ${target} in
                *-w64-*)
                        tm_file="${tm_file} i386/mingw-w64.h"
                        tmake_file="${tmake_file} i386/t-mingw-w64"
+                       if test x$enable_targets = xall; then
+                               tm_defines="${tm_defines} TARGET_BI_ARCH=1"
+                               case X"${with_cpu}" in
+                               Xgeneric|Xatom|Xcore2|Xnocona|Xx86-64|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx)
+                                       ;;
+                               X)
+                                       if test x$with_cpu_64 = x; then
+                                               with_cpu_64=generic
+                                       fi
+                                       ;;
+                               *)
+                                       echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 1>&2
+                                       echo "generic atom core2 nocona x86-64 amdfam10 barcelona k8 opteron athlon64 athlon-fx" 1>&2
+                                       exit 1
+                                       ;;
+                               esac
+                       fi
                        ;;
                *)
                        tmake_file="${tmake_file} i386/t-mingw32"