Commit cce7aea7 by Jim Wilson

(all.cross, rest.encap): Delete objc-runtime and SYSCALLS.c.X.

(all.cross, rest.encap): Delete objc-runtime and
SYSCALLS.c.X.
(OBJC, OBJECTIVE-C): Add objc-runtime.
(proto): Add SYSCALLS.c.X.
(libgcc2.ready, libobjc.a, sublibobjc.a, SYSCALLS.c.X): Add
dependence on stmp-int-hdrs.

From-SVN: r7029
parent 80512db7
...@@ -502,13 +502,13 @@ all.internal: start.encap rest.encap ...@@ -502,13 +502,13 @@ all.internal: start.encap rest.encap
# This is what to compile if making a cross-compiler. # This is what to compile if making a cross-compiler.
# Note that we can compile enquire using the cross-compiler just build, # Note that we can compile enquire using the cross-compiler just build,
# although we can't run it on this machine. # although we can't run it on this machine.
all.cross: native gcc-cross g++-cross specs stmp-headers $(LIBGCC) $(STMP_FIXPROTO) objc-runtime SYSCALLS.c.X $(CROSS_TEST) $(ENQUIRE) $(EXTRA_PARTS) all.cross: native gcc-cross g++-cross specs stmp-headers $(LIBGCC) $(STMP_FIXPROTO) $(CROSS_TEST) $(ENQUIRE) $(EXTRA_PARTS)
# This is what to compile if making gcc with a cross-compiler. # This is what to compile if making gcc with a cross-compiler.
all.build: native xgcc g++ $(EXTRA_PARTS) all.build: native xgcc g++ $(EXTRA_PARTS)
# This is what must be made before installing GCC and converting libraries. # This is what must be made before installing GCC and converting libraries.
start.encap: native xgcc g++ specs $(LIBGCC1) xlimits.h start.encap: native xgcc g++ specs $(LIBGCC1) xlimits.h
# These can't be made until after GCC can run. # These can't be made until after GCC can run.
rest.encap: stmp-headers $(LIBGCC) $(STMP_FIXPROTO) objc-runtime SYSCALLS.c.X $(EXTRA_PARTS) rest.encap: stmp-headers $(LIBGCC) $(STMP_FIXPROTO) $(EXTRA_PARTS)
# This is what is made with the host's compiler # This is what is made with the host's compiler
# whether making a cross compiler or not. # whether making a cross compiler or not.
native: config.status cpp $(LANGUAGES) $(EXTRA_PASSES) $(EXTRA_PROGRAMS) $(USE_COLLECT2) native: config.status cpp $(LANGUAGES) $(EXTRA_PASSES) $(EXTRA_PROGRAMS) $(USE_COLLECT2)
...@@ -519,8 +519,8 @@ native: config.status cpp $(LANGUAGES) $(EXTRA_PASSES) $(EXTRA_PROGRAMS) $(USE_C ...@@ -519,8 +519,8 @@ native: config.status cpp $(LANGUAGES) $(EXTRA_PASSES) $(EXTRA_PROGRAMS) $(USE_C
# to do the right thing within all.cross. # to do the right thing within all.cross.
C c: cc1 C c: cc1
C++ c++: cc1plus C++ c++: cc1plus
OBJC objc: cc1obj OBJC objc: cc1obj objc-runtime
OBJECTIVE-C objective-c: cc1obj OBJECTIVE-C objective-c: cc1obj objc-runtime
PROTO: proto PROTO: proto
# Really, really stupid make features, such as SUN's KEEP_STATE, may force # Really, really stupid make features, such as SUN's KEEP_STATE, may force
...@@ -691,7 +691,7 @@ libgcc1.a: libgcc1.c $(CONFIG_H) $(LIB1FUNCS_EXTRA) config.status ...@@ -691,7 +691,7 @@ libgcc1.a: libgcc1.c $(CONFIG_H) $(LIB1FUNCS_EXTRA) config.status
# Compiling libgcc2.a requires making sure that cc1, etc. have been compiled. # Compiling libgcc2.a requires making sure that cc1, etc. have been compiled.
# But recompiling cc1 should not force recompilation of libgcc2.a. # But recompiling cc1 should not force recompilation of libgcc2.a.
# If you want to force recompilation, delete libgcc2.a. # If you want to force recompilation, delete libgcc2.a.
libgcc2.ready: $(GCC_PASSES) $(LIBGCC2_DEPS) libgcc2.ready: $(GCC_PASSES) $(LIBGCC2_DEPS) stmp-int-hdrs
-if [ -f libgcc2.ready ] ; then \ -if [ -f libgcc2.ready ] ; then \
true; \ true; \
else \ else \
...@@ -770,7 +770,7 @@ libgcc.a: $(LIBGCC1) $(LIBGCC2) ...@@ -770,7 +770,7 @@ libgcc.a: $(LIBGCC1) $(LIBGCC2)
objc-runtime: libobjc.a objc-runtime: libobjc.a
# Build the Objective C runtime library. # Build the Objective C runtime library.
libobjc.a: cc1obj libgcc2.ready $(USE_COLLECT2) $(EXTRA_PARTS) libobjc.a: cc1obj stmp-int-hdrs libgcc2.ready $(USE_COLLECT2) $(EXTRA_PARTS)
if [ -d objc ]; then true; else mkdir objc; fi if [ -d objc ]; then true; else mkdir objc; fi
thisdir1=`pwd`; \ thisdir1=`pwd`; \
srcdir1=`cd $(srcdir); pwd`; \ srcdir1=`cd $(srcdir); pwd`; \
...@@ -784,7 +784,7 @@ libobjc.a: cc1obj libgcc2.ready $(USE_COLLECT2) $(EXTRA_PARTS) ...@@ -784,7 +784,7 @@ libobjc.a: cc1obj libgcc2.ready $(USE_COLLECT2) $(EXTRA_PARTS)
-if $(RANLIB_TEST) ; then $(RANLIB) libobjc.a; else true; fi -if $(RANLIB_TEST) ; then $(RANLIB) libobjc.a; else true; fi
# This is used by objc/Makefile if the user runs that directly. # This is used by objc/Makefile if the user runs that directly.
sublibobjc.a: cc1obj libgcc2.ready sublibobjc.a: cc1obj stmp-int-hdrs libgcc2.ready
thisdir1=`pwd`; \ thisdir1=`pwd`; \
srcdir1=`cd $(srcdir); pwd`; \ srcdir1=`cd $(srcdir); pwd`; \
cd objc; \ cd objc; \
...@@ -1413,7 +1413,7 @@ cccp.o: cccp.c $(CONFIG_H) pcp.h version.c config.status ...@@ -1413,7 +1413,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 # Note for the stamp targets, we run the program `true' instead of
# having an empty command (nothing following the semicolon). # having an empty command (nothing following the semicolon).
proto: config.status protoize unprotoize proto: config.status protoize unprotoize SYSCALLS.c.X
protoize: protoize.o getopt.o getopt1.o getpwd.o version.o $(LIBDEPS) protoize: protoize.o getopt.o getopt1.o getpwd.o version.o $(LIBDEPS)
$(CC) $(ALL_CFLAGS) $(LDFLAGS) \ $(CC) $(ALL_CFLAGS) $(LDFLAGS) \
...@@ -1452,7 +1452,7 @@ getopt1.o: $(srcdir)/getopt1.c getopt.h ...@@ -1452,7 +1452,7 @@ getopt1.o: $(srcdir)/getopt1.c getopt.h
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(srcdir)/getopt1.c $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(srcdir)/getopt1.c
# This info describes the target machine, so compile with GCC just built. # This info describes the target machine, so compile with GCC just built.
SYSCALLS.c.X: $(srcdir)/sys-types.h $(srcdir)/sys-protos.h $(GCC_PASSES) SYSCALLS.c.X: $(srcdir)/sys-types.h $(srcdir)/sys-protos.h $(GCC_PASSES) stmp-int-hdrs
-rm -f SYSCALLS.c tmp-SYSCALLS.s -rm -f SYSCALLS.c tmp-SYSCALLS.s
cat $(srcdir)/sys-types.h $(srcdir)/sys-protos.h > SYSCALLS.c cat $(srcdir)/sys-types.h $(srcdir)/sys-protos.h > SYSCALLS.c
$(GCC_FOR_TARGET) $(GCC_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
......
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