2010-05-13 Kai Tietz <kai.tietz@onevision.com>

        * config.gcc (i[34567]86-*-mingw* | x86_64-*-mingw*): Choose
        t-mingw-w64 or t-mingw-w32 for multilib configuration.
        * config/i386/t-mingw-w32: New.
        * config/i386/t-mingw-w64 (MULTILIB_OSDIRNAMES): Change lib64 to lib.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159364 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 116ef8e9868230cb6b73efebff2953ed4b7eac04..c65ea2314873f0e456b60d808574f214b191d5a7 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-13  Kai Tietz  <kai.tietz@onevision.com>
+
+       * config.gcc (i[34567]86-*-mingw* | x86_64-*-mingw*): Choose
+       t-mingw-w64 or t-mingw-w32 for multilib configuration.
+       * config/i386/t-mingw-w32: New.
+       * config/i386/t-mingw-w64 (MULTILIB_OSDIRNAMES): Change lib64 to lib.
+       
 2010-05-13  Martin Jambor  <mjambor@suse.cz>
 
        * gimple.c (gimple_fold_obj_type_ref): Removed (a replacement moved to

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 5ea1b4d580207b0723b337e2a72da87669d99b82..21433fc690a1e753658683441d69dd63e7bf82b6 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1373,9 +1373,12 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
        fi
        tmake_file="${tmake_file} ${tmake_eh_file} i386/t-cygming"
         case ${target} in
-               *-w64-*)
+               x86_64-w64-*)
                                tmake_file="${tmake_file} i386/t-mingw-w64"
                        ;;
+              i[34567]86-w64-*)
+                       tmake_file="${tmake_file} i386/t-mingw-w32"
+                       ;;
                *)
                                tmake_file="${tmake_file} i386/t-mingw32"
                        ;;

diff --git a/gcc/config/i386/t-mingw-w32 b/gcc/config/i386/t-mingw-w32
new file mode 100644 (file)
index 0000000..62d6330
--- /dev/null
+++ b/gcc/config/i386/t-mingw-w32
@@ -0,0 +1,12 @@
+# Match SYSTEM_INCLUDE_DIR
+NATIVE_SYSTEM_HEADER_DIR = /mingw/include
+
+MULTILIB_OPTIONS = m64/m32
+MULTILIB_DIRNAMES = 64 32
+MULTILIB_OSDIRNAMES = ../lib64 ../lib
+
+# MinGW-specific parts of LIB_SPEC
+SHLIB_LC = -lmingw32 -lmingwex -lmoldname -lmsvcrt -luser32 -lkernel32 -ladvapi32 -lshell32
+
+LIBGCC = stmp-multilib
+INSTALL_LIBGCC = install-multilib

diff --git a/gcc/config/i386/t-mingw-w64 b/gcc/config/i386/t-mingw-w64
index dbbe00a1d96c2f59a021d890a22c202886891cb1..b0106e5e64b922b8229c155706e4bc25a85458fb 100644 (file)
--- a/gcc/config/i386/t-mingw-w64
+++ b/gcc/config/i386/t-mingw-w64
@@ -3,7 +3,7 @@ NATIVE_SYSTEM_HEADER_DIR = /mingw/include
 
 MULTILIB_OPTIONS = m64/m32
 MULTILIB_DIRNAMES = 64 32
-MULTILIB_OSDIRNAMES = ../lib64 ../lib32
+MULTILIB_OSDIRNAMES = ../lib ../lib32
 
 # MinGW-specific parts of LIB_SPEC
 SHLIB_LC = -lmingw32 -lmingwex -lmoldname -lmsvcrt -luser32 -lkernel32 -ladvapi32 -lshell32