[Patch, Ada, Darwin] fix-typos, restore x86-64-darwin10 multi-lib bootstrap.

[Iain Sandoe <developer at sandoe-acoustics dot co dot uk>]

There are a couple of typos in ada/gcc-infterface/Makefile.in that  
result in many fails of x86_64-darwin10 bootstrap for the m32 lib  
variant (thus breaking bootstrap with default switches)..

the attached removes a duplicated section of text and corrects the  
target variants.

OK for trunk?
Iain

ada:

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

diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/ 
Makefile.in
index 1afe6c0..4be366e 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -434,14 +434,6 @@ X86_TARGET_PAIRS = \
   g-bytswa.adb<g-bytswa-x86.adb \
   s-atocou.adb<s-atocou-x86.adb

-# Special version of units for x86 and x86-64 platforms.
-
-X86_TARGET_PAIRS = \
-  a-numaux.ads<a-numaux-x86.ads \
-  a-numaux.adb<a-numaux-x86.adb \
-  g-bytswa.adb<g-bytswa-x86.adb \
-  s-atocou.adb<s-atocou-x86.adb
-
 X86_64_TARGET_PAIRS = \
   a-numaux.ads<a-numaux-x86.ads \
   a-numaux.adb<a-numaux-x86.adb \
@@ -2213,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

Attachment: 178555-ada-darwin-makefile-typos-diff.txt
Description: Text document