From eea77e5fefd86bee26282270d8e1f5c1557ff8a8 Mon Sep 17 00:00:00 2001 From: Jim Wilson Date: Thu, 31 Mar 1994 22:19:45 -0800 Subject: [PATCH] (USER_H): Files in ginclude now. Add stdarg.h, stddef.h, varargs.h. (all.cross, rest.encap): Move LIBGCC after stmp-headers. Add objc-runtime, and SYSCALLS.c.X. (for-bootstrap): Delete. (OBJC, OBJECTIVE-C): Delete objc-runtime. (proto): Delete SYSCALLS.c.X. (*.o): Delete gvarargs.h dependencies. (stmp-int-hdrs): Delete gvarargs.h, gstdarg.h, gstddef.h deps, and code to copy them. From-SVN: r6955 --- gcc/Makefile.in | 55 ++++++++++++++++++++----------------------------- 1 file changed, 22 insertions(+), 33 deletions(-) diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 94918df219a..4d3274bcf42 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -339,7 +339,8 @@ all: all.indirect all.indirect: $(ALL) -# IN_GCC tells obstack.h to use gstddef.h. +# IN_GCC tells obstack.h that we are using gcc's file. +# ??? IN_GCC should be obsolete now. INTERNAL_CFLAGS = $(CROSS) -DIN_GCC # This is the variable actually used when we compile. @@ -468,8 +469,11 @@ LIB2FUNCS = _muldi3 _divdi3 _moddi3 _udivdi3 _umoddi3 _negdi2 \ # Header files that are made available under the same name # to programs compiled with GCC. -USER_H = va-alpha.h va-h8300.h va-i860.h va-i960.h va-mips.h va-m88k.h \ - va-pa.h va-pyr.h va-sparc.h va-clipper.h va-spur.h proto.h $(EXTRA_HEADERS) +USER_H = ginclude/stdarg.h ginclude/stddef.h ginclude/varargs.h \ + ginclude/va-alpha.h ginclude/va-h8300.h ginclude/va-i860.h \ + ginclude/va-i960.h ginclude/va-mips.h ginclude/va-m88k.h ginclude/va-pa.h \ + ginclude/va-pyr.h ginclude/va-sparc.h ginclude/va-clipper.h \ + ginclude/va-spur.h ginclude/proto.h $(EXTRA_HEADERS) # The files that "belong" in CONFIG_H are deliberately omitted # because having them there would not be useful in actual practice. @@ -495,15 +499,13 @@ all.internal: start.encap rest.encap # This is what to compile if making a cross-compiler. # Note that we can compile enquire using the cross-compiler just build, # although we can't run it on this machine. -all.cross: native gcc-cross g++-cross specs $(LIBGCC) stmp-headers $(STMP_FIXPROTO) $(CROSS_TEST) $(ENQUIRE) $(EXTRA_PARTS) +all.cross: native gcc-cross g++-cross specs stmp-headers $(LIBGCC) $(STMP_FIXPROTO) objc-runtime SYSCALLS.c.X $(CROSS_TEST) $(ENQUIRE) $(EXTRA_PARTS) # This is what to compile if making gcc with a cross-compiler. all.build: native xgcc g++ $(EXTRA_PARTS) # This is what must be made before installing GCC and converting libraries. start.encap: native xgcc g++ specs $(LIBGCC1) xlimits.h -# Use this to make a GCC that will be used only to recompile GCC. -for-bootstrap: start.encap $(LIBGCC) -# These can't be made, with COFF encapsulation, until after GCC can run. -rest.encap: $(LIBGCC) stmp-headers $(STMP_FIXPROTO) $(EXTRA_PARTS) +# These can't be made until after GCC can run. +rest.encap: stmp-headers $(LIBGCC) $(STMP_FIXPROTO) objc-runtime SYSCALLS.c.X $(EXTRA_PARTS) # This is what is made with the host's compiler # whether making a cross compiler or not. native: config.status cpp $(LANGUAGES) $(EXTRA_PASSES) $(EXTRA_PROGRAMS) $(USE_COLLECT2) @@ -514,8 +516,8 @@ native: config.status cpp $(LANGUAGES) $(EXTRA_PASSES) $(EXTRA_PROGRAMS) $(USE_C # to do the right thing within all.cross. C c: cc1 C++ c++: cc1plus -OBJC objc: cc1obj objc-runtime -OBJECTIVE-C objective-c: cc1obj objc-runtime +OBJC objc: cc1obj +OBJECTIVE-C objective-c: cc1obj PROTO: proto # Really, really stupid make features, such as SUN's KEEP_STATE, may force @@ -804,9 +806,6 @@ crtend.o: crtstuff.c $(GCC_PASSES) $(CONFIG_H) gbl-ctors.h # Note that dependencies on obstack.h are not written # because that file is not part of GCC. -# Dependencies on gvarargs.h are not written -# because all that file does, when not compiling with GCC, -# is include the system varargs.h. # C language specific files. @@ -873,7 +872,7 @@ cp-pt.o : cp-pt.c $(CONFIG_H) $(CPLUS_TREE_H) cp-decl.h cp-parse.h cp-error.o : cp-error.c $(CONFIG_H) $(CPLUS_TREE_H) cp-errfn.o : cp-errfn.c $(CONFIG_H) $(CPLUS_TREE_H) -g++.o : g++.c $(CONFIG_H) gvarargs.h +g++.o : g++.c $(CONFIG_H) # To make a configuration always use collect2, set USE_COLLECT2 to ld. ld: collect2 @@ -911,7 +910,7 @@ c-common.o : c-common.c $(CONFIG_H) $(TREE_H) c-tree.h c-lex.h flags.h # Language-independent files. -gcc.o: gcc.c $(CONFIG_H) gvarargs.h config.status +gcc.o: gcc.c $(CONFIG_H) config.status $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ -DSTANDARD_STARTFILE_PREFIX=\"$(libdir)/\" \ -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-lib/\" \ @@ -928,7 +927,7 @@ obstack.o: obstack.c convert.o: convert.c $(CONFIG_H) $(TREE_H) flags.h convert.h -tree.o : tree.c $(CONFIG_H) $(TREE_H) gvarargs.h flags.h function.h +tree.o : tree.c $(CONFIG_H) $(TREE_H) flags.h function.h print-tree.o : print-tree.c $(CONFIG_H) $(TREE_H) stor-layout.o : stor-layout.c $(CONFIG_H) $(TREE_H) function.h fold-const.o : fold-const.c $(CONFIG_H) $(TREE_H) flags.h @@ -958,7 +957,7 @@ expr.o : expr.c $(CONFIG_H) $(RTL_H) $(TREE_H) flags.h function.h \ typeclass.h bytecode.h bc-opcode.h bc-typecd.h bc-typecd.def bc-optab.h \ bc-emit.h modemap.def calls.o : calls.c $(CONFIG_H) $(RTL_H) $(TREE_H) flags.h expr.h insn-codes.h \ - insn-flags.h gvarargs.h + insn-flags.h expmed.o : expmed.c $(CONFIG_H) $(RTL_H) $(TREE_H) flags.h \ insn-flags.h insn-config.h insn-codes.h expr.h recog.h real.h explow.o : explow.c $(CONFIG_H) $(RTL_H) $(TREE_H) flags.h hard-reg-set.h \ @@ -972,7 +971,7 @@ sdbout.o : sdbout.c $(CONFIG_H) $(TREE_H) $(RTL_H) gsyms.h flags.h \ dwarfout.o : dwarfout.c $(CONFIG_H) $(TREE_H) $(RTL_H) dwarf.h flags.h \ insn-config.h reload.h output.h defaults.h xcoffout.o : xcoffout.c $(CONFIG_H) $(TREE_H) $(RTL_H) xcoffout.h flags.h -emit-rtl.o : emit-rtl.c $(CONFIG_H) $(RTL_H) $(TREE_H) flags.h gvarargs.h \ +emit-rtl.o : emit-rtl.c $(CONFIG_H) $(RTL_H) $(TREE_H) flags.h \ function.h regs.h insn-config.h insn-codes.h real.h expr.h bytecode.h \ bc-opcode.h bc-typecd.h bc-typecd.def bc-optab.h bc-emit.h bc-opname.h real.o : real.c $(CONFIG_H) $(TREE_H) @@ -994,7 +993,7 @@ unroll.o : unroll.c $(CONFIG_H) $(RTL_H) insn-config.h insn-codes.h \ integrate.h regs.h flags.h expr.h loop.h flow.o : flow.c $(CONFIG_H) $(RTL_H) flags.h insn-config.h \ basic-block.h regs.h hard-reg-set.h output.h -combine.o : combine.c $(CONFIG_H) $(RTL_H) gvarargs.h flags.h \ +combine.o : combine.c $(CONFIG_H) $(RTL_H) flags.h \ insn-config.h insn-flags.h insn-codes.h insn-attr.h regs.h expr.h \ basic-block.h recog.h real.h hard-reg-set.h regclass.o : regclass.c $(CONFIG_H) $(RTL_H) hard-reg-set.h flags.h \ @@ -1016,7 +1015,7 @@ reorg.o : reorg.c $(CONFIG_H) $(RTL_H) conditions.h hard-reg-set.h \ flags.h output.h sched.o : sched.c $(CONFIG_H) $(RTL_H) basic-block.h regs.h hard-reg-set.h \ flags.h insn-config.h insn-attr.h -final.o : final.c $(CONFIG_H) $(RTL_H) $(TREE_H) gvarargs.h flags.h regs.h \ +final.o : final.c $(CONFIG_H) $(RTL_H) $(TREE_H) flags.h regs.h \ recog.h conditions.h insn-config.h insn-attr.h real.h output.h \ hard-reg-set.h insn-flags.h insn-codes.h gstab.h xcoffout.h defaults.h recog.o : recog.c $(CONFIG_H) $(RTL_H) \ @@ -1411,7 +1410,7 @@ cccp.o: cccp.c $(CONFIG_H) pcp.h version.c config.status # Note for the stamp targets, we run the program `true' instead of # having an empty command (nothing following the semicolon). -proto: config.status protoize unprotoize SYSCALLS.c.X +proto: config.status protoize unprotoize protoize: protoize.o getopt.o getopt1.o getpwd.o version.o $(LIBDEPS) $(CC) $(ALL_CFLAGS) $(LDFLAGS) \ @@ -1489,8 +1488,7 @@ test-protoize-simple: ./protoize ./unprotoize $(GCC_PASSES) # Build the include directory except for float.h (which depends upon # enquire). -stmp-int-hdrs: stmp-fixinc $(USER_H) gvarargs.h gstdarg.h gstddef.h \ - xlimits.h objc-headers +stmp-int-hdrs: stmp-fixinc $(USER_H) xlimits.h objc-headers # Copy in the headers provided with gcc. # The sed command gets just the last file name component; # this is necessary because VPATH could add a dirname. @@ -1500,18 +1498,9 @@ stmp-int-hdrs: stmp-fixinc $(USER_H) gvarargs.h gstdarg.h gstddef.h \ for file in $(USER_H); do \ realfile=`echo $$file | sed -e 's|.*/\([^/]*\)$$|\1|'`; \ rm -f $$objdir/include/$$realfile; \ - cp $$realfile $$objdir/include; \ + cp ginclude/$$realfile $$objdir/include; \ chmod a+r $$objdir/include/$$realfile; \ done - rm -f include/varargs.h - cp $(srcdir)/gvarargs.h include/varargs.h - chmod a+r include/varargs.h - rm -f include/stdarg.h - cp $(srcdir)/gstdarg.h include/stdarg.h - chmod a+r include/stdarg.h - rm -f include/stddef.h - cp $(srcdir)/gstddef.h include/stddef.h - chmod a+r include/stddef.h rm -f include/limits.h cp xlimits.h include/limits.h chmod a+r include/limits.h -- 2.30.2