diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2002-04-05 10:23:36 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2002-04-05 10:23:36 +0200 |
| commit | 1f785b7c763375ba3ca78f123e9c2900b8f6a706 (patch) | |
| tree | 7a8a1802495f4ec8a4b38c345489de89afead813 | |
| parent | 4d2fb38b47c7ab90614536f4b29932f0e65bf26e (diff) | |
| download | gcc-1f785b7c763375ba3ca78f123e9c2900b8f6a706.zip gcc-1f785b7c763375ba3ca78f123e9c2900b8f6a706.tar.gz gcc-1f785b7c763375ba3ca78f123e9c2900b8f6a706.tar.bz2 | |
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
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/Makefile.in | 2 | ||||
| -rw-r--r-- | gcc/mklibgcc.in | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c4cb7d6..c8d55cf 100644 --- 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 --- 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 --- 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-$@' |