config.gcc: Adjust order of makefile fragments for mingw targets.

2010-01-31  Kai Tietz  <kai.tietz@onevision.com>

        * config.gcc: Adjust order of makefile fragments for mingw targets.

From-SVN: r156406

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d91b75e9a2d40b623f28e63a2ef04bb5001ccec2..00d2b295edc4122b577699bc76f5074966e7f782 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-31  Kai Tietz  <kai.tietz@onevision.com>
+
+       * config.gcc: Adjust order of makefile fragments for mingw targets.
+
 2010-01-31  Richard Guenther  <rguenther@suse.de>
 
        PR middle-end/42898

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 3b61af42debdc32266a452b46804bc9b90ed951e..9c18adf5ef0f4af295659407813236d43e008ee0 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1335,7 +1335,6 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
        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
@@ -1355,7 +1354,6 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
                        fi
                        ;;
                *)
-                       tmake_file="${tmake_file} i386/t-mingw32"
                        ;;
        esac
        tm_file="${tm_file} i386/mingw-stdint.h"
@@ -1366,6 +1364,14 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
                tmake_eh_file="i386/t-sjlj-eh"
        fi
        tmake_file="${tmake_file} ${tmake_eh_file} i386/t-cygming"
+        case ${target} in
+               *-w64-*)
+                               tmake_file="${tmake_file} i386/t-mingw-w64"
+                       ;;
+               *)
+                               tmake_file="${tmake_file} i386/t-mingw32"
+                       ;;
+       esac
        target_gtfiles="\$(srcdir)/config/i386/winnt.c"
        extra_options="${extra_options} i386/cygming.opt i386/mingw.opt"
        case ${target} in