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

	* Makefile.in (distclean): Don't remove libgcc.map here.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@51914 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c4cb7d6..c8d55cf 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 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
        genmultilib invocation.
 

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 6041a7f..fb73a8a 100644 (file)
--- 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 a69f348..546ee3e 100644 (file)
--- 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-$@'