[multiple changes]

2001-02-09  Raja R Harinath  <harinath@cs.umn.edu>

	* Make-lang.in (java/mangle_name.o): Add 'make' prereqs.

2001-02-09  Alexandre Petit-Bianco  <apbianco@redhat.com>

	* Manke-lang.in (JVGENMAIN_OBJS): Added `errors.o'
	* jvgenmain.c (error): Reversed 2001-02-09 patch. `error' is now
	gone.

(http://gcc.gnu.org/ml/gcc-patches/2001-02/msg00537.html)

From-SVN: r39571

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 8070ba7153c632aa3a41e736d7c1df5fd683297e..95126e454da0169029583499d89d70770aadc24d 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,13 @@
+2001-02-09  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * Make-lang.in (java/mangle_name.o): Add 'make' prereqs.
+
+2001-02-09  Alexandre Petit-Bianco  <apbianco@redhat.com>
+
+       * Manke-lang.in (JVGENMAIN_OBJS): Added `errors.o'
+       * jvgenmain.c (error): Reversed 2001-02-09 patch. `error' is now
+       gone.
+
 2001-02-09  Alexandre Petit-Bianco  <apbianco@redhat.com>
 
        * mangle_name (append_unicode_mangled_name): Emit `_' or `U'

diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index cf69d2f823ee03faf38cda7e88ff57b36ab138fc..2cecf582f888ed71bd1fe22274de8887b5605d6e 100644 (file)
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -112,7 +112,7 @@ JVSCAN_OBJS = java/parse-scan.o java/jv-scan.o version.o
 JCFDUMP_OBJS = java/jcf-dump.o java/jcf-io.o java/jcf-depend.o java/jcf-path.o \
                java/zextract.o errors.o version.o mkdeps.o
 
-JVGENMAIN_OBJS = java/jvgenmain.o java/mangle_name.o
+JVGENMAIN_OBJS = java/jvgenmain.o java/mangle_name.o errors.o
 
 # Use loose warnings for this front end.
 java-warn =
@@ -269,6 +269,8 @@ java/lang.o: java/lang.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h input.h \
   toplev.h system.h $(RTL_H) $(EXPR_H)
 java/mangle.o: java/mangle.c $(CONFIG_H) java/jcf.h $(JAVA_TREE_H) system.h \
   toplev.h $(GGC_H)
+java/mangle_name.o: java/mangle_name.c $(CONFIG_H) java/jcf.h $(JAVA_TREE_H) \
+  system.h toplev.h $(GGC_H)
 java/parse-scan.o: $(CONFIG_H) system.h toplev.h $(JAVA_LEX_C) java/parse.h \
   java/lex.h
 java/typeck.o: java/typeck.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h \

diff --git a/gcc/java/jvgenmain.c b/gcc/java/jvgenmain.c
index c5b0c30bf1154893cafba05f9dfc01b5967dd864..414ccded13ad7a92476838ce861b592e83c22c8a 100644 (file)
--- a/gcc/java/jvgenmain.c
+++ b/gcc/java/jvgenmain.c
@@ -33,7 +33,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "java-tree.h"
 
 static char * do_mangle_classname PARAMS ((const char *string));
-void error PARAMS ((const char *, ...)) ATTRIBUTE_PRINTF_1;
 
 struct obstack  name_obstack;
 struct obstack *mangle_obstack = &name_obstack;
@@ -67,27 +66,6 @@ usage (const char *name)
   exit (1);
 }
 
-/* This function is defined here to help us link jvgenmain at
-   bootstrap.  */
-
-void
-error VPARAMS ((const char *msgid, ...))
-{
-#ifndef ANSI_PROTOTYPES
-  const char *msgid;
-#endif
-  va_list ap;
-  
-  VA_START (ap, msgid);
-  
-#ifndef ANSI_PROTOTYPES
-  msgid = va_arg (ap, const char *);
-#endif
-  
-  vfprintf (stderr, msgid, ap);
-  va_end (ap);
-}
-
 int
 main (int argc, const char **argv)
 {