Makefile.in (LIBS, LIBDEPS): Link with & depend on libiberty.a.

	* Makefile.in (LIBS, LIBDEPS): Link with & depend on libiberty.a.
	Remove hacks for stuff which now comes from libiberty.

From-SVN: r28994

6 files changed, 37 insertions, 65 deletions

diff --git a/gcc/ch/ChangeLog b/gcc/ch/ChangeLog
index 32b9e68..76471e1 100644
--- a/gcc/ch/ChangeLog
+++ b/gcc/ch/ChangeLog
@@ -1,3 +1,8 @@
+1999-08-30  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* Makefile.in (LIBS, LIBDEPS): Link with & depend on libiberty.a.
+	Remove hacks for stuff which now comes from libiberty.
+
 1999-08-29  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* lang.c (chill_print_error_function): Constify a char*.
diff --git a/gcc/ch/Makefile.in b/gcc/ch/Makefile.in
index 2cd8544..b42532a 100644
--- a/gcc/ch/Makefile.in
+++ b/gcc/ch/Makefile.in
@@ -38,8 +38,6 @@
 # Variables that exist for you to override.
 # See below for how to change them for certain systems.
 
-ALLOCA =
-
 # Various ways of specifying flags for compilations:  
 # CFLAGS is for the user to override to, e.g., do a bootstrap with -O2.
 # BOOT_CFLAGS is the value of CFLAGS to pass
@@ -67,10 +65,6 @@ TEXI2DVI = texi2dvi
 # to compile all the gen* files first by hand to avoid erroneous results.
 P =
 
-# This is used in the definition of SUBDIR_USE_ALLOCA.
-# ??? Perhaps it would be better if it just looked for *gcc*.
-OLDCC = cc
-
 # This is used instead of ALL_CFLAGS when compiling with GCC_FOR_TARGET.
 # It omits XCFLAGS, and specifies -B./.
 # It also specifies -B$(tooldir)/ to find as and ld for a cross compiler.
@@ -102,10 +96,6 @@ texidir = $(srcdir)/../../texinfo
 # Additional system libraries to link with.
 CLIB=
 
-# Change this to a null string if obstacks are installed in the
-# system library.
-OBSTACK=obstack.o
-
 # Choose the real default target.
 ALL=all
 
@@ -138,17 +128,13 @@ ALL_CFLAGS = $(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) $(CFLAGS) $(XCFLAGS)
 # Likewise.
 ALL_CPPFLAGS = $(CPPFLAGS) $(X_CPPFLAGS) $(T_CPPFLAGS)
 
-# CYGNUS LOCAL: SUBDIR_USE_ALLOCA is different from FSF.
-# Even if ALLOCA is set, don't use it if compiling with GCC.
-
-SUBDIR_OBSTACK = `if [ x$(OBSTACK) != x ]; then echo ../$(OBSTACK); else true; fi`
-#SUBDIR_USE_ALLOCA = `case "${CC}" in "${OLDCC}") if [ x$(ALLOCA) != x ]; then echo ../$(ALLOCA); else true; fi ;; esac`
-SUBDIR_USE_ALLOCA = `if [ x$(ALLOCA) != x ]; then echo ../$(ALLOCA); else true; fi`
-SUBDIR_MALLOC = `if [ x$(MALLOC) != x ]; then echo ../$(MALLOC); else true; fi`
+# This is where we get libiberty.a from.
+LIBIBERTY = ../../libiberty/libiberty.a
 
 # How to link with both our special library facilities
 # and the system's installed libraries.
-LIBS = $(SUBDIR_OBSTACK) $(SUBDIR_USE_ALLOCA) $(SUBDIR_MALLOC) $(CLIB)
+LIBS = $(LIBIBERTY) $(CLIB)
+LIBDEPS = $(LIBIBERTY)
 
 # Specify the directories to be searched for header files.
 # Both . and srcdir are used, in that order,
@@ -270,10 +256,10 @@ $(srcdir)/hash.h:
 	  gperf.tmp > $(srcdir)/hash.h
 	$(RM) gperf.tmp gperf.tmp2 sed.tmp
 
-actions.o : actions.c $(CONFIG_H) $(CHILL_TREE_H) actions.h $(RTL_H) \
-	lex.h $(srcdir)/../flags.h $(srcdir)/../../include/obstack.h \
-	$(srcdir)/../input.h $(srcdir)/../expr.h ../insn-codes.h \
-	$(srcdir)/../system.h $(srcdir)/../toplev.h
+actions.o : actions.c $(CONFIG_H) $(CHILL_TREE_H) actions.h $(RTL_H)	\
+	lex.h $(srcdir)/../flags.h $(srcdir)/../input.h			\
+	$(srcdir)/../expr.h ../insn-codes.h $(srcdir)/../system.h	\
+	$(srcdir)/../toplev.h
 convert.o : convert.c $(CONFIG_H) $(CHILL_TREE_H) $(srcdir)/../flags.h \
 	$(srcdir)/../tree.h $(srcdir)/../system.h $(srcdir)/../toplev.h
 decl.o : decl.c $(CONFIG_H) $(CHILL_TREE_H) $(srcdir)/../flags.h lex.h \
