From a1bf1ec79f45664fa35358fa37bcecddf068a02e Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iains@gcc.gnu.org>
Date: Tue, 6 Sep 2011 18:38:41 +0000
Subject: [PATCH] Makefile.in (x86_64 darwin arch): Adjust LIBGNAT_TARGET_PAIRS
 for x86 and x86_64 variants.

	* gcc-interface/Makefile.in (x86_64 darwin arch): Adjust
	LIBGNAT_TARGET_PAIRS for x86 and x86_64 variants.

From-SVN: r178605
---
 gcc/ada/ChangeLog                 |  5 +++++
 gcc/ada/gcc-interface/Makefile.in | 11 ++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index db43918f802..6cda14bdfa1 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-06  Iain Sandoe  <iains@gcc.gnu.org>
+
+	* gcc-interface/Makefile.in (x86_64 darwin arch): Adjust 
+	LIBGNAT_TARGET_PAIRS for x86 and x86_64 variants.
+
 2011-09-06  Arnaud Charlet  <charlet@adacore.com>
 
 	* gcc-interface/Makefile.in, gcc-interface/Make-lang.in
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index fe87cbf3ffb..bc95aff8d20 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -2205,15 +2205,16 @@ ifeq ($(strip $(filter-out darwin%,$(osys))),)
     s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
     g-trasym.ads<g-trasym-unimplemented.ads \
     g-trasym.adb<g-trasym-unimplemented.adb \
-    $(ATOMICS_TARGET_PAIRS) \
-    $(X86_64_TARGET_PAIRS) \
-    system.ads<system-darwin-x86_64.ads
+    $(ATOMICS_TARGET_PAIRS)
+
     ifeq ($(strip $(MULTISUBDIR)),/i386)
       LIBGNAT_TARGET_PAIRS += \
-      system.ads<system-darwin-x86.ads
+        $(X86_TARGET_PAIRS) \
+        system.ads<system-darwin-x86.ads
     else
       LIBGNAT_TARGET_PAIRS += \
-      system.ads<system-darwin-x86_64.ads
+        $(X86_64_TARGET_PAIRS) \
+        system.ads<system-darwin-x86_64.ads
     endif
   endif
 
-- 
2.30.2