From a9e6777fb2b223619cac9bd838b924dad53498c2 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 7 Apr 2000 16:57:58 +0200 Subject: [PATCH] t-linux64 (tcrtbeginS.o, tcrtendS.o): Remove. * config/sparc/t-linux64 (tcrtbeginS.o, tcrtendS.o): Remove. * Makefile.in: Build crtbeginS and crtendS like crtbegin and crtend so they can be multilibbed. (STAGESTUFF): Remove s-crt and s-crtS. From-SVN: r33003 --- gcc/ChangeLog | 10 ++++++++++ gcc/Makefile.in | 31 ++++++++++++++++--------------- gcc/config/sparc/t-linux64 | 13 ------------- 3 files changed, 26 insertions(+), 28 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2ff67110f62..e00700b15f0 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2000-04-07 Jakub Jelinek + + * config/sparc/t-linux64 (tcrtbeginS.o, tcrtendS.o): Remove. + +2000-04-06 Geoff Keating + + * Makefile.in: Build crtbeginS and crtendS like crtbegin and + crtend so they can be multilibbed. + (STAGESTUFF): Remove s-crt and s-crtS. + 2000-04-07 Richard Henderson * config/alpha/alpha.c (alpha_emit_conditional_move): Fail diff --git a/gcc/Makefile.in b/gcc/Makefile.in index e1d23d6437a..e839fa651d6 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -700,7 +700,7 @@ STAGESTUFF = *$(objext) insn-flags.h insn-config.h insn-codes.h \ insn-attr.h insn-attrtab.c insn-opinit.c tree-check.h \ s-flags s-config s-codes s-mlib s-unders s-genrtl \ s-output s-recog s-emit s-extract s-peep s-check \ - s-attr s-attrtab s-opinit s-crt s-$(T)crtS s-crt0 \ + s-attr s-attrtab s-opinit s-crt0 \ genemit$(build_exeext) genoutput$(build_exeext) genrecog$(build_exeext) \ genextract$(build_exeext) genflags$(build_exeext) gencodes$(build_exeext) \ genconfig$(build_exeext) genpeep$(build_exeext) genattrtab$(build_exeext) \ @@ -1309,21 +1309,22 @@ $(T)crtend.o: crtstuff.c $(GCC_PASSES) $(CONFIG_H) \ -fno-exceptions $(CRTSTUFF_T_CFLAGS) @inhibit_libc@ \ -c $(srcdir)/crtstuff.c -DCRT_END -o $(T)crtend$(objext) -# On some systems we also want to install versions of these files -# compiled using PIC for use in shared libraries. -$(T)crtbeginS.o $(T)crtendS.o: s-$(T)crtS ; @true - -s-$(T)crtS: crtstuff.c $(GCC_PASSES) $(CONFIG_H) \ +# These are versions of crtbegin and crtend for shared libraries. +$(T)crtbeginS.o: crtstuff.c $(GCC_PASSES) $(CONFIG_H) \ defaults.h frame.h gbl-ctors.h stmp-int-hdrs tsystem.h - $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(CRTSTUFF_T_CFLAGS_S) \ - -DCRT_BEGIN -DCRTSTUFFS_O -finhibit-size-directive \ - -fno-inline-functions -fno-exceptions @inhibit_libc@ -g0 \ - -c $(srcdir)/crtstuff.c -o $(T)crtbeginS$(objext) - $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(CRTSTUFF_T_CFLAGS_S) \ - -DCRT_END -DCRTSTUFFS_O -finhibit-size-directive \ - -fno-inline-functions -fno-exceptions @inhibit_libc@ -g0 \ - -c $(srcdir)/crtstuff.c -o $(T)crtendS$(objext) - touch s-$(T)crtS + $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -g0 \ + -finhibit-size-directive -fno-inline-functions \ + -fno-exceptions $(CRTSTUFF_T_CFLAGS_S) @inhibit_libc@ \ + -c $(srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFS_O \ + -o $(T)crtbeginS$(objext) + +$(T)crtendS.o: crtstuff.c $(GCC_PASSES) $(CONFIG_H) \ + defaults.h frame.h gbl-ctors.h stmp-int-hdrs tsystem.h + $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -g0 \ + -finhibit-size-directive -fno-inline-functions \ + -fno-exceptions $(CRTSTUFF_T_CFLAGS_S) @inhibit_libc@ \ + -c $(srcdir)/crtstuff.c -DCRT_END -DCRTSTUFFS_O \ + -o $(T)crtendS$(objext) # Compile the start modules crt0.o and mcrt0.o that are linked with every program crt0.o: s-crt0 ; @true diff --git a/gcc/config/sparc/t-linux64 b/gcc/config/sparc/t-linux64 index bf81219d07e..2a3ec4b07ec 100644 --- a/gcc/config/sparc/t-linux64 +++ b/gcc/config/sparc/t-linux64 @@ -8,16 +8,3 @@ LIBGCC = stmp-multilib INSTALL_LIBGCC = install-multilib EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o - -tcrtbeginS.o: crtstuff.c $(GCC_PASSES) $(CONFIG_H) \ - defaults.h frame.h gbl-ctors.h - $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -g0 \ - -finhibit-size-directive -fno-inline-functions -fno-exceptions $(CRTSTUFF_T_CFLAGS_S) \ - -c $(srcdir)/crtstuff.c -DCRT_BEGIN -o tcrtbeginS$(objext) - -tcrtendS.o: crtstuff.c $(GCC_PASSES) $(CONFIG_H) \ - defaults.h frame.h gbl-ctors.h - $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -g0 \ - -finhibit-size-directive -fno-inline-functions -fno-exceptions $(CRTSTUFF_T_CFLAGS_S) \ - -c $(srcdir)/crtstuff.c -DCRT_END -o tcrtendS$(objext) -