Skip to content

R
riscv-gcc-1
Commit 1f43f4b4 by Jeffrey A Law Committed by Jeff Law
Options

Makefile.in: Add many missing dependencies. 

        * 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.

From-SVN: r22410
parent edfc5c06
Showing with 69 additions and 31 deletions
gcc/java/ChangeLog
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) Thu Sep 10 10:33:31 1998 Jeffrey A Law (law@cygnus.com)
* Make-lang.in (GCJ): Define before using. * Make-lang.in (GCJ): Define before using.
......
gcc/java/Makefile.in
...@@ -214,6 +214,12 @@ Makefile: $(srcdir)/Makefile.in $(srcdir)/../configure ...@@ -214,6 +214,12 @@ Makefile: $(srcdir)/Makefile.in $(srcdir)/../configure
native: config.status ../jc1$(exeext) native: config.status ../jc1$(exeext)
# Compiling object files from source files. # 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_H = $(srcdir)/parse.h
PARSE_C = $(srcdir)/parse.c PARSE_C = $(srcdir)/parse.c
...@@ -256,3 +262,32 @@ force: ...@@ -256,3 +262,32 @@ force:
parse.o: $(PARSE_C) jcf-reader.c parse.o: $(PARSE_C) jcf-reader.c
jcf-dump.o: jcf-reader.c jcf.h javaop.h javaop.def jcf-dump.o: jcf-reader.c jcf.h javaop.h javaop.def
gjavah.o: jcf-reader.c jcf.h javaop.h 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
gcc/java/buffer.c
...@@ -20,6 +20,8 @@ Boston, MA 02111-1307, USA. */ ...@@ -20,6 +20,8 @@ Boston, MA 02111-1307, USA. */
/* Written by Per Bothner <bothner@cygnus.com>, July 1998. */ /* Written by Per Bothner <bothner@cygnus.com>, July 1998. */
#include "config.h"
#include "system.h"
#include "gansidecl.h" #include "gansidecl.h"
#include "buffer.h" #include "buffer.h"
......
gcc/java/class.c
...@@ -24,13 +24,14 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ ...@@ -24,13 +24,14 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
/* Written by Per Bothner <bothner@cygnus.com> */ /* Written by Per Bothner <bothner@cygnus.com> */
#include <stdio.h>
#include "config.h" #include "config.h"
#include "system.h"
#include "tree.h" #include "tree.h"
#include "rtl.h" #include "rtl.h"
#include "java-tree.h" #include "java-tree.h"
#include "jcf.h" #include "jcf.h"
#include "obstack.h" #include "obstack.h"
#include "toplev.h"
static tree mangle_class_field PROTO ((tree class)); static tree mangle_class_field PROTO ((tree class));
......
gcc/java/constants.c
...@@ -22,10 +22,11 @@ of Sun Microsystems, Inc. in the United States and other countries. ...@@ -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. */ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "config.h" #include "config.h"
#include "system.h"
#include "tree.h" #include "tree.h"
#include "java-tree.h" #include "java-tree.h"
#include "jcf.h" #include "jcf.h"
#include "system.h" #include "toplev.h"
extern struct obstack permanent_obstack; extern struct obstack permanent_obstack;
......
gcc/java/decl.c
...@@ -27,10 +27,11 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ ...@@ -27,10 +27,11 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
/* Hacked by Per Bothner <bothner@cygnus.com> February 1996. */ /* Hacked by Per Bothner <bothner@cygnus.com> February 1996. */
#include "config.h" #include "config.h"
#include "system.h"
#include "tree.h" #include "tree.h"
#include "java-tree.h" #include "java-tree.h"
#include "jcf.h" #include "jcf.h"
#include "system.h" #include "toplev.h"
/* The DECL_MAP is a mapping from (index, type) to a decl node. /* 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. If index < max_locals, it is the index of a local variable.
......
gcc/java/except.c
...@@ -22,8 +22,8 @@ Java and all Java-based marks are trademarks or registered trademarks ...@@ -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. of Sun Microsystems, Inc. in the United States and other countries.
The Free Software Foundation is independent of Sun Microsystems, Inc. */ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include <stdio.h>
#include "config.h" #include "config.h"
#include "system.h"
#include "tree.h" #include "tree.h"
#include "real.h" #include "real.h"
#include "rtl.h" #include "rtl.h"
...@@ -34,6 +34,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ ...@@ -34,6 +34,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "except.h" #include "except.h"
#include "java-except.h" #include "java-except.h"
#include "eh-common.h" #include "eh-common.h"
#include "toplev.h"
extern struct obstack permanent_obstack; extern struct obstack permanent_obstack;
......
gcc/java/expr.c
...@@ -24,8 +24,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ ...@@ -24,8 +24,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
/* Hacked by Per Bothner <bothner@cygnus.com> February 1996. */ /* Hacked by Per Bothner <bothner@cygnus.com> February 1996. */
#include <stdio.h>
#include "config.h" #include "config.h"
#include "system.h"
#include "tree.h" #include "tree.h"
#include "real.h" #include "real.h"
#include "rtl.h" #include "rtl.h"
...@@ -36,6 +36,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ ...@@ -36,6 +36,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "jcf.h" #include "jcf.h"
#include "java-except.h" #include "java-except.h"
#include "parse.h" #include "parse.h"
#include "toplev.h"
static tree operand_type[59]; static tree operand_type[59];
extern struct obstack permanent_obstack; extern struct obstack permanent_obstack;
......
gcc/java/jcf-io.c
...@@ -22,19 +22,14 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ ...@@ -22,19 +22,14 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
/* Written by Per Bothner <bothner@cygnus.com>, February 1996. */ /* Written by Per Bothner <bothner@cygnus.com>, February 1996. */
#include <stdio.h> #include "config.h"
#include "system.h"
#define ENABLE_UNZIP 1 #define ENABLE_UNZIP 1
#include "jcf.h" #include "jcf.h"
#ifdef __STDC__
#include <stdlib.h>
#endif
#include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <errno.h>
#include <fcntl.h>
/* DOS brain-damage */ /* DOS brain-damage */
#ifndef O_BINARY #ifndef O_BINARY
...@@ -158,8 +153,8 @@ zipfile, zipmember), ...@@ -158,8 +153,8 @@ zipfile, zipmember),
jcf->read_ptr = jcf->buffer; jcf->read_ptr = jcf->buffer;
jcf->read_end = jcf->buffer_end; jcf->read_end = jcf->buffer_end;
jcf->filbuf = jcf_unexpected_eof; jcf->filbuf = jcf_unexpected_eof;
jcf->filename = (char *) strdup (zipfile); jcf->filename = strdup (zipfile);
jcf->classname = (char *) strdup (zipmember); jcf->classname = strdup (zipmember);
jcf->zipd = (void *)zipd; jcf->zipd = (void *)zipd;
if (lseek (zipf->z.fd, zipd->filestart, 0) < 0 if (lseek (zipf->z.fd, zipd->filestart, 0) < 0
|| read (zipf->z.fd, jcf->buffer, zipd->size) != zipd->size) || read (zipf->z.fd, jcf->buffer, zipd->size) != zipd->size)
......
gcc/java/jcf-parse.c
...@@ -24,9 +24,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ ...@@ -24,9 +24,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
/* Written by Per Bothner <bothner@cygnus.com> */ /* Written by Per Bothner <bothner@cygnus.com> */
#include <stdio.h>
#include <ctype.h>
#include "config.h" #include "config.h"
#include "system.h"
#include "tree.h" #include "tree.h"
#include "obstack.h" #include "obstack.h"
#include "flags.h" #include "flags.h"
...@@ -51,14 +50,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ ...@@ -51,14 +50,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
JCF_SKIP (JCF, LENGTH); } while (0) JCF_SKIP (JCF, LENGTH); } while (0)
#include "jcf.h" #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 *saveable_obstack;
extern struct obstack temporary_obstack; extern struct obstack temporary_obstack;
......
gcc/java/jcf-write.c
...@@ -22,10 +22,10 @@ of Sun Microsystems, Inc. in the United States and other countries. ...@@ -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. */ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "config.h" #include "config.h"
#include "system.h"
#include "tree.h" #include "tree.h"
#include "java-tree.h" #include "java-tree.h"
#include "jcf.h" #include "jcf.h"
#include <stdio.h>
#include "obstack.h" #include "obstack.h"
#undef AND #undef AND
#include "rtl.h" #include "rtl.h"
......
gcc/java/jvgenmain.c
...@@ -24,9 +24,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ ...@@ -24,9 +24,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
/* Written by Per Bothner <bothner@cygnus.com> */ /* Written by Per Bothner <bothner@cygnus.com> */
#include <stdio.h>
#include <stdlib.h>
#include "config.h" #include "config.h"
#include "system.h"
#include "obstack.h" #include "obstack.h"
const char main_method_prefix[] = "main__"; const char main_method_prefix[] = "main__";
......
gcc/java/lang.c
...@@ -24,12 +24,13 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ ...@@ -24,12 +24,13 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
/* Hacked by Per Bothner <bothner@cygnus.com> February 1996. */ /* Hacked by Per Bothner <bothner@cygnus.com> February 1996. */
#include <stdio.h>
#include "config.h" #include "config.h"
#include "system.h"
#include "tree.h" #include "tree.h"
#include "input.h" #include "input.h"
#include "java-tree.h" #include "java-tree.h"
#include "jcf.h" #include "jcf.h"
#include "toplev.h"
int compiling_from_source; int compiling_from_source;
......
gcc/java/mangle.c
...@@ -25,9 +25,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ ...@@ -25,9 +25,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
/* Written by Per Bothner <bothner@cygnus.com> */ /* Written by Per Bothner <bothner@cygnus.com> */
#include <stdio.h>
#include <string.h>
#include "config.h" #include "config.h"
#include "system.h"
#include "jcf.h" #include "jcf.h"
#include "obstack.h" #include "obstack.h"
......
gcc/java/typeck.c
...@@ -25,11 +25,13 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ ...@@ -25,11 +25,13 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
/* Written by Per Bothner <bothner@cygnus.com> */ /* Written by Per Bothner <bothner@cygnus.com> */
#include "config.h" #include "config.h"
#include "system.h"
#include "tree.h" #include "tree.h"
#include "obstack.h" #include "obstack.h"
#include "java-tree.h" #include "java-tree.h"
#include "jcf.h" #include "jcf.h"
#include "convert.h" #include "convert.h"
#include "toplev.h"
tree * type_map; tree * type_map;
extern struct obstack permanent_obstack; extern struct obstack permanent_obstack;
......
gcc/java/verify.c
...@@ -23,14 +23,15 @@ Java and all Java-based marks are trademarks or registered trademarks ...@@ -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. of Sun Microsystems, Inc. in the United States and other countries.
The Free Software Foundation is independent of Sun Microsystems, Inc. */ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include <stdio.h>
#include "config.h" #include "config.h"
#include "system.h"
#include "tree.h" #include "tree.h"
#include "java-tree.h" #include "java-tree.h"
#include "javaop.h" #include "javaop.h"
#include "java-opcodes.h" #include "java-opcodes.h"
#include "jcf.h" #include "jcf.h"
#include "java-except.h" #include "java-except.h"
#include "toplev.h"
extern int stack_pointer; extern int stack_pointer;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment