From 8263e17a8ce651cdaa48dbb725106ae56f3fe47d Mon Sep 17 00:00:00 2001
From: Tristan Gingold <gingold@adacore.com>
Date: Mon, 24 Oct 2011 10:01:42 +0000
Subject: [PATCH] Makefile.in: Use GNU ld switches to generate map files on
 AIX.

2011-10-16  Tristan Gingold  <gingold@adacore.com>

        * gcc-interface/Makefile.in: Use GNU ld switches to generate map files
        on AIX.

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

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 93e4e3e9807c..ff9396b71f82 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-16  Tristan Gingold  <gingold@adacore.com>
+
+	* gcc-interface/Makefile.in: Use GNU ld switches to generate map files
+	on AIX.
+
 2011-10-24  Ed Schonberg  <schonberg@adacore.com>
 
 	* sem_ch12.adb (Earlier): make available globally. If both
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index 160a15e013cd..f2247d0f3430 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -1401,16 +1401,19 @@ ifeq ($(strip $(filter-out ibm aix%,$(manu) $(osys))),)
 	ppc64)
     LIBGNAT_TARGET_PAIRS = \
     $(LIBGNAT_TARGET_PAIRS_COMMON) $(LIBGNAT_TARGET_PAIRS_64)
+    TOOLS_TARGET_PAIRS = \
+    indepsw.adb<indepsw-aix.adb
   else
     LIBGNAT_TARGET_PAIRS = \
     $(LIBGNAT_TARGET_PAIRS_COMMON) $(LIBGNAT_TARGET_PAIRS_32)
+    TOOLS_TARGET_PAIRS = \
+    indepsw.adb<indepsw-gnu.adb
   endif
 
   THREADSLIB = -lpthreads
   EH_MECHANISM=-gcc
-  TOOLS_TARGET_PAIRS = \
-  mlib-tgt-specific.adb<mlib-tgt-specific-aix.adb \
-  indepsw.adb<indepsw-aix.adb
+  TOOLS_TARGET_PAIRS += \
+  mlib-tgt-specific.adb<mlib-tgt-specific-aix.adb
 
   GMEM_LIB = gmemlib
 endif
-- 
2.47.2