From: ktietz <ktietz@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 12 Jun 2010 13:19:17 +0000 (+0000)
Subject: 2010-06-12  Kai Tietz
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d8d6578e31e978bb9e357cc5840f395da4846726;p=thirdparty%2Fgcc.git

2010-06-12  Kai Tietz

        PR ada/43731
        * gcc-interface/Makefile.in: Add rules for multilib x86/x64
        mingw targets.



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

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 828f031bb14b..83f9636e78c1 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-12  Kai Tietz
+
+	PR ada/43731
+	* gcc-interface/Makefile.in: Add rules for multilib x86/x64
+	mingw targets.
+
 2010-06-11  Alexandre Oliva  <aoliva@redhat.com>
 
 	* gcc-interface/utils.c (update_pointer_to): Initialize last.
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index 236903d48b95..8a3254fb438c 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -1637,11 +1637,21 @@ ifeq ($(strip $(filter-out cygwin32% mingw32% pe,$(osys))),)
     s-taprop.adb<s-taprop-mingw.adb
 
     ifeq ($(strip $(filter-out x86_64%,$(arch))),)
-      LIBGNAT_TARGET_PAIRS += \
-        system.ads<system-mingw-x86_64.ads
+      ifeq ($(strip $(MULTISUBDIR)),/32)
+	LIBGNAT_TARGET_PAIRS += \
+	  system.ads<system-mingw.ads
+      else
+	LIBGNAT_TARGET_PAIRS += \
+	  system.ads<system-mingw-x86_64.ads
+      endif
     else
-      LIBGNAT_TARGET_PAIRS += \
-        system.ads<system-mingw.ads
+      ifeq ($(strip $(MULTISUBDIR)),/64)
+	LIBGNAT_TARGET_PAIRS += \
+	  system.ads<system-mingw-x86_64.ads
+      else
+	LIBGNAT_TARGET_PAIRS += \
+	  system.ads<system-mingw.ads
+      endif
     endif
 
     EXTRA_GNATRTL_NONTASKING_OBJS = \