diff options
author | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-09-14 09:42:24 +0000 |
---|---|---|
committer | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-09-14 09:42:24 +0000 |
commit | 014e6e0cbc1518bf94165b6c2aa8b63ae92960a2 (patch) | |
tree | 27bdae11f07ed6d79173032c097a020576eb13de | |
parent | 6c8f15f2c4546d54852f0d2aa4ba8cd9c01932f3 (diff) | |
download | gcc-014e6e0cbc1518bf94165b6c2aa8b63ae92960a2.tar.gz |
* Makefile.in: Add many missing dependencies.
* buffer.c, class.c, constants.c, decl.c: Use system.h and toplev.h
as appropriate.
* except.c, expr.c, jcf-io.c jcf-parse.c, jcf-write.c: Likewise.
* jvgenmain.c lang.c mangle.c typeck.c verify.c: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@22410 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r-- | gcc/java/ChangeLog | 8 | ||||
-rw-r--r-- | gcc/java/Makefile.in | 35 | ||||
-rw-r--r-- | gcc/java/buffer.c | 2 | ||||
-rw-r--r-- | gcc/java/class.c | 3 | ||||
-rw-r--r-- | gcc/java/constants.c | 3 | ||||
-rw-r--r-- | gcc/java/decl.c | 3 | ||||
-rw-r--r-- | gcc/java/except.c | 3 | ||||
-rw-r--r-- | gcc/java/expr.c | 3 | ||||
-rw-r--r-- | gcc/java/jcf-io.c | 13 | ||||
-rw-r--r-- | gcc/java/jcf-parse.c | 11 | ||||
-rw-r--r-- | gcc/java/jcf-write.c | 2 | ||||
-rw-r--r-- | gcc/java/jvgenmain.c | 3 | ||||
-rw-r--r-- | gcc/java/lang.c | 3 | ||||
-rw-r--r-- | gcc/java/mangle.c | 3 | ||||
-rw-r--r-- | gcc/java/typeck.c | 2 | ||||
-rw-r--r-- | gcc/java/verify.c | 3 |
16 files changed, 69 insertions, 31 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 7f74d05a5f4..6dc52efd086 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,11 @@ +Mon Sep 14 10:14:47 1998 Jeffrey A Law (law@cygnus.com) + + * Makefile.in: Add many missing dependencies. + * buffer.c, class.c, constants.c, decl.c: Use system.h and toplev.h + as appropriate. + * except.c, expr.c, jcf-io.c jcf-parse.c, jcf-write.c: Likewise. + * jvgenmain.c lang.c mangle.c typeck.c verify.c: Likewise. + Thu Sep 10 10:33:31 1998 Jeffrey A Law (law@cygnus.com) * Make-lang.in (GCJ): Define before using. diff --git a/gcc/java/Makefile.in b/gcc/java/Makefile.in index 4bbff70487a..05bc1e7f6de 100644 --- a/gcc/java/Makefile.in +++ b/gcc/java/Makefile.in @@ -214,6 +214,12 @@ Makefile: $(srcdir)/Makefile.in $(srcdir)/../configure native: config.status ../jc1$(exeext) # Compiling object files from source files. +TREE_H = $(srcdir)/../tree.h $(srcdir)/../real.h $(srcdir)/../tree.def \ + $(srcdir)/../machmode.h $(srcdir)/../machmode.def +JAVA_TREE_H = $(TREE_H) java-tree.h java-tree.def +RTL_H = $(srcdir)/../rtl.h $(srcdir)/../rtl.def \ + $(srcdir)/../machmode.h $(srcdir)/../machmode.def +EXPR_H = $(srcdir)/../expr.h ../insn-codes.h PARSE_H = $(srcdir)/parse.h PARSE_C = $(srcdir)/parse.c @@ -256,3 +262,32 @@ force: parse.o: $(PARSE_C) jcf-reader.c jcf-dump.o: jcf-reader.c jcf.h javaop.h javaop.def gjavah.o: jcf-reader.c jcf.h javaop.h +buffer.o : buffer.c $(CONFIG_H) buffer.h $(srcdir)/../gansidecl.h \ + $(srcdir)/../system.h $(srcdir)/../toplev.h +class.o : class.c $(CONFIG_H) $(JAVA_TREE_H) $(RTL_H) jcf.h \ + $(srcdir)/../gansidecl.h $(srcdir)/../toplev.h $(srcdir)/../system.h +constants.o : constants.c $(CONFIG_H) $(JAVA_TREE_H) jcf.h \ + $(srcdir)/../toplev.h $(srcdir)/../system.h +decl.o : decl.c $(CONFIG_H) $(JAVA_TREE_H) jcf.h \ + $(srcdir)/../toplev.h $(srcdir)/../system.h +except.o : except.c $(CONFIG_H) $(JAVA_TREE_H) jcf.h $(srcdir)/../real.h \ + $(RTL_H) javaop.h java-opcodes.h $(srcdir)/../except.h java-except.h \ + $(srcdir)/../eh-common.h $(srcdir)/../toplev.h $(srcdir)/../system.h +expr.o : expr.c $(CONFIG_H) $(JAVA_TREE_H) jcf.h $(srcdir)/../real.h \ + $(RTL_H) $(EXPR_H) javaop.h java-opcodes.h $(srcdir)/../except.h \ + java-except.h java-except.h parse.h $(srcdir)/../toplev.h \ + $(srcdir)/../system.h +jcf-io.o: jcf-io.c $(CONFIG_H) $(srcdir)/../system.h +jcf-parse.o : jcf-parse.c $(CONFIG_H) $(JAVA_TREE_H) $(srcdir)/../flags.h \ + $(srcdir)/../input.h java-except.h $(srcdir)/../system.h +jcf-write.o : jcf-write.c $(CONFIG_H) $(JAVA_TREE_H) jcf.h $(RTL_H) \ + java-opcodes.h parse.h buffer.h $(srcdir)/../system.h +jvgenmain.o : jvgenmain.c $(CONFIG_H) $(srcdir)/../system.h +lang.o : lang.c $(CONFIG_H) $(JAVA_TREE_H) jcf.h $(srcdir)/../input.h \ + $(srcdir)/../toplev.h $(srcdir)/../system.h +mangle.o : mangle.c $(CONFIG_H) jcf.h $(srcdir)/../system.h +typeck.o : typeck.c $(CONFIG_H) $(JAVA_TREE_H) jcf.h convert.h \ + $(srcdir)/../toplev.h (srcdir)/../system.h +verify.o : verify.c $(CONFIG_H) $(JAVA_TREE_H) jcf.h java-op.h java-opcodes.h \ + java-except.h $(srcdir)/../toplev.h (srcdir)/../system.h + diff --git a/gcc/java/buffer.c b/gcc/java/buffer.c index cea7899973b..67dad18a5dc 100644 --- a/gcc/java/buffer.c +++ b/gcc/java/buffer.c @@ -20,6 +20,8 @@ Boston, MA 02111-1307, USA. */ /* Written by Per Bothner <bothner@cygnus.com>, July 1998. */ +#include "config.h" +#include "system.h" #include "gansidecl.h" #include "buffer.h" diff --git a/gcc/java/class.c b/gcc/java/class.c index 9dc49dcbeec..920d50d854e 100644 --- a/gcc/java/class.c +++ b/gcc/java/class.c @@ -24,13 +24,14 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ /* Written by Per Bothner <bothner@cygnus.com> */ -#include <stdio.h> #include "config.h" +#include "system.h" #include "tree.h" #include "rtl.h" #include "java-tree.h" #include "jcf.h" #include "obstack.h" +#include "toplev.h" static tree mangle_class_field PROTO ((tree class)); diff --git a/gcc/java/constants.c b/gcc/java/constants.c index 696f6841130..507d4847387 100644 --- a/gcc/java/constants.c +++ b/gcc/java/constants.c @@ -22,10 +22,11 @@ of Sun Microsystems, Inc. in the United States and other countries. The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" +#include "system.h" #include "tree.h" #include "java-tree.h" #include "jcf.h" -#include "system.h" +#include "toplev.h" extern struct obstack permanent_obstack; diff --git a/gcc/java/decl.c b/gcc/java/decl.c index a12931fe1ba..1d00ee5f533 100644 --- a/gcc/java/decl.c +++ b/gcc/java/decl.c @@ -27,10 +27,11 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ /* Hacked by Per Bothner <bothner@cygnus.com> February 1996. */ #include "config.h" +#include "system.h" #include "tree.h" #include "java-tree.h" #include "jcf.h" -#include "system.h" +#include "toplev.h" /* The DECL_MAP is a mapping from (index, type) to a decl node. If index < max_locals, it is the index of a local variable. diff --git a/gcc/java/except.c b/gcc/java/except.c index 46c0f7cd713..cbfeb0a8cc2 100644 --- a/gcc/java/except.c +++ b/gcc/java/except.c @@ -22,8 +22,8 @@ Java and all Java-based marks are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries. The Free Software Foundation is independent of Sun Microsystems, Inc. */ -#include <stdio.h> #include "config.h" +#include "system.h" #include "tree.h" #include "real.h" #include "rtl.h" @@ -34,6 +34,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "except.h" #include "java-except.h" #include "eh-common.h" +#include "toplev.h" extern struct obstack permanent_obstack; diff --git a/gcc/java/expr.c b/gcc/java/expr.c index 2c204da534f..3b8538c60e8 100644 --- a/gcc/java/expr.c +++ b/gcc/java/expr.c @@ -24,8 +24,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ /* Hacked by Per Bothner <bothner@cygnus.com> February 1996. */ -#include <stdio.h> #include "config.h" +#include "system.h" #include "tree.h" #include "real.h" #include "rtl.h" @@ -36,6 +36,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "jcf.h" #include "java-except.h" #include "parse.h" +#include "toplev.h" static tree operand_type[59]; extern struct obstack permanent_obstack; diff --git a/gcc/java/jcf-io.c b/gcc/java/jcf-io.c index e805d08dbb4..e5586326d8d 100644 --- a/gcc/java/jcf-io.c +++ b/gcc/java/jcf-io.c @@ -22,19 +22,14 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ /* Written by Per Bothner <bothner@cygnus.com>, February 1996. */ -#include <stdio.h> +#include "config.h" +#include "system.h" #define ENABLE_UNZIP 1 #include "jcf.h" -#ifdef __STDC__ -#include <stdlib.h> -#endif -#include <sys/types.h> #include <sys/stat.h> #include <sys/wait.h> -#include <errno.h> -#include <fcntl.h> /* DOS brain-damage */ #ifndef O_BINARY @@ -158,8 +153,8 @@ zipfile, zipmember), jcf->read_ptr = jcf->buffer; jcf->read_end = jcf->buffer_end; jcf->filbuf = jcf_unexpected_eof; - jcf->filename = (char *) strdup (zipfile); - jcf->classname = (char *) strdup (zipmember); + jcf->filename = strdup (zipfile); + jcf->classname = strdup (zipmember); jcf->zipd = (void *)zipd; if (lseek (zipf->z.fd, zipd->filestart, 0) < 0 || read (zipf->z.fd, jcf->buffer, zipd->size) != zipd->size) diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c index 0e8c51ccbde..cdcbcedd8e1 100644 --- a/gcc/java/jcf-parse.c +++ b/gcc/java/jcf-parse.c @@ -24,9 +24,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ /* Written by Per Bothner <bothner@cygnus.com> */ -#include <stdio.h> -#include <ctype.h> #include "config.h" +#include "system.h" #include "tree.h" #include "obstack.h" #include "flags.h" @@ -51,14 +50,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ JCF_SKIP (JCF, LENGTH); } while (0) #include "jcf.h" -#ifdef __STDC__ -/* For getenv */ -#include <stdlib.h> -#endif - -#ifndef SEEK_SET -#include <unistd.h> -#endif extern struct obstack *saveable_obstack; extern struct obstack temporary_obstack; diff --git a/gcc/java/jcf-write.c b/gcc/java/jcf-write.c index 931c9d582c1..b5bbdff0a83 100644 --- a/gcc/java/jcf-write.c +++ b/gcc/java/jcf-write.c @@ -22,10 +22,10 @@ of Sun Microsystems, Inc. in the United States and other countries. The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" +#include "system.h" #include "tree.h" #include "java-tree.h" #include "jcf.h" -#include <stdio.h> #include "obstack.h" #undef AND #include "rtl.h" diff --git a/gcc/java/jvgenmain.c b/gcc/java/jvgenmain.c index ce7c60a315e..5e767afffe6 100644 --- a/gcc/java/jvgenmain.c +++ b/gcc/java/jvgenmain.c @@ -24,9 +24,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ /* Written by Per Bothner <bothner@cygnus.com> */ -#include <stdio.h> -#include <stdlib.h> #include "config.h" +#include "system.h" #include "obstack.h" const char main_method_prefix[] = "main__"; diff --git a/gcc/java/lang.c b/gcc/java/lang.c index ddaff0cc6b5..7d46f50eb5d 100644 --- a/gcc/java/lang.c +++ b/gcc/java/lang.c @@ -24,12 +24,13 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ /* Hacked by Per Bothner <bothner@cygnus.com> February 1996. */ -#include <stdio.h> #include "config.h" +#include "system.h" #include "tree.h" #include "input.h" #include "java-tree.h" #include "jcf.h" +#include "toplev.h" int compiling_from_source; diff --git a/gcc/java/mangle.c b/gcc/java/mangle.c index f303c926a08..08f587a6c96 100644 --- a/gcc/java/mangle.c +++ b/gcc/java/mangle.c @@ -25,9 +25,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ /* Written by Per Bothner <bothner@cygnus.com> */ -#include <stdio.h> -#include <string.h> #include "config.h" +#include "system.h" #include "jcf.h" #include "obstack.h" diff --git a/gcc/java/typeck.c b/gcc/java/typeck.c index 211e4b69cc4..b388ff7b44d 100644 --- a/gcc/java/typeck.c +++ b/gcc/java/typeck.c @@ -25,11 +25,13 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ /* Written by Per Bothner <bothner@cygnus.com> */ #include "config.h" +#include "system.h" #include "tree.h" #include "obstack.h" #include "java-tree.h" #include "jcf.h" #include "convert.h" +#include "toplev.h" tree * type_map; extern struct obstack permanent_obstack; diff --git a/gcc/java/verify.c b/gcc/java/verify.c index 82a081f079c..e0d4e097773 100644 --- a/gcc/java/verify.c +++ b/gcc/java/verify.c @@ -23,14 +23,15 @@ Java and all Java-based marks are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries. The Free Software Foundation is independent of Sun Microsystems, Inc. */ -#include <stdio.h> #include "config.h" +#include "system.h" #include "tree.h" #include "java-tree.h" #include "javaop.h" #include "java-opcodes.h" #include "jcf.h" #include "java-except.h" +#include "toplev.h" extern int stack_pointer; |