From 8f5730b99779f7d34559c2715de46010698c2b7e Mon Sep 17 00:00:00 2001
From: Eric Botcazou <ebotcazou@adacore.com>
Date: Fri, 26 Sep 2008 08:33:04 +0000
Subject: [PATCH] re PR ada/5911 (Support for multilib in Ada)

	PR ada/5911
	* gcc-interface/Makefile.in (SPARC/Solaris): Add multilib support.

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

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index e5a43b2..7ecdc2c 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-26  Eric Botcazou  <ebotcazou@adacore.com>
+
+	PR ada/5911
+	* gcc-interface/Makefile.in (SPARC/Solaris): Add multilib support.
+
 2008-09-25  Samuel Tardieu  <sam@rfc1149.net>
 
 	PR ada/37641
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index 59803ca..dc43f48 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -763,9 +763,17 @@ ifeq ($(strip $(filter-out sparc% sun solaris%,$(targ))),)
   system.ads<system-solaris-sparcv9.ads
 
   ifeq ($(strip $(filter-out sparc sun solaris%,$(targ))),)
-    LIBGNAT_TARGET_PAIRS = $(LIBGNAT_TARGET_PAIRS_32)
+    ifeq ($(strip $(MULTISUBDIR)),/sparcv9)
+      LIBGNAT_TARGET_PAIRS = $(LIBGNAT_TARGET_PAIRS_64)
+    else
+      LIBGNAT_TARGET_PAIRS = $(LIBGNAT_TARGET_PAIRS_32)
+    endif
   else
-    LIBGNAT_TARGET_PAIRS = $(LIBGNAT_TARGET_PAIRS_64)
+    ifeq ($(strip $(MULTISUBDIR)),/sparcv7)
+      LIBGNAT_TARGET_PAIRS = $(LIBGNAT_TARGET_PAIRS_32)
+    else
+      LIBGNAT_TARGET_PAIRS = $(LIBGNAT_TARGET_PAIRS_64)
+    endif
   endif
 
   TOOLS_TARGET_PAIRS=mlib-tgt-specific.adb<mlib-tgt-specific-solaris.adb
-- 
2.7.4