+Sat May 20 08:45:41 2000 H.J. Lu <hjl@gnu.org>
+
+ * Makefile.in (libgcc.mk): Depend on xgcc$(exeext) for
+ GCC_FOR_TARGET used by MULTILIBS.
+ * mklibgcc.in: Make sure each .o file depends on the
+ directory it will be in.
+ Make the multilib directory depends libgcc.
+
Sat May 20 08:29:28 2000 H.J. Lu <hjl@gnu.org>
* Makefile.in (bootstrap): Unset LANG_LIB2FUNCS for stage 1.
flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`;
out="libgcc/${dir}/${name}${objext}"
- echo ${out}: '$(srcdir)/config/$(LIB1ASMSRC)'
+ if [ $dir = . ]; then
+ libgccdir="libgcc"
+ else
+ libgccdir="libgcc/${dir}"
+ fi
+ echo ${out}: ${libgccdir} '$(srcdir)/config/$(LIB1ASMSRC)'
echo " $gcc_compile" $flags -DL$name -xassembler-with-cpp \
-c '$(srcdir)/config/$(LIB1ASMSRC)' -o $out
done
flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`;
out="libgcc/${dir}/${name}${objext}"
- echo $out: $libgcc2_c_dep
+ if [ $dir = . ]; then
+ libgccdir="libgcc"
+ else
+ libgccdir="libgcc/${dir}"
+ fi
+ echo $out: $libgccdir $libgcc2_c_dep
echo " $gcc_compile" '$(MAYBE_USE_COLLECT2)' $flags -DL$name \
-c '$(srcdir)/libgcc2.c' -o $out
done
flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`;
out="libgcc/${dir}/${name}${objext}"
- echo $out: $libgcc2_c_dep
+ if [ $dir = . ]; then
+ libgccdir="libgcc"
+ else
+ libgccdir="libgcc/${dir}"
+ fi
+ echo $out: $libgccdir $libgcc2_c_dep
echo " $gcc_compile" '$(MAYBE_USE_COLLECT2)' -fexceptions \
$flags -DL$name -c '$(srcdir)/libgcc2.c' -o $out
done
flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`;
out="libgcc/${dir}/${name}${objext}"
- echo $out: $FPBIT $fpbit_c_dep
+ if [ $dir = . ]; then
+ libgccdir="libgcc"
+ else
+ libgccdir="libgcc/${dir}"
+ fi
+ echo $out: $libgccdir $FPBIT $fpbit_c_dep
echo " $gcc_compile" -DFINE_GRAINED_LIBRARIES $flags -DL$name \
-c $FPBIT -o $out
done
flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`;
out="libgcc/${dir}/${name}${objext}"
- echo $out: $DPBIT $fpbit_c_dep
+ if [ $dir = . ]; then
+ libgccdir="libgcc"
+ else
+ libgccdir="libgcc/${dir}"
+ fi
+ echo $out: $libgccdir $DPBIT $fpbit_c_dep
echo " $gcc_compile" -DFINE_GRAINED_LIBRARIES $flags -DL$name \
-c $DPBIT -o $out
done
flags="$flags -xassembler-with-cpp"
fi
- echo $out: $file
+ if [ $dir = . ]; then
+ libgccdir="libgcc"
+ else
+ libgccdir="libgcc/${dir}"
+ fi
+ echo $out: $libgccdir $file
echo " $gcc_compile" $flags -c $file -o $out
done
libgcc2_objs="$libgcc2_objs ${oname}${objext}"
echo ""
all=""
+echo "libgcc:; -mkdir libgcc"
for ml in $MULTILIBS; do
dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'`
- if [ $dir = . ]; then
- echo "libgcc:; mkdir libgcc"
- all="$all libgcc"
- else
- echo "${dir}:; mkdir ${dir}"
- echo "libgcc/${dir}:; mkdir libgcc/${dir}"
- all="$all libgcc/${dir} ${dir}"
+ if [ $dir != . ]; then
+ echo "libgcc/${dir}: libgcc; -mkdir libgcc/${dir}"
fi
all="$all ${dir}/libgcc.a"
done