@@ -291,24 +277,20 @@ inout.o : inout.c $(CONFIG_H) $(CHILL_TREE_H) $(srcdir)/../flags.h \
 lang.o : lang.c $(CONFIG_H) $(CHILL_TREE_H) $(srcdir)/../input.h lex.h \
 	$(srcdir)/../system.h $(srcdir)/../toplev.h
 lex.o : lex.c $(CONFIG_H) $(CHILL_TREE_H) $(RTL_H) $(srcdir)/../flags.h \
-	$(srcdir)/../input.h $(srcdir)/parse.h $(srcdir)/../system.h \
-	$(srcdir)/../toplev.h $(srcdir)/../../include/obstack.h lex.h \
-	$(srcdir)/../dwarfout.h hash.h
+	$(srcdir)/../input.h $(srcdir)/parse.h $(srcdir)/../system.h	\
+	$(srcdir)/../toplev.h lex.h $(srcdir)/../dwarfout.h hash.h
 loop.o : loop.c $(CONFIG_H) $(RTL_H) $(CHILL_TREE_H) lex.h \
 	$(srcdir)/../flags.h $(srcdir)/../input.h \
-	$(srcdir)/../../include/obstack.h $(srcdir)/../tree.h \
-	$(srcdir)/../system.h $(srcdir)/../toplev.h
+	$(srcdir)/../tree.h $(srcdir)/../system.h $(srcdir)/../toplev.h
 parse.o : parse.c $(CONFIG_H) $(CHILL_TREE_H) parse.h \
 	lex.h actions.h tasking.h $(srcdir)/../system.h $(srcdir)/../toplev.h
 satisfy.o : satisfy.c $(CONFIG_H) $(CHILL_TREE_H) $(srcdir)/../tree.h \
 	$(srcdir)/../flags.h lex.h $(srcdir)/../system.h $(srcdir)/../toplev.h
 timing.o : timing.c $(CONFIG_H) $(CHILL_TREE_H) $(RTL_H) $(srcdir)/../flags.h \
-	$(srcdir)/../input.h $(srcdir)/../../include/obstack.h lex.h \
-	$(srcdir)/../system.h $(srcdir)/../toplev.h
+	$(srcdir)/../input.h lex.h $(srcdir)/../system.h $(srcdir)/../toplev.h
 tasking.o : tasking.c $(CONFIG_H) $(CHILL_TREE_H) $(RTL_H) \
 	$(srcdir)/../flags.h $(srcdir)/../input.h \
-	$(srcdir)/../../include/obstack.h lex.h $(srcdir)/../system.h \
-	$(srcdir)/../toplev.h
+	lex.h $(srcdir)/../system.h $(srcdir)/../toplev.h
 tree.o : tree.c $(CONFIG_H) $(CHILL_TREE_H) $(srcdir)/../system.h \
 	$(srcdir)/../toplev.h
 typeck.o : typeck.c $(CONFIG_H) $(CHILL_TREE_H) ../insn-codes.h \
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0e72145..00a915a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+1999-08-30  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* Makefile.in (LIBS, LIBDEPS): Link with & depend on libiberty.a.
+	Remove hacks for stuff which now comes from libiberty.
+
 1999-08-30  Jason Merrill  <jason@yorick.cygnus.com>
 
 	* cp-tree.h (IS_AGGR_TYPE_2): Fix typo.
diff --git a/gcc/cp/Makefile.in b/gcc/cp/Makefile.in
index 5860d3d..091898e 100644
--- a/gcc/cp/Makefile.in
+++ b/gcc/cp/Makefile.in
@@ -41,8 +41,6 @@ INTERFACE = 2
 # Variables that exist for you to override.
 # See below for how to change them for certain systems.
 
-ALLOCA =
-
 # Various ways of specifying flags for compilations:  
 # CFLAGS is for the user to override to, e.g., do a bootstrap with -O2.
 # BOOT_CFLAGS is the value of CFLAGS to pass
@@ -74,10 +72,6 @@ TEXI2DVI = texi2dvi
 # to compile all the gen* files first by hand to avoid erroneous results.
 P =
 
-# This is used in the definition of SUBDIR_USE_ALLOCA.
-# ??? Perhaps it would be better if it just looked for *gcc*.
-OLDCC = cc
-
 # This is used instead of ALL_CFLAGS when compiling with GCC_FOR_TARGET.
 # It omits XCFLAGS, and specifies -B./.
 # It also specifies -B$(tooldir)/ to find as and ld for a cross compiler.
@@ -112,10 +106,6 @@ top_builddir = ..
 # Internationalization library.
 INTLLIBS = @INTLLIBS@
 
-# Change this to a null string if obstacks are installed in the
-# system library.
-OBSTACK=obstack.o
-
 # Choose the real default target.
 ALL=all
 
