GCC:

Sat Sep  4 13:44:01 1999  Mark Mitchell  <mark@codesourcery.com>

	* Makefile.in (C_AND_C_OBJS): Add gcc-callbacks.o.
	(OBJS): Add $(GCC).
	(ggc-callbacks.o): New target.
	* ggc-callbacks.c: New file.

Chill:

1999-09-04  Mark Mitchell  <mark@codesourcery.com>

	* Make-lang.in (cc1chill): Depend on ggc-callbacks.o.
	* Makefile.in (CHILL_OBJS): Add ggc-callbacks.o.

C++:

1999-09-04  Mark Mitchell  <mark@codesourcery.com>

	* Make-lang.in (cc1plus): Remove dependency on GGC.
	* Makefile.in (OBJS): Don't mention ggc-simple.o.
	(OBJDEPS): Don't mention ggc-simple.o.

F77:

Sat Sep  4 13:46:27 1999  Mark Mitchell  <mark@codesourcery.com>

	* Make-lang.in (f771): Depend on ggc-callbacks.o.
	* Makefile.in (OBJS): Add ggc-callbacks.o.
	(OBJDEPS): Likewise.

Objc:

1999-09-04  Mark Mitchell  <mark@codesourcery.com>

	* Make-lang.in (jc1): Depend on ggc-callbacks.o.
	* Makefile.in (OBJS): Add ggc-callbacks.o.
	(OBJDEPS): Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@29111 138bc75d-0d04-0410-961f-82ee72b054a4

10 files changed, 25 insertions, 13 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6049ab5f68a..326147a5f9c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+Sat Sep  4 13:44:01 1999  Mark Mitchell  <mark@codesourcery.com>
+
+	* Makefile.in (C_AND_C_OBJS): Add gcc-callbacks.o.
+	(OBJS): Add $(GGC).
+	(ggc-callbacks.o): New target.
+	* ggc-callbacks.c: New file.
+
 Sat Sep  4 22:53:13 1999  Bernd Schmidt  <bernds@cygnus.co.uk>
 
 	* expr.h: Collapse individual optab and libfunc vars to arrays.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 333da82d495..2ff35b752c2 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -659,7 +659,7 @@ SUBDIR_FLAGS_TO_PASS = $(ORDINARY_FLAGS_TO_PASS) \
 
 # Language-specific object files for C and Objective C.
 C_AND_OBJC_OBJS = c-lex.o c-pragma.o c-decl.o c-typeck.o c-convert.o \
-  c-aux-info.o c-common.o c-iterate.o @extra_c_objs@
+  c-aux-info.o c-common.o c-iterate.o ggc-callbacks.o @extra_c_objs@
 
 # Language-specific object files for C.
 C_OBJS = c-parse.o c-lang.o $(C_AND_OBJC_OBJS)
@@ -674,7 +674,8 @@ OBJS = toplev.o version.o tree.o print-tree.o stor-layout.o fold-const.o \
  insn-peep.o reorg.o haifa-sched.o final.o recog.o reg-stack.o \
  insn-opinit.o insn-recog.o insn-extract.o insn-output.o insn-emit.o lcm.o \
  profile.o insn-attrtab.o $(out_object_file) $(EXTRA_OBJS) convert.o \
- mbchar.o dyn-string.o splay-tree.o graph.o sbitmap.o resource.o hash.o lists.o
+ mbchar.o dyn-string.o splay-tree.o graph.o sbitmap.o resource.o hash.o \
+ lists.o $(GGC)
 
 # GEN files are listed separately, so they can be built before doing parallel
 #  makes for cc1 or cc1plus.  Otherwise sequent parallel make attempts to load
@@ -1435,6 +1436,8 @@ ggc-simple.o: ggc-simple.c $(CONFIG_H) $(RTL_BASE_H) $(TREE_H) flags.h ggc.h
 
 ggc-none.o: ggc-none.c $(CONFIG_H) $(RTL_BASE_H) ggc.h
 
+ggc-callbacks.o: ggc-callbacks.c $(CONFIG_H) $(RTL_BASE_H) $(TREE_H) ggc.h
+
 obstack.o: $(srcdir)/../libiberty/obstack.c $(CONFIG_H)
 	rm -f obstack.c
 	$(LN_S) $(srcdir)/../libiberty/obstack.c obstack.c
diff --git a/gcc/ch/Make-lang.in b/gcc/ch/Make-lang.in
index 958d085ccc2..5ac4748ee87 100644
--- a/gcc/ch/Make-lang.in
+++ b/gcc/ch/Make-lang.in
@@ -95,7 +95,8 @@ chill-cross: $(srcdir)/ch/chill.in
 
 cc1chill$(exeext): $(P) $(CHILL_SRCS) $(LIBDEPS) stamp-objlist \
 	insn-config.h insn-flags.h insn-attr.h insn-codes.h \
-	c-typeck.o c-aux-info.o c-common.o c-iterate.o
+	c-typeck.o c-aux-info.o c-common.o c-iterate.o \
+        ggc-callbacks.o
 	cd ch; $(MAKE) $(FLAGS_TO_PASS) $(CHILL_FLAGS_TO_PASS) ../cc1chill$(exeext)
 
 #
diff --git a/gcc/ch/Makefile.in b/gcc/ch/Makefile.in
index b42532a7a0c..b3779646a1a 100644
--- a/gcc/ch/Makefile.in
+++ b/gcc/ch/Makefile.in
@@ -183,7 +183,8 @@ FLAGS_TO_PASS = \
 
 CHILL_OBJS = parse.o actions.o except.o grant.o lang.o \
    tree.o lex.o decl.o typeck.o convert.o expr.o loop.o \
