Commit 10549cbd by Jim Wilson

H.J. Lu's SMP patch.

From-SVN: r14924
parent 818045b6
Mon Aug 25 23:27:10 1997 H.J. Lu (hjl@gnu.ai.mit.edu)
* objc/Make-lang.in ($(OBJC_O)): Also depend on cc1obj.
Mon Aug 25 23:27:10 1997 Jim Meyering <meyering@eng.ascend.com>
* objc/Make-lang.in ($(OBJC_O)): Also depend on $(GCC_PASSES).
Mon Aug 25 13:12:24 1997 Jeffrey A Law (law@cygnus.com) Mon Aug 25 13:12:24 1997 Jeffrey A Law (law@cygnus.com)
* haifa-sched.c (find_pre_sched_live): Remove #if 0 code. * haifa-sched.c (find_pre_sched_live): Remove #if 0 code.
......
Mon Aug 25 23:24:32 1997 H.J. Lu (hjl@gnu.ai.mit.edu)
* Make-lang.in ($(srcdir)/f/runtime/configure,
$(srcdir)/f/runtime/libU77/configure, f77.mostlyclean,
f77.clean, f77.distclean, f77.maintainer-clean, f77.realclean):
Handle absolute pathname of $(srcdir).
(stmp-f2c.h): New.
(include/f2c.h, f/runtime/Makefile, f/runtime/libF77/Makefile,
f/runtime/libI77/Makefile, f/runtime/libU77/Makefile): Only
depend on stmp-f2c.h.
(f77.maintainer-clean): Don't make itself.
Sun Aug 24 17:00:27 1997 Jim Wilson <wilson@cygnus.com> Sun Aug 24 17:00:27 1997 Jim Wilson <wilson@cygnus.com>
* Make-lang.in (f77.install-info): Don't cd into srcdir. Add srcdir * Make-lang.in (f77.install-info): Don't cd into srcdir. Add srcdir
......
...@@ -264,11 +264,7 @@ f77-runtime-unsafe: ...@@ -264,11 +264,7 @@ f77-runtime-unsafe:
# configure, not a Cygnus-type one. It needs to be run *after* the # configure, not a Cygnus-type one. It needs to be run *after* the
# appropriate (cross-)compiler has been built, thus depend on GCC_PARTS. # appropriate (cross-)compiler has been built, thus depend on GCC_PARTS.
# NB, sh uses the *first* value of $a from `a=fred a=joe prog'. # NB, sh uses the *first* value of $a from `a=fred a=joe prog'.
include/f2c.h \ stmp-f2c.h: \
f/runtime/Makefile \
f/runtime/libF77/Makefile \
f/runtime/libI77/Makefile \
f/runtime/libU77/Makefile: \
$(srcdir)/f/runtime/f2c.h.in \ $(srcdir)/f/runtime/f2c.h.in \
$(srcdir)/f/com.h $(srcdir)/f/proj.h \ $(srcdir)/f/com.h $(srcdir)/f/proj.h \
$(srcdir)/f/runtime/Makefile.in \ $(srcdir)/f/runtime/Makefile.in \
...@@ -279,6 +275,7 @@ f/runtime/libU77/Makefile: \ ...@@ -279,6 +275,7 @@ f/runtime/libU77/Makefile: \
$(srcdir)/f/runtime/libU77/configure \ $(srcdir)/f/runtime/libU77/configure \
$(GCC_PARTS) $(GCC_PARTS)
# The make "stage?" in compiler spec. is fully qualified as above # The make "stage?" in compiler spec. is fully qualified as above
rm -f stmp-f2c.h
top=`pwd`; \ top=`pwd`; \
src=`cd $(srcdir); pwd`; \ src=`cd $(srcdir); pwd`; \
cd f/runtime; \ cd f/runtime; \
...@@ -295,6 +292,14 @@ f/runtime/libU77/Makefile: \ ...@@ -295,6 +292,14 @@ f/runtime/libU77/Makefile: \
*) echo '$(GCC_FOR_TARGET)';; esac`" \ *) echo '$(GCC_FOR_TARGET)';; esac`" \
$(F77_FLAGS_TO_PASS) CONFIG_SITE=/dev/null $(SHELL) \ $(F77_FLAGS_TO_PASS) CONFIG_SITE=/dev/null $(SHELL) \
$${src}/f/runtime/libU77/configure --srcdir=$${src}/f/runtime/libU77 $${src}/f/runtime/libU77/configure --srcdir=$${src}/f/runtime/libU77
touch stmp-f2c.h
# Support parallel build.
include/f2c.h \
f/runtime/Makefile \
f/runtime/libF77/Makefile \
f/runtime/libI77/Makefile \
f/runtime/libU77/Makefile: stmp-f2c.h
#For now, omit f2c stuff. -- burley #For now, omit f2c stuff. -- burley
#f2c: stmp-headers f/f2c/Makefile #f2c: stmp-headers f/f2c/Makefile
...@@ -346,10 +351,15 @@ $(srcdir)/f/NEWS: f/news0.texi f/news.texi ...@@ -346,10 +351,15 @@ $(srcdir)/f/NEWS: f/news0.texi f/news.texi
--no-validate news0.texi -o NEWS --no-validate news0.texi -o NEWS
$(srcdir)/f/runtime/configure: $(srcdir)/f/runtime/configure.in $(srcdir)/f/runtime/configure: $(srcdir)/f/runtime/configure.in
cd f/runtime && $(MAKE) srcdir=../../$(srcdir)/f/runtime -f ../../$(srcdir)/f/runtime/Makefile.in rebuilt case $(srcdir) in \
/*) cd f/runtime && $(MAKE) srcdir=$(srcdir)/f/runtime -f $(srcdir)/f/runtime/Makefile.in rebuilt;; \
*) cd f/runtime && $(MAKE) srcdir=../../$(srcdir)/f/runtime -f ../../$(srcdir)/f/runtime/Makefile.in rebuilt;; \
esac
$(srcdir)/f/runtime/libU77/configure: $(srcdir)/f/runtime/libU77/configure.in $(srcdir)/f/runtime/libU77/configure: $(srcdir)/f/runtime/libU77/configure.in
cd f/runtime && $(MAKE) srcdir=../../$(srcdir)/f/runtime -f ../../$(srcdir)/f/runtime/Makefile.in rebuilt case $(srcdir) in \
/*) cd f/runtime && $(MAKE) srcdir=$(srcdir)/f/runtime -f $(srcdir)/f/runtime/Makefile.in rebuilt;; \
*) cd f/runtime && $(MAKE) srcdir=../../$(srcdir)/f/runtime -f ../../$(srcdir)/f/runtime/Makefile.in rebuilt;; \
esac
f77.rebuilt: $(srcdir)/f/g77.info $(srcdir)/f/BUGS $(srcdir)/f/INSTALL \ f77.rebuilt: $(srcdir)/f/g77.info $(srcdir)/f/BUGS $(srcdir)/f/INSTALL \
$(srcdir)/f/NEWS $(srcdir)/f/runtime/configure \ $(srcdir)/f/NEWS $(srcdir)/f/runtime/configure \
$(srcdir)/f/runtime/libU77/configure $(srcdir)/f/runtime/libU77/configure
...@@ -494,11 +504,20 @@ f77.uninstall: ...@@ -494,11 +504,20 @@ f77.uninstall:
f77.mostlyclean: f77.mostlyclean:
-rm -f f/*$(objext) -rm -f f/*$(objext)
-rm -f f/fini f/f771 f/stamp-str f/str-*.h f/str-*.j f/intdoc -rm -f f/fini f/f771 f/stamp-str f/str-*.h f/str-*.j f/intdoc
-cd f/runtime; $(MAKE) -f ../../$(srcdir)/f/runtime/Makefile.in mostlyclean -case $(srcdir) in \
/*) cd f/runtime; $(MAKE) -f $(srcdir)/f/runtime/Makefile.in mostlyclean;; \
*) cd f/runtime; $(MAKE) -f ../../$(srcdir)/f/runtime/Makefile.in mostlyclean;; \
esac
f77.clean: f77.clean:
-cd f/runtime; $(MAKE) -f ../../$(srcdir)/f/runtime/Makefile.in clean -case $(srcdir) in \
/*) cd f/runtime; $(MAKE) -f $(srcdir)/f/runtime/Makefile.in clean;; \
*) cd f/runtime; $(MAKE) -f ../../$(srcdir)/f/runtime/Makefile.in clean;; \
esac
f77.distclean: f77.distclean:
-cd f/runtime; $(MAKE) -f ../../$(srcdir)/f/runtime/Makefile.in distclean -case $(srcdir) in \
/*) cd f/runtime; $(MAKE) -f $(srcdir)/f/runtime/Makefile.in distclean;; \
*) cd f/runtime; $(MAKE) -f ../../$(srcdir)/f/runtime/Makefile.in distclean;; \
esac
-rm -f f/Makefile -rm -f f/Makefile
# like gcc's extraclean, which does clean f/ for us, but not f/gbe, # like gcc's extraclean, which does clean f/ for us, but not f/gbe,
# f/runtime, f/runtime/libF77, f/runtime/libI77, and f/runtime/libU77, # f/runtime, f/runtime/libF77, f/runtime/libI77, and f/runtime/libU77,
...@@ -516,8 +535,10 @@ f77.extraclean: f77.distclean ...@@ -516,8 +535,10 @@ f77.extraclean: f77.distclean
-rm -f f/*/*/*lose f/*/*/*.s f/*/*/*.s[0-9] f/*/*/*.i -rm -f f/*/*/*lose f/*/*/*.s f/*/*/*.s[0-9] f/*/*/*.i
# realclean is the pre-2.7.0 name for maintainer-clean # realclean is the pre-2.7.0 name for maintainer-clean
f77.maintainer-clean f77.realclean: f77.distclean f77.maintainer-clean f77.realclean: f77.distclean
-cd f/runtime; $(MAKE) -f ../../$(srcdir)/f/runtime/Makefile.in maintainer-clean -case $(srcdir) in \
-$(MAKE) f77.maintainer-clean /*) cd f/runtime; $(MAKE) -f $(srcdir)/f/runtime/Makefile.in maintainer-clean;; \
*) cd f/runtime; $(MAKE) -f ../../$(srcdir)/f/runtime/Makefile.in maintainer-clean;; \
esac
-rm -f f/g77.info* f/g77.*aux f/TAGS f/BUGS f/INSTALL f/NEWS f/intdoc.texi -rm -f f/g77.info* f/g77.*aux f/TAGS f/BUGS f/INSTALL f/NEWS f/intdoc.texi
# Stage hooks: # Stage hooks:
# The main makefile has already created stage?/f. # The main makefile has already created stage?/f.
......
Mon Aug 25 23:26:05 1997 H.J. Lu (hjl@gnu.ai.mit.edu)
* Makefile.in (mostlyclean, clean): Check if Makefile exists
before using it. Remove stamp-*.
(stamp-libi77, stamp-libf77, stamp-libu77): New.
(stamp-lib): Only depend on stamp-libi77 stamp-libf77
stamp-libu77
Mon Aug 25 01:40:01 1997 Jim Wilson (wilson@cygnus.com) Mon Aug 25 01:40:01 1997 Jim Wilson (wilson@cygnus.com)
* configure.in: Always make sure RANLIB_TEST is set. * configure.in: Always make sure RANLIB_TEST is set.
......
...@@ -169,12 +169,12 @@ CROSS_FLAGS_TO_PASS = \ ...@@ -169,12 +169,12 @@ CROSS_FLAGS_TO_PASS = \
RANLIB_TEST="$(RANLIB_TEST)" \ RANLIB_TEST="$(RANLIB_TEST)" \
SHELL="$(SHELL)" SHELL="$(SHELL)"
all: ../../include/f2c.h libi77 libf77 libu77 $(lib) all: ../../include/f2c.h $(lib)
$(lib): stamp-lib ; @true $(lib): stamp-lib ; @true
stamp-lib: $(FOBJ) $(IOBJ) $(UOBJ) stamp-lib: stamp-libf77 stamp-libi77 stamp-libu77
rm -f stamp-lib rm -f stamp-lib
$(AR) $(AR_FLAGS) $(lib) $? $(AR) $(AR_FLAGS) $(lib) $(FOBJ) $(IOBJ) $(UOBJ)
for name in $(F2CEXT); \ for name in $(F2CEXT); \
do \ do \
echo $${name}; \ echo $${name}; \
...@@ -189,26 +189,32 @@ stamp-lib: $(FOBJ) $(IOBJ) $(UOBJ) ...@@ -189,26 +189,32 @@ stamp-lib: $(FOBJ) $(IOBJ) $(UOBJ)
else true; fi else true; fi
touch stamp-lib touch stamp-lib
libi77: libI77/Makefile stamp-libi77: libI77/Makefile
rm -f stamp-libi77
if test "$(CROSS)"; then \ if test "$(CROSS)"; then \
cd libI77; $(MAKE) -f Makefile $(CROSS_FLAGS_TO_PASS) all ; \ cd libI77; $(MAKE) -f Makefile $(CROSS_FLAGS_TO_PASS) all ; \
else \ else \
cd libI77; $(MAKE) -f Makefile $(FLAGS_TO_PASS) all ; \ cd libI77; $(MAKE) -f Makefile $(FLAGS_TO_PASS) all ; \
fi fi
touch stamp-libi77
libf77: libF77/Makefile stamp-libf77: libF77/Makefile
rm -f stamp-libf77
if test "$(CROSS)"; then \ if test "$(CROSS)"; then \
cd libF77; $(MAKE) -f Makefile $(CROSS_FLAGS_TO_PASS) all ; \ cd libF77; $(MAKE) -f Makefile $(CROSS_FLAGS_TO_PASS) all ; \
else \ else \
cd libF77; $(MAKE) -f Makefile $(FLAGS_TO_PASS) all ; \ cd libF77; $(MAKE) -f Makefile $(FLAGS_TO_PASS) all ; \
fi fi
touch stamp-libf77
libu77: libU77/Makefile stamp-libu77: libU77/Makefile
rm -f stamp-libu77
if test "$(CROSS)"; then \ if test "$(CROSS)"; then \
cd libU77; $(MAKE) -f Makefile $(CROSS_FLAGS_TO_PASS) all ; \ cd libU77; $(MAKE) -f Makefile $(CROSS_FLAGS_TO_PASS) all ; \
else \ else \
cd libU77; $(MAKE) -f Makefile $(FLAGS_TO_PASS) all ; \ cd libU77; $(MAKE) -f Makefile $(FLAGS_TO_PASS) all ; \
fi fi
touch stamp-libu77
${srcdir}/configure: ${srcdir}/configure.in ${srcdir}/configure: ${srcdir}/configure.in
rm -f config.cache && cd ${srcdir} && autoconf && rm -f config.cache rm -f config.cache && cd ${srcdir} && autoconf && rm -f config.cache
...@@ -231,11 +237,20 @@ libU77/Makefile: $(srcdir)/libU77/Makefile.in ...@@ -231,11 +237,20 @@ libU77/Makefile: $(srcdir)/libU77/Makefile.in
# cd libU77; $(FLAGS_TO_PASS) CONFIG_SITE=/dev/null $(SHELL) config.status --recheck # cd libU77; $(FLAGS_TO_PASS) CONFIG_SITE=/dev/null $(SHELL) config.status --recheck
mostlyclean: mostlyclean:
for i in libI77 libF77 libU77; do cd $$i; $(MAKE) -f Makefile mostlyclean; cd ..; done -rm -f stamp-*
for i in libI77 libF77 libU77; do \
if [ -f $$i/Makefile ]; then \
cd $$i; $(MAKE) -f Makefile mostlyclean; cd ..; \
fi; \
done
clean: clean:
-rm -f config.log config.cache -rm -f config.log config.cache stamp-*
for i in libI77 libF77 libU77; do cd $$i; $(MAKE) -f Makefile clean; cd ..; done for i in libI77 libF77 libU77; do \
if [ -f $$i/Makefile ]; then \
cd $$i; $(MAKE) -f Makefile clean; cd ..; \
fi; \
done
distclean: clean distclean: clean
-rm -f Makefile lib?77/Makefile config.status libU77/config.status ../../include/f2c.h -rm -f Makefile lib?77/Makefile config.status libU77/config.status ../../include/f2c.h
......
...@@ -176,6 +176,8 @@ $(srcdir)/objc/libobjc_entry.o: $(srcdir)/objc/libobjc_entry.c ...@@ -176,6 +176,8 @@ $(srcdir)/objc/libobjc_entry.o: $(srcdir)/objc/libobjc_entry.c
$(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) \ $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) \
-c $(srcdir)/objc/libobjc_entry.c -o $@ -c $(srcdir)/objc/libobjc_entry.c -o $@
$(OBJC_O): $(GCC_PASSES) cc1obj
# Build the Objective C runtime library. # Build the Objective C runtime library.
libobjc.a: cc1obj specs stmp-int-hdrs libgcc2.ready \ libobjc.a: cc1obj specs stmp-int-hdrs libgcc2.ready \
$(USE_COLLECT2) $(EXTRA_PARTS) $(OBJC_O) $(USE_COLLECT2) $(EXTRA_PARTS) $(OBJC_O)
......
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