OSDN Git Service

2009-10-30 Kai Tietz <kai.tietz@onevision.com>
authorktietz <ktietz@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 30 Oct 2009 16:47:40 +0000 (16:47 +0000)
committerktietz <ktietz@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 30 Oct 2009 16:47:40 +0000 (16:47 +0000)
        * configure.ac: Disable target-winsup & co for
        x86_64-*-mingw* and *-w64-mingw* targets.
        * configure: Regenerated.

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

ChangeLog
configure
configure.ac

index 7c9bcf6..02367b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-30  Kai Tietz  <kai.tietz@onevision.com>
+
+       * configure.ac: Disable target-winsup & co for
+       x86_64-*-mingw* and *-w64-mingw* targets.
+       * configure: Regenerated.
+
 2009-10-16  Nick Clifton  <nickc@redhat.com>
 
        * MAINTAINERS: Add myself as a maintainer for the RX port.
index 4af7b47..7b068a1 100755 (executable)
--- a/configure
+++ b/configure
@@ -3509,12 +3509,14 @@ case "${target}" in
     # if the --with-newlib option has been given, because otherwise
     # 'target-newlib' will appear in skipdirs.
     ;;
-  i[3456789]86-*-mingw32*)
+  i[3456789]86-w64-mingw*)
+    noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}"
+    ;;
+  i[3456789]86-*-mingw*)
     target_configdirs="$target_configdirs target-winsup"
     noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}"
     ;;
   x86_64-*-mingw*)
-    target_configdirs="$target_configdirs target-winsup"
     noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}"
     ;;
   *-*-cygwin*)
@@ -7859,6 +7861,8 @@ case " $target_configdirs " in
   ;;
 esac
 case "$target" in
+x86_64-*-mingw* | *-w64-mingw*)
+  ;;
 *-mingw*)
   # Can't be handled as Cygwin above since Mingw does not use newlib.
   FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup/mingw -L$$r/$(TARGET_SUBDIR)/winsup/w32api/lib -isystem $$s/winsup/mingw/include -isystem $$s/winsup/w32api/include' ;;
index 7fdf357..36774a4 100644 (file)
@@ -741,12 +741,14 @@ case "${target}" in
     # if the --with-newlib option has been given, because otherwise
     # 'target-newlib' will appear in skipdirs.
     ;;
-  i[[3456789]]86-*-mingw32*)
+  i[[3456789]]86-w64-mingw*)
+    noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}"
+    ;;
+  i[[3456789]]86-*-mingw*)
     target_configdirs="$target_configdirs target-winsup"
     noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}"
     ;;    
   x86_64-*-mingw*)
-    target_configdirs="$target_configdirs target-winsup"
     noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}"
     ;;    
   *-*-cygwin*)
@@ -3015,6 +3017,8 @@ case " $target_configdirs " in
   ;;
 esac
 case "$target" in
+x86_64-*-mingw* | *-w64-mingw*)
+  ;;
 *-mingw*)
   # Can't be handled as Cygwin above since Mingw does not use newlib.
   FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup/mingw -L$$r/$(TARGET_SUBDIR)/winsup/w32api/lib -isystem $$s/winsup/mingw/include -isystem $$s/winsup/w32api/include' ;;