aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorKai Tietz <kai.tietz@onevision.com>2010-01-31 17:05:08 +0000
committerKai Tietz <ktietz@gcc.gnu.org>2010-01-31 18:05:08 +0100
commit8370a62af8eab46ee68fa072db3d2b55d6ce607c (patch)
tree742f7ce0f3035ee710c038bec4affae23054944b /gcc
parent61c7cbf8e5502fe6da677581d5c151193049d850 (diff)
downloadgcc-8370a62af8eab46ee68fa072db3d2b55d6ce607c.zip
gcc-8370a62af8eab46ee68fa072db3d2b55d6ce607c.tar.gz
gcc-8370a62af8eab46ee68fa072db3d2b55d6ce607c.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/config.gcc10
2 files changed, 12 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d91b75e..00d2b29 100644
--- 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 3b61af4..9c18adf 100644
--- 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