@@ -152,16 +142,13 @@ ALL_CFLAGS = $(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) $(CFLAGS) $(XCFLAGS) -W
 # Likewise.
 ALL_CPPFLAGS = $(CPPFLAGS) $(X_CPPFLAGS) $(T_CPPFLAGS)
 
-# Even if ALLOCA is set, don't use it if compiling with GCC.
-
-SUBDIR_OBSTACK = `if [ x$(OBSTACK) != x ]; then echo ../$(OBSTACK); else true; fi`
-SUBDIR_USE_ALLOCA = `case "${CC}" in "${OLDCC}") if [ x$(ALLOCA) != x ]; then echo ../$(ALLOCA); else true; fi ;; esac`
-SUBDIR_MALLOC = `if [ x$(MALLOC) != x ]; then echo ../$(MALLOC); else true; fi`
+# This is where we get libiberty.a from.
+LIBIBERTY = ../../libiberty/libiberty.a
 
 # How to link with both our special library facilities
 # and the system's installed libraries.
-LIBS = $(SUBDIR_OBSTACK) $(SUBDIR_USE_ALLOCA) $(SUBDIR_MALLOC) \
-  $(INTLLIBS) $(CLIB)
+LIBS = $(INTLLIBS) $(LIBIBERTY) $(CLIB)
+LIBDEPS = $(INTLLIBS) $(LIBIBERTY)
 
 # Specify the directories to be searched for header files.
 # Both . and srcdir are used, in that order,
diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index fd021c9..848cd25 100644
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 30 20:29:30 1999  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* Makefile.in (LIBS, LIBDEPS): Link with & depend on libiberty.a.
+	Remove hacks for stuff which now comes from libiberty.
+
 Sun Aug 29 09:47:45 1999  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* com.c (lang_printable_name): Constify a char*.
diff --git a/gcc/f/Makefile.in b/gcc/f/Makefile.in
index 96975a5..5d1e558 100644
--- a/gcc/f/Makefile.in
+++ b/gcc/f/Makefile.in
@@ -37,8 +37,6 @@
 # Variables that exist for you to override.
 # See below for how to change them for certain systems.
 
-ALLOCA =
-
 # Various ways of specifying flags for compilations:
 # CFLAGS is for the user to override to, e.g., do a bootstrap with -O2.
 # BOOT_CFLAGS is the value of CFLAGS to pass
@@ -70,10 +68,6 @@ TEXI2DVI = texi2dvi
 # to compile all the gen* files first by hand to avoid erroneous results.
 P =
 
-# This is used in the definition of SUBDIR_USE_ALLOCA.
-# ??? Perhaps it would be better if it just looked for *gcc*.
-OLDCC = cc
-
 # This is used instead of ALL_CFLAGS when compiling with GCC_FOR_TARGET.
 # It omits XCFLAGS, and specifies -B./.
 # It also specifies -B$(tooldir)/ to find as and ld for a cross compiler.
@@ -94,10 +88,6 @@ VPATH = @srcdir@
 # Additional system libraries to link with.
 CLIB=
 
-# Change this to a null string if obstacks are installed in the
-# system library.
-OBSTACK=obstack.o
-
 # Choose the real default target.
 ALL=all
 
@@ -134,21 +124,19 @@ ALL_CFLAGS = $(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) $(CFLAGS) $(XCFLAGS) -W
 # Likewise.
 ALL_CPPFLAGS = $(CPPFLAGS) $(X_CPPFLAGS) $(T_CPPFLAGS)
 
+# This is where we get libiberty.a from.
+LIBIBERTY = ../../libiberty/libiberty.a
+
 # We should be compiling with the built compiler, for which
 # BOOT_LDFLAGS is appropriate.  (Formerly we had a separate
 # F771_LDFLAGS, but the ld flags can be taken care of by the target
 # configuration files in egcs.)
 LDFLAGS=$(BOOT_LDFLAGS)
 
-# Even if ALLOCA is set, don't use it if compiling with GCC.
-
-SUBDIR_OBSTACK = `if [ x$(OBSTACK) != x ]; then echo ../$(OBSTACK); else true; fi`
-SUBDIR_USE_ALLOCA = `case "${CC}" in "${OLDCC}") if [ x$(ALLOCA) != x ]; then echo ../$(ALLOCA); else true; fi ;; esac`
-SUBDIR_MALLOC = `if [ x$(MALLOC) != x ]; then echo ../$(MALLOC); else true; fi`
-
 # How to link with both our special library facilities
 # and the system's installed libraries.
-LIBS = $(SUBDIR_OBSTACK) $(SUBDIR_USE_ALLOCA) $(SUBDIR_MALLOC) $(CLIB)
+LIBS = $(LIBIBERTY) $(CLIB)
+LIBDEPS = $(LIBIBERTY)
 
 # Specify the directories to be searched for header files.
 # Both . and srcdir are used, in that order,