jvgenmain.c (class_mangling_suffix): Remove unused string.

	* jvgenmain.c (class_mangling_suffix): Remove unused string.
	(error): Remove unused function.
	(main): Don't use "__attribute__ alias" on generated class symbol.

From-SVN: r39397

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index d4543db010e4465ff2b54586c61688aaddce11d2..faba27c28da838cfd891e66a84b504814fd1f3b7 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2001-02-01  Bryce McKinlay  <bryce@albatross.co.nz>
+
+       * jvgenmain.c (class_mangling_suffix): Remove unused string.
+       (error): Remove unused function.
+       (main): Don't use "__attribute__ alias" on generated class symbol.
+
 2001-01-30  Alexandre Petit-Bianco  <apbianco@cygnus.com>
 
        * jcf-parse.c (init_jcf_parse): Added cast to ggc_add_root's last
@@ -8,14 +14,14 @@
        (resolve_type_during_patch): Layout resolved type.
        * typeck.c (lookup_do): Removed unused local.
 
-2000-01-30  Bryce McKinlay  <bryce@albatross.co.nz>
+2001-01-30  Bryce McKinlay  <bryce@albatross.co.nz>
 
        * java-tree.h: Remove JTI_INTEGER_NEGATIVE_ONE_NODE.
        * decl.c (init_decl_processing): Use integer_minus_one_node, not
        integer_negative_one_node.
        * expr.c (build_java_binop): Likewise.
 
-2000-01-24  Jeff Sturm  <jeff.sturm@commerceone.com>
+2001-01-24  Jeff Sturm  <jeff.sturm@commerceone.com>
 
        * zextract.c (read_zip_archive): Read file_offset before writing
        zipd and consequently clobbering the header contents.

diff --git a/gcc/java/jvgenmain.c b/gcc/java/jvgenmain.c
index 2eaa02f1e6688fbaa03aaa07c81f469eb0df4e8f..8f591922266cc2404159307ed7da61b19ef8f7b6 100644 (file)
--- a/gcc/java/jvgenmain.c
+++ b/gcc/java/jvgenmain.c
@@ -34,31 +34,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 
 static char * do_mangle_classname PARAMS ((const char *string));
 
-const char class_mangling_suffix[] = "class$";
-
 struct obstack name_obstack;
 
-extern void error                      PARAMS ((const char *, ...))
-  ATTRIBUTE_PRINTF_1;
-
-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);
-}
-
 void
 gcc_obstack_init (obstack)
      struct obstack *obstack;
@@ -153,12 +130,11 @@ main (int argc, const char **argv)
     }
   fprintf (stream, "  0\n};\n\n");
 
-  fprintf (stream, "extern int class __attribute__ ((alias (\"%s\")));\n",
-          mangled_classname);
+  fprintf (stream, "extern int %s;\n", mangled_classname);
   fprintf (stream, "int main (int argc, const char **argv)\n");
   fprintf (stream, "{\n");
   fprintf (stream, "   _Jv_Compiler_Properties = props;\n");
-  fprintf (stream, "   JvRunMain (&class, argc, argv);\n");
+  fprintf (stream, "   JvRunMain (&%s, argc, argv);\n", mangled_classname);
   fprintf (stream, "}\n");
   if (stream != stdout && fclose (stream) != 0)
     {