diff options
| author | Kaveh R. Ghazi <ghazi@caip.rutgers.edu> | 1999-08-31 00:30:56 +0000 |
|---|---|---|
| committer | Kaveh Ghazi <ghazi@gcc.gnu.org> | 1999-08-31 00:30:56 +0000 |
| commit | 7d12830c32ccb918b5bb6d682e9d6e9b59247def (patch) | |
| tree | 292a1d19139b0710f8e763c409cdf7680bd91757 /gcc/f | |
| parent | 5c45a8ac5ff0e34eac7862114c318f42b4b97608 (diff) | |
| download | gcc-7d12830c32ccb918b5bb6d682e9d6e9b59247def.zip gcc-7d12830c32ccb918b5bb6d682e9d6e9b59247def.tar.gz gcc-7d12830c32ccb918b5bb6d682e9d6e9b59247def.tar.bz2 | |
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
Diffstat (limited to 'gcc/f')
| -rw-r--r-- | gcc/f/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/f/Makefile.in | 22 |
2 files changed, 10 insertions, 17 deletions
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, |