diff options
| author | H.J. Lu <hongjiu.lu@intel.com> | 2004-12-03 15:11:56 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl@gcc.gnu.org> | 2004-12-03 07:11:56 -0800 |
| commit | aaf67a14509df6d685d280b7be4ed0f0996fcbc5 (patch) | |
| tree | 0d8a8f9bb32e2a7ae4d568541aba4cf644989e64 | |
| parent | dafb7f3f52bbc30f565060d5d63bc93614a97806 (diff) | |
| download | gcc-aaf67a14509df6d685d280b7be4ed0f0996fcbc5.zip gcc-aaf67a14509df6d685d280b7be4ed0f0996fcbc5.tar.gz gcc-aaf67a14509df6d685d280b7be4ed0f0996fcbc5.tar.bz2 | |
mklibgcc.in: Put back the default set of EXTRA_MULTILIB_PART.
2004-12-03 H.J. Lu <hongjiu.lu@intel.com>
* mklibgcc.in: Put back the default set of EXTRA_MULTILIB_PART.
From-SVN: r91684
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/mklibgcc.in | 58 |
2 files changed, 32 insertions, 30 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 64f3579..94e8f94 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2004-12-03 H.J. Lu <hongjiu.lu@intel.com> + + * mklibgcc.in: Put back the default set of EXTRA_MULTILIB_PART. + 2004-12-03 Richard Sandiford <rsandifo@redhat.com> * configure.ac: Move TL_AC_GCC_VERSION into initialization section. diff --git a/gcc/mklibgcc.in b/gcc/mklibgcc.in index 916a0f5..cfef2bf 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 |