Skip to content

R
riscv-gcc-1
Commit 8e9bf55e by Richard Henderson Committed by Richard Henderson
Options

Makefile.in (libgcc.a, [...]): Depend on FPBIT and DPBIT. 

        * Makefile.in (libgcc.a, stmp-multilib): Depend on FPBIT and DPBIT.
        * mklibgcc.in: Rewrite to not use functions.  Don't shortcut
        dependancies on FPBIT and DPBIT.

From-SVN: r33834
parent ebfe71a8
Showing with 60 additions and 71 deletions
gcc/ChangeLog
2000-05-10 Richard Henderson <rth@cygnus.com>
* Makefile.in (libgcc.a, stmp-multilib): Depend on FPBIT and DPBIT.
* mklibgcc.in: Rewrite to not use functions. Don't shortcut
dependancies on FPBIT and DPBIT.
2000-05-10 Nick Clifton <nickc@redhat.com> 2000-05-10 Nick Clifton <nickc@redhat.com>
* flow.c (find_auto_inc): Do not bias REG_N_REFS by loop_depth * flow.c (find_auto_inc): Do not bias REG_N_REFS by loop_depth
......
gcc/Makefile.in
...@@ -972,7 +972,7 @@ libgcc.mk: config.status Makefile mklibgcc $(LIB2ADD) ...@@ -972,7 +972,7 @@ libgcc.mk: config.status Makefile mklibgcc $(LIB2ADD)
$(SHELL) mklibgcc > tmp-libgcc.mk $(SHELL) mklibgcc > tmp-libgcc.mk
$(SHELL) $(srcdir)/move-if-change tmp-libgcc.mk libgcc.mk $(SHELL) $(srcdir)/move-if-change tmp-libgcc.mk libgcc.mk
libgcc.a: libgcc2.ready libgcc.mk libgcc.a: libgcc2.ready libgcc.mk $(FPBIT) $(DPBIT)
$(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \ $(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \
HOST_PREFIX="$(HOST_PREFIX)" HOST_PREFIX_1="$(HOST_PREFIX_1)" \ HOST_PREFIX="$(HOST_PREFIX)" HOST_PREFIX_1="$(HOST_PREFIX_1)" \
AR_FOR_TARGET="$(AR_FOR_TARGET)" \ AR_FOR_TARGET="$(AR_FOR_TARGET)" \
...@@ -1003,7 +1003,7 @@ s-mlib: $(srcdir)/genmultilib Makefile ...@@ -1003,7 +1003,7 @@ s-mlib: $(srcdir)/genmultilib Makefile
touch s-mlib touch s-mlib
# Build multiple copies of libgcc.a, one for each target switch. # Build multiple copies of libgcc.a, one for each target switch.
stmp-multilib: libgcc2.ready libgcc.mk stmp-multilib: libgcc2.ready libgcc.mk $(FPBIT) $(DPBIT)
$(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \ $(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \
HOST_PREFIX="$(HOST_PREFIX)" HOST_PREFIX_1="$(HOST_PREFIX_1)" \ HOST_PREFIX="$(HOST_PREFIX)" HOST_PREFIX_1="$(HOST_PREFIX_1)" \
AR_FOR_TARGET="$(AR_FOR_TARGET)" \ AR_FOR_TARGET="$(AR_FOR_TARGET)" \
......
gcc/mklibgcc.in
...@@ -47,57 +47,19 @@ EOF ...@@ -47,57 +47,19 @@ EOF
fi fi
# # Build lines.
# Utility functions
# gcc_compile='$(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES)'
oldcc_compile='$(OLDCC) -DIN_LIBGCC1 $(CCLIBFLAGS) $(INCLUDES)'
emit_gcc_compile() { make_compile='$(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \
dst=$1; shift AR_FOR_TARGET="$(AR_FOR_TARGET)" \
src=$1; shift AR_CREATE_FOR_TARGET="$(AR_CREATE_FOR_TARGET)" \
flags=$* AR_EXTRACT_FOR_TARGET="$(AR_EXTRACT_FOR_TARGET)" \
AR_FLAGS_FOR_TARGET="$(AR_FLAGS_FOR_TARGET)" \
echo ' $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES)' \ CC="$(CC)" CFLAGS="$(CFLAGS)" \
$flags -c $src -o $dst HOST_PREFIX="$(HOST_PREFIX)" \
} HOST_PREFIX_1="$(HOST_PREFIX_1)" \
LANGUAGES="$(LANGUAGES)"'
emit_oldcc_compile() {
dst=$1; shift
src=$1; shift
flags=$*
if [ -z "@NO_MINUS_C_MINUS_O@" ]; then
echo ' $(OLDCC) -DIN_LIBGCC1 $(CCLIBFLAGS) $(INCLUDES)' \
$flags -c $src -o $dst
else
echo ' $(OLDCC) -DIN_LIBGCC1 $(CCLIBFLAGS) $(INCLUDES)'
$flags -c $src
tmp=`echo $src | sed -e 's/[.]c$/'${objext}/ -e 's,.*/,,'`
echo " mv $tmp $dst"
fi
}
emit_make_compile() {
dst=$1; shift
tgt=$1; shift
tmp="";
if [ "$1" = "T=t" ]; then
tmp="T=t"; tgt="t$tgt"; shift
fi
flags=$*
echo ' $(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)"' \\
echo ' AR_FOR_TARGET="$(AR_FOR_TARGET)"' \\
echo ' AR_CREATE_FOR_TARGET="$(AR_CREATE_FOR_TARGET)"' \\
echo ' AR_EXTRACT_FOR_TARGET="$(AR_EXTRACT_FOR_TARGET)"' \\
echo ' AR_FLAGS_FOR_TARGET="$(AR_FLAGS_FOR_TARGET)"' \\
echo ' CC="$(CC)" CFLAGS="$(CFLAGS)"' \\
echo ' HOST_PREFIX="$(HOST_PREFIX)"' \\
echo ' HOST_PREFIX_1="$(HOST_PREFIX_1)"' \\
echo ' LANGUAGES="$(LANGUAGES)"' \\
echo ' LIBGCC2_CFLAGS="$(LIBGCC2_CFLAGS)' $flags '" ' \\
echo ' MULTILIB_CFLAGS="'$flags'"' $tmp $tgt
echo " mv ${tgt} ${dst}"
}
# Dependancies for libgcc1.c # Dependancies for libgcc1.c
libgcc1_c_dep='$(srcdir)/libgcc1.c $(CONFIG_H)' libgcc1_c_dep='$(srcdir)/libgcc1.c $(CONFIG_H)'
...@@ -106,7 +68,7 @@ libgcc1_c_dep='$(srcdir)/libgcc1.c $(CONFIG_H)' ...@@ -106,7 +68,7 @@ libgcc1_c_dep='$(srcdir)/libgcc1.c $(CONFIG_H)'
libgcc2_c_dep='$(srcdir)/libgcc2.c $(CONFIG_H) $(MACHMODE_H) longlong.h frame.h gbl-ctors.h config.status stmp-int-hdrs tsystem.h' libgcc2_c_dep='$(srcdir)/libgcc2.c $(CONFIG_H) $(MACHMODE_H) longlong.h frame.h gbl-ctors.h config.status stmp-int-hdrs tsystem.h'
# Dependancies for fp-bit.c # Dependancies for fp-bit.c
fpbit_c_dep='$(srcdir)/config/fp-bit.c config.status tsystem.h' fpbit_c_dep='config.status tsystem.h'
# #
# Build libgcc1 components. # Build libgcc1 components.
...@@ -130,8 +92,8 @@ case X"$LIBGCC1" in ...@@ -130,8 +92,8 @@ case X"$LIBGCC1" in
out="libgcc/${dir}/${name}${objext}" out="libgcc/${dir}/${name}${objext}"
echo ${out}: '$(srcdir)/config/$(LIB1ASMSRC)' echo ${out}: '$(srcdir)/config/$(LIB1ASMSRC)'
emit_gcc_compile $out '$(srcdir)/config/$(LIB1ASMSRC)' \ echo " $gcc_compile" $flags -DL$name -xassembler-with-cpp \
$flags -DL$name -xassembler-with-cpp -c '$(srcdir)/config/$(LIB1ASMSRC)' -o $out
done done
libgcc1_objs="$libgcc1_objs ${name}${objext}" libgcc1_objs="$libgcc1_objs ${name}${objext}"
done done
...@@ -142,7 +104,14 @@ case X"$LIBGCC1" in ...@@ -142,7 +104,14 @@ case X"$LIBGCC1" in
out="libgcc/${name}${objext}" out="libgcc/${name}${objext}"
echo $out: $libgcc1_c_dep echo $out: $libgcc1_c_dep
emit_oldcc_compile $out '$(srcdir)/libgcc1.c' -DL${name} if [ -z "@NO_MINUS_C_MINUS_O@" ]; then
echo " $oldcc_compile" $flags -c $src -o $dst
else
echo " $oldcc_compile" $flags -c $src
tmp=`echo $src | sed -e 's/[.]c$/'${objext}/ -e 's,.*/,,'`
echo " mv $tmp $dst"
fi
libgcc1_objs="$libgcc1_objs ${name}${objext}" libgcc1_objs="$libgcc1_objs ${name}${objext}"
done done
...@@ -155,7 +124,15 @@ case X"$LIBGCC1" in ...@@ -155,7 +124,15 @@ case X"$LIBGCC1" in
echo " cp $file ${name}.s" echo " cp $file ${name}.s"
file=${name}.s file=${name}.s
fi fi
emit_oldcc_compile $out $file
if [ -z "@NO_MINUS_C_MINUS_O@" ]; then
echo " $oldcc_compile" -c $file -o $out
else
echo " $oldcc_compile" -c $file
tmp=`echo $src | sed -e 's/[.][cs]$/'${objext}/ -e 's,.*/,,'`
echo " mv $tmp $dst"
fi
libgcc1_objs="$libgcc1_objs ${name}${objext}" libgcc1_objs="$libgcc1_objs ${name}${objext}"
done done
;; ;;
...@@ -178,8 +155,8 @@ for name in $LIB2FUNCS; do ...@@ -178,8 +155,8 @@ for name in $LIB2FUNCS; do
out="libgcc/${dir}/${name}${objext}" out="libgcc/${dir}/${name}${objext}"
echo $out: $libgcc2_c_dep echo $out: $libgcc2_c_dep
emit_gcc_compile $out '$(srcdir)/libgcc2.c' '$(MAYBE_USE_COLLECT2)' \ echo " $gcc_compile" '$(MAYBE_USE_COLLECT2)' $flags -DL$name \
$flags -DL$name -c '$(srcdir)/libgcc2.c' -o $out
done done
libgcc2_objs="$libgcc2_objs ${name}${objext}" libgcc2_objs="$libgcc2_objs ${name}${objext}"
done done
...@@ -191,8 +168,8 @@ for name in $LIB2FUNCS_EH; do ...@@ -191,8 +168,8 @@ for name in $LIB2FUNCS_EH; do
out="libgcc/${dir}/${name}${objext}" out="libgcc/${dir}/${name}${objext}"
echo $out: $libgcc2_c_dep echo $out: $libgcc2_c_dep
emit_gcc_compile $out '$(srcdir)/libgcc2.c' '$(MAYBE_USE_COLLECT2)' \ echo " $gcc_compile" '$(MAYBE_USE_COLLECT2)' -fexceptions \
-fexceptions $flags -DL$name $flags -DL$name -c '$(srcdir)/libgcc2.c' -o $out
done done
libgcc2_objs="$libgcc2_objs ${name}${objext}" libgcc2_objs="$libgcc2_objs ${name}${objext}"
done done
...@@ -204,9 +181,9 @@ if [ "$FPBIT" ]; then ...@@ -204,9 +181,9 @@ if [ "$FPBIT" ]; then
flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`;
out="libgcc/${dir}/${name}${objext}" out="libgcc/${dir}/${name}${objext}"
echo $out: $fpbit_c_dep echo $out: $FPBIT $fpbit_c_dep
emit_gcc_compile $out '$(srcdir)/config/fp-bit.c' \ echo " $gcc_compile" -DFINE_GRAINED_LIBRARIES $flags -DL$name \
-DFLOAT -DFINE_GRAINED_LIBRARIES $flags -DL$name -c $FPBIT -o $out
done done
libgcc2_objs="$libgcc2_objs ${name}${objext}" libgcc2_objs="$libgcc2_objs ${name}${objext}"
done done
...@@ -219,9 +196,9 @@ if [ "$DPBIT" ]; then ...@@ -219,9 +196,9 @@ if [ "$DPBIT" ]; then
flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`;
out="libgcc/${dir}/${name}${objext}" out="libgcc/${dir}/${name}${objext}"
echo $out: $fpbit_c_dep echo $out: $DPBIT $fpbit_c_dep
emit_gcc_compile $out '$(srcdir)/config/fp-bit.c' \ echo " $gcc_compile" -DFINE_GRAINED_LIBRARIES $flags -DL$name \
-DFINE_GRAINED_LIBRARIES $flags -DL$name -c $DPBIT -o $out
done done
libgcc2_objs="$libgcc2_objs ${name}${objext}" libgcc2_objs="$libgcc2_objs ${name}${objext}"
done done
...@@ -245,7 +222,10 @@ for file in $LIB2ADD; do ...@@ -245,7 +222,10 @@ for file in $LIB2ADD; do
# target file. This because ./$f is used as a temporary in # target file. This because ./$f is used as a temporary in
# each case before being moved to libgcc/$dir/. # each case before being moved to libgcc/$dir/.
echo $out: $lastout echo $out: $lastout
emit_make_compile $out $f $flags echo " $make_compile" \\
echo ' LIBGCC2_CFLAGS="$(LIBGCC2_CFLAGS)' $flags '" ' \\
echo ' MULTILIB_CFLAGS="'$flags'"' $f
echo " mv $f $out"
lastout="$out" lastout="$out"
done done
...@@ -262,7 +242,7 @@ for file in $LIB2ADD; do ...@@ -262,7 +242,7 @@ for file in $LIB2ADD; do
fi fi
echo $out: $file echo $out: $file
emit_gcc_compile $out $file $flags echo " $gcc_compile" $flags -c $file -o $out
done done
libgcc2_objs="$libgcc2_objs ${oname}${objext}" libgcc2_objs="$libgcc2_objs ${oname}${objext}"
fi fi
...@@ -319,7 +299,10 @@ for f in $EXTRA_MULTILIB_PARTS; do ...@@ -319,7 +299,10 @@ for f in $EXTRA_MULTILIB_PARTS; do
# target file. This because ./$f is used as a temporary in # target file. This because ./$f is used as a temporary in
# each case before being moved to libgcc/$dir/. # each case before being moved to libgcc/$dir/.
echo $out: $lastout echo $out: $lastout
emit_make_compile $out $f T=t $flags echo " $make_compile" \\
echo ' LIBGCC2_CFLAGS="$(LIBGCC2_CFLAGS)' $flags '" ' \\
echo ' MULTILIB_CFLAGS="'$flags'"' T=t t$f
echo " mv t$f $out"
all="$all $out" all="$all $out"
lastout="$out" lastout="$out"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment