From 00d30284b84eedd162ed081fe008c459dc7c98e3 Mon Sep 17 00:00:00 2001 From: "Kaveh R. Ghazi" Date: Tue, 31 Aug 1999 00:34:22 +0000 Subject: [PATCH] Makefile.in (LIBS): Fix definition so we link with $(CLIB). * Makefile.in (LIBS): Fix definition so we link with $(CLIB). Remove hacks for stuff which comes from libiberty. * Make-lang.in: Likewise. From-SVN: r28995 --- gcc/java/ChangeLog | 7 +++++++ gcc/java/Make-lang.in | 6 +++--- gcc/java/Makefile.in | 34 +++++++++------------------------- 3 files changed, 19 insertions(+), 28 deletions(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 79e18aae7fe..f0730bc73c2 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,10 @@ +1999-08-30 Kaveh R. Ghazi + + * Makefile.in (LIBS): Fix definition so we link with $(CLIB). + Remove hacks for stuff which comes from libiberty. + + * Make-lang.in: Likewise. + Mon Aug 30 16:41:41 1999 Hans-Peter Nilsson * Makefile.in (xref.o): Depend on xref.c explicitly. diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index 39397f267fc..d0234ff2dd0 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -97,7 +97,7 @@ $(GCJ)-cross$(exeext): $(GCJ)$(exeext) # Dependencies here must be kept in sync with dependencies in Makefile.in. jvgenmain$(exeext): $(srcdir)/java/jvgenmain.c $(srcdir)/java/mangle.c \ - $(OBSTACK) $(LIBDEPS) $(TREE_H) + $(LIBDEPS) $(TREE_H) cd java && $(MAKE) $(FLAGS_TO_PASS) $(JAVA_FLAGS_TO_PASS) ../jvgenmain$(exeext) # This must be kept in sync with dependencies in Makefile.in. @@ -112,14 +112,14 @@ gcjh$(exeext): $(GCJH_SOURCES) $(LIBDEPS) $(TREE_H) # This must be kept in sync with dependencies in Makefile.in. JV_SCAN_SOURCES = $(srcdir)/java/parse-scan.y $(srcdir)/java/lex.c \ - $(srcdir)/java/parse.h $(srcdir)/java/lex.h $(srcdir)/java/jv-scan.c $(srcdir)/../libiberty/xmalloc.c $(srcdir)/../libiberty/xstrdup.c + $(srcdir)/java/parse.h $(srcdir)/java/lex.h $(srcdir)/java/jv-scan.c jv-scan$(exeext): $(JV_SCAN_SOURCES) stamp-objlist $(LIBDEPS) cd java && $(MAKE) $(FLAGS_TO_PASS) $(JAVA_FLAGS_TO_PASS) ../jv-scan$(exeext) # This must be kept in sync with dependencies in Makefile.in. JCF_DUMP_SOURCES = $(srcdir)/java/jcf-dump.c $(srcdir)/java/jcf-io.c \ - $(srcdir)/java/zextract.c $(srcdir)/../libiberty/memmove.c $(TREE_H) + $(srcdir)/java/zextract.c $(TREE_H) jcf-dump$(exeext): $(JCF_DUMP_SOURCES) cd java && $(MAKE) $(FLAGS_TO_PASS) $(JAVA_FLAGS_TO_PASS) ../jcf-dump$(exeext) diff --git a/gcc/java/Makefile.in b/gcc/java/Makefile.in index bca2c9ecb78..0b36c236cb2 100644 --- a/gcc/java/Makefile.in +++ b/gcc/java/Makefile.in @@ -41,8 +41,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 @@ -73,10 +71,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. @@ -107,10 +101,6 @@ libgcj_zip = $(datadir)/libgcj.zip # 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 @@ -148,13 +138,13 @@ ALL_CFLAGS = $(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) $(CFLAGS) $(XCFLAGS) -W # Likewise. ALL_CPPFLAGS = $(CPPFLAGS) $(X_CPPFLAGS) $(T_CPPFLAGS) -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) $(CLIB) +LIBS = $(LIBIBERTY) $(CLIB) +LIBDEPS = $(LIBIBERTY) # Specify the directories to be searched for header files. # Both . and srcdir are used, in that order, @@ -179,9 +169,6 @@ 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 -LIBS = ../../libiberty/libiberty.a -LIBDEPS = $(LIBS) - # Language-independent object files. OBJS = `cat ../stamp-objlist` OBJDEPS = ../stamp-objlist @@ -189,21 +176,19 @@ OBJDEPS = ../stamp-objlist compiler: ../jc1$(exeext) ../jv-scan$(exeext) ../jc1$(exeext): $(P) $(JAVA_OBJS) $(OBJDEPS) $(LIBDEPS) rm -f ../jc1$(exeext) - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \ - $(JAVA_OBJS) $(OBJS) $(SUBDIR_OBSTACK) $(LIBS) + $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JAVA_OBJS) $(OBJS) $(LIBS) ../jv-scan$(exeext): $(P) $(JAVA_OBJS_LITE) $(OBJDEPS) $(LIBDEPS) rm -f ../jv-scan$(exeext) - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \ - $(JAVA_OBJS_LITE) $(SUBDIR_OBSTACK) $(LIBS) + $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JAVA_OBJS_LITE) $(LIBS) ../jcf-dump$(exeext): jcf-dump.o jcf-io.o jcf-depend.o jcf-path.o \ - zextract.o + zextract.o $(LIBDEPS) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ jcf-dump.o jcf-io.o \ jcf-depend.o jcf-path.o zextract.o $(LIBS) # Dependencies here must be kept in sync with dependencies in Make-lang.in. ../jvgenmain$(exeext): jvgenmain.o mangle.o $(LIBDEPS) - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ jvgenmain.o mangle.o ../obstack.o $(LIBS) + $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ jvgenmain.o mangle.o $(LIBS) ../gcjh$(exeext): gjavah.o jcf-io.o jcf-depend.o jcf-path.o \ zextract.o $(LIBDEPS) @@ -282,8 +267,7 @@ gjavah.o : $(CONFIG_H) $(srcdir)/../system.h $(JAVA_TREE_H) gjavah.c \ buffer.o : buffer.c $(CONFIG_H) buffer.h $(srcdir)/../gansidecl.h \ $(srcdir)/../system.h $(srcdir)/../toplev.h check-init.o : check-init.c $(CONFIG_H) $(srcdir)/../gansidecl.h \ - $(srcdir)/../../include/libiberty.h $(JAVA_TREE_H) \ - $(srcdir)/../system.h $(srcdir)/../toplev.h + $(JAVA_TREE_H) $(srcdir)/../system.h $(srcdir)/../toplev.h class.o : class.c $(CONFIG_H) $(JAVA_TREE_H) $(RTL_H) jcf.h $(PARSE_H) \ $(srcdir)/../gansidecl.h $(srcdir)/../toplev.h $(srcdir)/../system.h \ $(srcdir)/../output.h