From aaf67a14509df6d685d280b7be4ed0f0996fcbc5 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 3 Dec 2004 15:11:56 +0000 Subject: [PATCH] mklibgcc.in: Put back the default set of EXTRA_MULTILIB_PART. 2004-12-03 H.J. Lu * mklibgcc.in: Put back the default set of EXTRA_MULTILIB_PART. From-SVN: r91684 --- gcc/ChangeLog | 4 ++++ gcc/mklibgcc.in | 58 ++++++++++++++++++++++++------------------------- 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 64f3579d61d..94e8f94c18e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2004-12-03 H.J. Lu + + * mklibgcc.in: Put back the default set of EXTRA_MULTILIB_PART. + 2004-12-03 Richard Sandiford * configure.ac: Move TL_AC_GCC_VERSION into initialization section. diff --git a/gcc/mklibgcc.in b/gcc/mklibgcc.in index 916a0f5e3f0..cfef2bfc2c4 100644 --- a/gcc/mklibgcc.in +++ b/gcc/mklibgcc.in @@ -666,36 +666,34 @@ for ml in $MULTILIBS; do # simultaneous goal targets, so that rules which cannot execute # simultaneously are properly serialized. - # We don't need to build the default ones since they have been - # built before we get here. - if [ $dir != "." ]; then - extra= - t=$dir/ - echo - for f in $EXTRA_MULTILIB_PARTS; do - out=$dir/$f - case $out in - # Prevent `make' from interpreting $out as a macro assignment - *'$(EQ)'*) targ="T_TARGET=$out T_TARGET" ;; - *) targ=$out ;; - esac - extra="$extra $targ" - done - - echo extra$suffix: stmp-dirs - echo " $make_compile" \\ - echo ' LIBGCC2_CFLAGS="$(LIBGCC2_CFLAGS)' $flags '" ' \\ - echo ' MULTILIB_CFLAGS="'$flags'"' T=$t $extra - echo "all: extra$suffix" - - # Make libunwind.so and libgcc_s.so depend on these, since they - # are likely to be implicitly used by the link process. - if [ "$libgcc_s_so" ]; then - echo "$libgcc_s_so: extra$suffix" - fi - if [ "$libunwind_so" ]; then - echo "$libunwind_so: extra$suffix" - fi + extra= + echo + for f in $EXTRA_MULTILIB_PARTS; do + case $dir in + .) out=$f ; t= ;; + *) out=$dir/$f ; t=$dir/ ;; + esac + case $out in + # Prevent `make' from interpreting $out as a macro assignment + *'$(EQ)'*) targ="T_TARGET=$out T_TARGET" ;; + *) targ=$out ;; + esac + extra="$extra $targ" + done + + echo extra$suffix: stmp-dirs + echo " $make_compile" \\ + echo ' LIBGCC2_CFLAGS="$(LIBGCC2_CFLAGS)' $flags '" ' \\ + echo ' MULTILIB_CFLAGS="'$flags'"' T=$t $extra + echo "all: extra$suffix" + + # Make libunwind.so and libgcc_s.so depend on these, since they + # are likely to be implicitly used by the link process. + if [ "$libgcc_s_so" ]; then + echo "$libgcc_s_so: extra$suffix" + fi + if [ "$libunwind_so" ]; then + echo "$libunwind_so: extra$suffix" fi fi -- 2.30.2