From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 5 Apr 2002 08:23:36 +0000 (+0200)
Subject: mklibgcc.in: Use separate libgcc.map for each multilib.
X-Git-Tag: releases/gcc-3.3.0~5872
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f785b7c763375ba3ca78f123e9c2900b8f6a706;p=thirdparty%2Fgcc.git

mklibgcc.in: Use separate libgcc.map for each multilib.

	* mklibgcc.in: Use separate libgcc.map for each multilib.
	* Makefile.in (distclean): Don't remove libgcc.map here.

From-SVN: r51914
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c4cb7d602749..c8d55cf48cd9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-05  Jakub Jelinek  <jakub@redhat.com>
+
+	* mklibgcc.in: Use separate libgcc.map for each multilib.
+	* Makefile.in (distclean): Don't remove libgcc.map here.
+
 2002-04-05  Jakub Jelinek  <jakub@redhat.com>
 
 	* Makefile.in (s-mlib): Handle --disable-multilib by separate
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 6041a7f42c36..fb73a8a95a3e 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2481,7 +2481,7 @@ distclean: clean $(INTL_DISTCLEAN) lang.distclean
 	-rm -f testsuite/{gcc,g++}.{log,sum}
 	-rm -f intl/libintl.h libintl.h
 	-rm -f cxxmain.c
-	-rm -f mklibgcc libgcc.map gccbug .gdbinit configargs.h
+	-rm -f mklibgcc gccbug .gdbinit configargs.h
 	-rm -f gcov.pod
 	-rm -f fixinc/Makefile
 	-rmdir ada cp f java objc fixinc intl po 2>/dev/null
diff --git a/gcc/mklibgcc.in b/gcc/mklibgcc.in
index a69f3489a70d..546ee3e05feb 100644
--- a/gcc/mklibgcc.in
+++ b/gcc/mklibgcc.in
@@ -257,8 +257,8 @@ for ml in $MULTILIBS; do
     libgcc_st_objs="$libgcc_st_objs libgcc/${dir}/$o"
   done
 
-  if [ "$SHLIB_LINK" -a "$SHLIB_MKMAP" -a -z "$mapfile" ]; then
-    mapfile="libgcc.map"
+  if [ "$SHLIB_LINK" -a "$SHLIB_MKMAP" ]; then
+    mapfile="libgcc/${dir}/libgcc.map"
     echo ""
     echo "${mapfile}: $SHLIB_MKMAP $SHLIB_MAPFILES $libgcc_sh_objs"
     echo '	{ $(NM_FOR_TARGET)'" $SHLIB_NM_FLAGS $libgcc_sh_objs; echo %%; cat $SHLIB_MAPFILES; } | "'$(AWK)'" -f $SHLIB_MKMAP $SHLIB_MKMAP_OPTS > "'tmp-$@'