From 235732442bf07041164e4d6c8183d9a63568c423 Mon Sep 17 00:00:00 2001 From: zack Date: Thu, 17 May 2001 03:16:18 +0000 Subject: i * libgcc1-test.c, libgcc1.c, config/i386/perform.h: Delete file. * testsuite/gcc.dg/complete-port.c: New (revised version of libgcc1-test.c) * po/POTFILES.in: Remove libgcc1-test.c and libgcc1.c. * Makefile.in: Delete variables: OLDCC, CCLIBFLAGS, OLDAR, OLDAR_FLAGS, LIBGCC1, LIBGCC1_TEST, CROSS_LIBGCC1, LIB1FUNCS, and LIB1FUNCS_EXTRA. Delete rules: libgcc1-test, libgcc1-test.o. Clarify commentary now that libgcc1 no longer exists. * cross-make: Don't set LIBGCC1. * mklibgcc.in: Delete all code for building from libgcc1.c. Always honor LIB1ASMFUNCS if set. * crtstuff.c, floatlib.c, longlong.h, config/fp-bit.c, config/arc/lib1funcs.asm, config/arm/lib1funcs.asm, config/d30v/libgcc1.asm, config/fr30/lib1funcs.asm, config/h8300/lib1funcs.asm, config/i386/cygwin.asm, config/i386/uwin.asm, config/m68hc11/larith.asm, config/m68k/lb1sf68.asm, config/mcore/lib1.asm, config/mn10200/lib1funcs.asm, config/sh/lib1funcs.asm, config/sparc/lb1spc.asm, config/sparc/lb1spl.asm, config/v850/lib1funcs.asm, config/c4x/libgcc.S: Delete or update references to libgcc1 in commentary. * config/t-libc-ok, config/t-linux, config/t-linux-aout, config/t-netbsd, config/a29k/t-a29kbare, config/a29k/t-vx29k, config/alpha/t-interix, config/alpha/t-osf, config/alpha/t-vms, config/arc/t-arc, config/arm/t-arm-aout, config/arm/t-arm-coff, config/arm/t-arm-elf, config/arm/t-linux, config/arm/t-pe, config/arm/t-semi, config/arm/t-strongarm-coff, config/arm/t-strongarm-elf, config/arm/t-strongarm-pe, config/arm/t-xscale-coff, config/arm/t-xscale-elf, config/avr/t-avr, config/c4x/t-c4x, config/d30v/t-d30v, config/fr30/t-fr30, config/h8300/t-h8300, config/i386/t-beos, config/i386/t-cygwin, config/i386/t-i386elf, config/i386/t-interix, config/i386/t-netware, config/i386/t-next, config/i386/t-rtems-i386, config/i386/t-sol2, config/i960/t-960bare, config/i960/t-vxworks960, config/ia64/t-ia64, config/m32r/t-m32r, config/m68hc11/t-m68hc11-gas, config/m68k/t-lynx, config/m68k/t-m68kbare, config/m68k/t-m68kelf, config/m68k/t-mot3300-gald, config/m68k/t-mot3300-gas, config/m68k/t-next, config/m68k/t-vxworks68, config/m88k/t-bug, config/m88k/t-dgux, config/m88k/t-dgux-gas, config/m88k/t-dguxbcs, config/m88k/t-luna, config/m88k/t-luna-gas, config/m88k/t-m88k, config/m88k/t-m88k-gas, config/m88k/t-sysv4, config/mcore/t-mcore, config/mcore/t-mcore-pe, config/mips/t-bsd, config/mips/t-bsd-gas, config/mips/t-cross64, config/mips/t-ecoff, config/mips/t-elf, config/mips/t-iris6, config/mips/t-r3900, config/mips/t-svr3, config/mips/t-svr3-gas, config/mips/t-svr4, config/mips/t-svr4-gas, config/mips/t-ultrix, config/mn10200/t-mn10200, config/mn10300/t-mn10300, config/pa/t-linux, config/pa/t-linux64, config/pa/t-pa, config/pa/t-pa64, config/pa/t-pro, config/pdp11/t-pdp11, config/pj/t-pj, config/rs6000/t-aix43, config/rs6000/t-beos, config/rs6000/t-darwin, config/rs6000/t-newas, config/rs6000/t-ppccomm, config/rs6000/t-rs6000, config/sh/t-linux, config/sh/t-sh, config/sparc/t-chorus-elf, config/sparc/t-elf, config/sparc/t-sol2, config/sparc/t-sp86x, config/sparc/t-sparcbare, config/sparc/t-sparclite, config/sparc/t-splet, config/sparc/t-sunos41, config/sparc/t-vxsparc, config/sparc/t-vxsparc64, config/v850/t-v850: Don't set any of LIBGCC1, CROSS_LIBGCC1, or LIBGCC1_TEST. * config/alpha/alpha.h, config/i386/i386.h, config/i860/i860.h: Don't set FLOAT_VALUE_TYPE, FLOAT_ARG_TYPE, INTIFY, or FLOATIFY. * config/d30v/d30v.h: Don't mention LIBGCC_NEEDS_DOUBLE, FLOAT_VALUE_TYPE, FLOAT_ARG_TYPE, FLOATIFY, INTIFY, nongcc_SI_type, nongcc_word_type, or perform_* * config/i860/fx2800: Don't define perform_umodsi3 or perform_modsi3. * config/i386/386bsd.h, config/i386/beos-elf.h, config/i386/linux-aout.h, config/i386/linux-oldld.h, config/i386/linux.h, config/i386/mach.h, config/i386/netbsd.h, config/i386/openbsd.h, config/i386/osfrose.h, config/i386/rtemself.h: Don't include i386/perform.h. * config/a29k/t-a29k, config/arm/t-semiaof, config/i370/t-i370, config/i370/t-linux, config/i370/t-mvs, config/i370/t-oe, config/i386/t-djgpp, config/i386/t-i386bare, config/i386/t-vsta, config/ia64/t-hpux, config/mips/t-mips, config/mips/t-mips-gas, config/mips/t-osfrose, config/sparc/t-sp64, config/sparc/t-sunos40, config/vax/t-openbsd, config/vax/t-vax: Delete. * config.gcc: Remove references to deleted files. (arm-semi-aof): Use arm/t-semi for tmake_file. * gcc.texi, install.texi, invoke.texi, tm.texi: Delete or rewrite text which is no longer relevant now that libgcc1 no longer exists. * config/t-openbsd, config/alpha/t-interix, config/i386/t-interix: No need to set INSTALL_ASSERT_H. (Missed in previous sweep.) git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42188 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/mklibgcc.in | 117 +++++++++----------------------------------------------- 1 file changed, 18 insertions(+), 99 deletions(-) (limited to 'gcc/mklibgcc.in') diff --git a/gcc/mklibgcc.in b/gcc/mklibgcc.in index 4ec3af6560f..512529d9e9c 100644 --- a/gcc/mklibgcc.in +++ b/gcc/mklibgcc.in @@ -8,11 +8,7 @@ # of them, and positional args becomes quite ugly. # # objext -# OLDCC -# LIBGCC1 -# LIB1FUNCS # LIB1ASMFUNCS -# LIB1FUNCS_EXTRA # LIB2FUNCS # LIB2FUNCS_ST # LIB2ADD @@ -42,23 +38,6 @@ echo echo 'force:' echo -# Detect gcc as OLDCC. This indicates a target for which LIB1FUNCS -# is not needed. This is not quite the same as libgcc1.null, even -# on a target not using libgcc1-asm.a. - -if [ "@build_canonical@" = "@target@" ]; then - tmp="tmp-$$.c" - cat > $tmp < /dev/null 2>&1; then - LIB1FUNCS="" - fi - rm -f $tmp -fi - # Disable SHLIB_LINK if shared libgcc not enabled. if [ "@enable_shared@" = "no" ]; then SHLIB_LINK="" @@ -67,7 +46,6 @@ fi # Build lines. gcc_compile='$(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES)' -oldcc_compile='$(OLDCC) -DIN_LIBGCC1 $(CCLIBFLAGS) $(INCLUDES)' make_compile='$(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \ AR_FOR_TARGET="$(AR_FOR_TARGET)" \ AR_CREATE_FOR_TARGET="$(AR_CREATE_FOR_TARGET)" \ @@ -78,13 +56,10 @@ make_compile='$(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \ HOST_PREFIX_1="$(HOST_PREFIX_1)" \ LANGUAGES="$(LANGUAGES)"' -# Dependancies for libgcc1.c -libgcc1_c_dep='stmp-dirs $(srcdir)/libgcc1.c $(CONFIG_H)' - -# Dependancies for libgcc2.c +# Dependencies for libgcc2.c libgcc2_c_dep='stmp-dirs $(srcdir)/libgcc2.c $(CONFIG_H) $(MACHMODE_H) longlong.h gbl-ctors.h config.status stmp-int-hdrs tsystem.h'" $LIB2ADDEHDEP" -# Dependancies for fp-bit.c +# Dependencies for fp-bit.c fpbit_c_dep='stmp-dirs config.status tsystem.h' # @@ -93,76 +68,24 @@ fpbit_c_dep='stmp-dirs config.status tsystem.h' libgcc1_objs="" -case X"$LIBGCC1" in - Xlibgcc1.null | X) - ;; - - Xlibgcc1.cross) - echo "You must find a way to make libgcc1 components yourself" 1>&2 - ;; - - Xlibgcc1-asm.a) - for name in $LIB1ASMFUNCS; do - for ml in $MULTILIBS; do - dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'` - flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; - out="libgcc/${dir}/${name}${objext}" +for name in $LIB1ASMFUNCS; do + for ml in $MULTILIBS; do + dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'` + flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; + out="libgcc/${dir}/${name}${objext}" - echo ${out}: stmp-dirs '$(srcdir)/config/$(LIB1ASMSRC)' - echo " $gcc_compile" $flags -DL$name -xassembler-with-cpp \ + echo ${out}: stmp-dirs '$(srcdir)/config/$(LIB1ASMSRC)' + echo " $gcc_compile" $flags -DL$name -xassembler-with-cpp \ -c '$(srcdir)/config/$(LIB1ASMSRC)' -o $out - # Remove any objects from LIB2FUNCS that are defined as optimized - # assembly code in LIB1ASMFUNCS. - LIB2FUNCS=`echo $LIB2FUNCS | sed -e 's/^'$name' //' \ - -e 's/ '$name' / /' \ - -e 's/ '$name'$//'` - done - libgcc1_objs="$libgcc1_objs ${name}${objext}" - done - ;; - - Xlibgcc1.a) - for name in $LIB1FUNCS; do - out="libgcc/${name}${objext}" - - echo $out: $libgcc1_c_dep - if [ -z "@NO_MINUS_C_MINUS_O@" ]; then - echo " $oldcc_compile" -DL$name $flags -c '$(srcdir)/libgcc1.c' -o $out - else - echo " $oldcc_compile" -DL$name $flags -c '$(srcdir)/libgcc1.c' - echo " mv libgcc1${objext} $out" - fi - - libgcc1_objs="$libgcc1_objs ${name}${objext}" - done - - for file in $LIB1FUNCS_EXTRA; do - name=`echo $file | sed -e 's/[.][cS]$//' -e 's/[.]asm$//'` - out="libgcc/${name}${objext}" - - echo $out: $file - if [ ${name}.asm = $file ]; then - echo " cp $file ${name}.s" - file=${name}.s - fi - - if [ -z "@NO_MINUS_C_MINUS_O@" ]; then - echo " $oldcc_compile" -c $file -o $out - else - echo " $oldcc_compile" -c $file - tmp=`echo $file | sed -e 's/[.][cs]$/'${objext}/ -e 's,.*/,,'` - echo " mv $tmp $out" - fi - - libgcc1_objs="$libgcc1_objs ${name}${objext}" - done - ;; - *) - echo "I'm confused about libgcc1." 1>&2 - exit 1 - ;; -esac + # Remove any objects from LIB2FUNCS that are defined as optimized + # assembly code in LIB1ASMFUNCS. + LIB2FUNCS=`echo $LIB2FUNCS | sed -e 's/^'$name' //' \ + -e 's/ '$name' / /' \ + -e 's/ '$name'$//'` + done + libgcc1_objs="$libgcc1_objs ${name}${objext}" +done # # Build libgcc2 components. @@ -289,11 +212,7 @@ for ml in $MULTILIBS; do libgcc_objs="" for o in $libgcc1_objs; do - if [ "$LIBGCC1" = libgcc1-asm.a ]; then - libgcc_objs="$libgcc_objs libgcc/${dir}/$o" - else - libgcc_objs="$libgcc_objs libgcc/$o" - fi + libgcc_objs="$libgcc_objs libgcc/${dir}/$o" done for o in $libgcc2_objs; do libgcc_objs="$libgcc_objs libgcc/${dir}/$o" -- cgit v1.2.1