diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 844bddf63626576abc8948fee1b8d89f0cfc092c..dacd274593de041a48c4d10338c7d8fa8e67622a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-17  Kai Tietz  <kai.tietz@onevision.com>
+
+       * config/i386/biarch32.h: New file.
+       * config.gcc: Add for target i386-w64-* the biarch32.h to tm_file.
+
 2009-05-17  Adam Nemet  <anemet@caviumnetworks.com>
 
 	* config/mips/mips.md (*zero_extend<mode>_trunchi,
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 35e8b4bcae6a54e222a6f823dc5252ced03a319a..e5ea2c0284b5037843c60ed8d0861ab5220c073c 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -370,6 +370,12 @@ then
 	extra_options="${extra_options} ${cpu_type}/${cpu_type}.opt"
 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
diff --git a/gcc/config/i386/biarch32.h b/gcc/config/i386/biarch32.h
new file mode 100644
index 0000000000000000000000000000000000000000..d4f186d6cb7d97dc7a2f37d6635e623fb1546713
--- /dev/null
+++ b/gcc/config/i386/biarch32.h
@@ -0,0 +1,29 @@
+/* Make configure files to produce biarch compiler defaulting to 32bit mode.
+   This file must be included very first, while the OS specific file later
+   to overwrite otherwise wrong defaults. 
+   Copyright (C) 2009 Free Software Foundation, Inc.
+   Contributed by Kai Tietz <kai.tietz@onevision.com>.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
+
+GCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+Under Section 7 of GPL version 3, you are granted additional
+permissions described in the GCC Runtime Library Exception, version
+3.1, as published by the Free Software Foundation.
+
+You should have received a copy of the GNU General Public License and
+a copy of the GCC Runtime Library Exception along with this program;
+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+<http://www.gnu.org/licenses/>.  */
+
+#define TARGET_64BIT_DEFAULT 0
+#define TARGET_BI_ARCH 1