-   tasking.o timing.o inout.o satisfy.o ch-version.o
+   tasking.o timing.o inout.o satisfy.o ch-version.o \
+   ../ggc-callbacks.o
 
 # Language-independent object files.
 OBJS = `cat ../stamp-objlist`
diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index 67c1219b421..9e5a2188136 100644
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -122,7 +122,7 @@ CXX_SRCS = $(srcdir)/cp/call.c $(srcdir)/cp/decl2.c \
 
 cc1plus$(exeext): $(P) $(CXX_SRCS) $(LIBDEPS) stamp-objlist c-common.o \
         c-pragma.o $(srcdir)/cp/cp-tree.h $(srcdir)/cp/cp-tree.def \
-	$(srcdir)/cp/gxx.gperf hash.o $(GGC)
+	$(srcdir)/cp/gxx.gperf hash.o
 	cd cp; $(MAKE) $(FLAGS_TO_PASS) $(CXX_FLAGS_TO_PASS) ../cc1plus$(exeext)
 #
 # Build hooks:
diff --git a/gcc/cp/Makefile.in b/gcc/cp/Makefile.in
index 4cc047f1d61..d71938f293e 100644
--- a/gcc/cp/Makefile.in
+++ b/gcc/cp/Makefile.in
@@ -178,8 +178,8 @@ CXX_OBJS = call.o decl.o errfn.o expr.o pt.o typeck2.o \
  repo.o dump.o @extra_cxx_objs@
 
 # Language-independent object files.
-OBJS = `cat ../stamp-objlist` ../c-common.o ../c-pragma.o ../ggc-simple.o
-OBJDEPS = ../stamp-objlist ../c-common.o ../c-pragma.o ../ggc-simple.o
+OBJS = `cat ../stamp-objlist` ../c-common.o ../c-pragma.o
+OBJDEPS = ../stamp-objlist ../c-common.o ../c-pragma.o
 
 compiler: ../cc1plus$(exeext)
 ../cc1plus$(exeext): $(P) $(OBJDEPS) $(CXX_OBJS) $(LIBDEPS)
diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in
index a531abb5707..daf661701dc 100644
--- a/gcc/f/Make-lang.in
+++ b/gcc/f/Make-lang.in
@@ -200,7 +200,7 @@ F77_SRCS = \
  $(srcdir)/f/where.c \
  $(srcdir)/f/where.h
 
-f771$(exeext): $(P) $(F77_SRCS) $(LIBDEPS) stamp-objlist
+f771$(exeext): $(P) $(F77_SRCS) $(LIBDEPS) ggc-callbacks.o stamp-objlist
 	touch lang-f77
 	cd f; $(MAKE) $(FLAGS_TO_PASS) \
 	  HOST_CC="`case '$(HOST_CC)' in stage*) echo '$(HOST_CC)' | sed -e 's|stage|../stage|g';; *) echo '$(HOST_CC)';; esac`" \
diff --git a/gcc/f/Makefile.in b/gcc/f/Makefile.in
index 5d1e558e4cd..d369fad8b5e 100644
--- a/gcc/f/Makefile.in
+++ b/gcc/f/Makefile.in
@@ -194,8 +194,8 @@ F77_OBJS = \
  where.o
 
 # Language-independent object files.
-OBJS = `cat ../stamp-objlist`
-OBJDEPS = ../stamp-objlist
+OBJS = `cat ../stamp-objlist` ../ggc-callbacks.o
+OBJDEPS = ../stamp-objlist ../ggc-callbacks.o
 
 compiler: ../f771$(exeext)
 ../f771$(exeext): $(P) $(F77_OBJS) $(OBJDEPS) $(LIBDEPS)
diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index d0234ff2dd0..d787ba62591 100644
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -77,7 +77,7 @@ JAVA_SRCS = $(srcdir)/java/parse.y $(srcdir)/java/class.c \
   $(srcdir)/java/check-init.c \
   $(srcdir)/java/jcf-depend.c  $(srcdir)/java/jcf-path.c
 
-jc1$(exeext): $(P) $(JAVA_SRCS) $(LIBDEPS) stamp-objlist
+jc1$(exeext): $(P) $(JAVA_SRCS) $(LIBDEPS) stamp-objlist ggc-callbacks.o
 	cd java; $(MAKE) $(FLAGS_TO_PASS) $(JAVA_FLAGS_TO_PASS) ../jc1$(exeext)
 
 jvspec.o: $(srcdir)/java/jvspec.c
diff --git a/gcc/java/Makefile.in b/gcc/java/Makefile.in
index 0b36c236cb2..fe1c51fe67d 100644
--- a/gcc/java/Makefile.in
+++ b/gcc/java/Makefile.in
@@ -170,8 +170,8 @@ JAVA_OBJS = parse.o class.o decl.o expr.o constants.o lang.o typeck.o \
 JAVA_OBJS_LITE = parse-scan.o jv-scan.o
 
 # Language-independent object files.
-OBJS = `cat ../stamp-objlist`
-OBJDEPS = ../stamp-objlist
+OBJS = `cat ../stamp-objlist` ../ggc-callbacks.o
+OBJDEPS = ../stamp-objlist ../ggc-callbacks.o
 
 compiler: ../jc1$(exeext) ../jv-scan$(exeext)
 ../jc1$(exeext): $(P) $(JAVA_OBJS) $(OBJDEPS) $(LIBDEPS)