diff options
| author | Anthony Green <green@gcc.gnu.org> | 1998-11-15 15:11:55 +0000 |
|---|---|---|
| committer | Anthony Green <green@gcc.gnu.org> | 1998-11-15 15:11:55 +0000 |
| commit | 8773d9d5ae13fa4e83d3ba25bd45d23996113248 (patch) | |
| tree | fd001086a9c20c983cb5e66501798c13ce818cbc /gcc | |
| parent | 9bbc7d9f4c30d9cf34a79c8b36a7e4f0857d764d (diff) | |
| download | gcc-8773d9d5ae13fa4e83d3ba25bd45d23996113248.tar.gz | |
Make-lang.in: Fix reference to srcdir.
* Make-lang.in: Fix reference to srcdir.
* jv-scan.c: Add missing xmalloc prototype.
* jvgenmain.c: Ditto.
From-SVN: r23662
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/java/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/java/Make-lang.in | 2 | ||||
| -rw-r--r-- | gcc/java/jv-scan.c | 1 | ||||
| -rw-r--r-- | gcc/java/jvgenmain.c | 2 |
4 files changed, 11 insertions, 1 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index a9da798460a..7e2db9f4749 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +Sun Nov 15 15:09:56 1998 Anthony Green <green@hoser.cygnus.com> + + * Make-lang.in: Fix reference to srcdir. + * jv-scan.c: Add missing xmalloc prototype. + * jvgenmain.c: Ditto. + Sun Nov 15 14:36:29 1998 Per Bothner <bothner@cygnus.com> * decl.c (error_mark_node), java-tree.h: New global. @@ -22,6 +28,7 @@ Sun Nov 15 14:36:29 1998 Per Bothner <bothner@cygnus.com> (- case PREDECREMENT_EXPR etc): Remove redundant NOTE_PUSH. (generate_classfile): More robust for abstract methods. +>>>>>>> 1.51 Sun Nov 15 13:52:39 1998 Anthony Green <green@cygnus.com> * Makefile.in: jv-scan and jvgenmain all require libiberty. diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index 0e70024b06f..a2c27378731 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -127,7 +127,7 @@ gcjh$(exeext): $(GCJH_SOURCES) $(LIBDEPS) # 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 $(src)/../libiberty/xmalloc.c $(src)/../libiberty/xstrdup.c + $(srcdir)/java/parse.h $(srcdir)/java/lex.h $(srcdir)/java/jv-scan.c $(srcdir)/../libiberty/xmalloc.c $(srcdir)/../libiberty/xstrdup.c jv-scan$(exeext): $(JV_SCAN_SOURCES) stamp-objlist $(LIBDEPS) cd java && $(MAKE) $(FLAGS_TO_PASS) $(JAVA_FLAGS_TO_PASS) ../jv-scan$(exeext) diff --git a/gcc/java/jv-scan.c b/gcc/java/jv-scan.c index 3afd2263fb3..1f3dbae90a7 100644 --- a/gcc/java/jv-scan.c +++ b/gcc/java/jv-scan.c @@ -34,6 +34,7 @@ void fatal VPROTO((char *s, ...)); void warning VPROTO((char *s, ...)); void gcc_obstack_init PROTO ((struct obstack *obstack)); extern void reset_report PROTO ((void)); +extern char *xmalloc PROTO((size_t)); #define JC1_LITE #include "parse.h" diff --git a/gcc/java/jvgenmain.c b/gcc/java/jvgenmain.c index f0c987e6bbd..43b8d7b8d6b 100644 --- a/gcc/java/jvgenmain.c +++ b/gcc/java/jvgenmain.c @@ -34,6 +34,8 @@ const char class_mangling_prefix[] = "_CL_"; struct obstack name_obstack; +extern char *xmalloc PROTO((size_t)); + void error (const char *str) { |