* jvgenmain.c (main): _Jv_Compiler_Properties now an extern; set

	in generated `main'.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@30132 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 96a81ce..ed2ca80 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+1999-10-21  Tom Tromey  <tromey@cygnus.com>
+
+       * jvgenmain.c (main): _Jv_Compiler_Properties now an extern; set
+       in generated `main'.
+
 Thu Oct 21 01:27:31 1999  Alexandre Petit-Bianco  <apbianco@cygnus.com>
 
        * parse.y (resolve_qualified_expression_name): Handle MODIFY_EXPR.

diff --git a/gcc/java/jvgenmain.c b/gcc/java/jvgenmain.c
index 86040fc..fc0aa94 100644 (file)
--- a/gcc/java/jvgenmain.c
+++ b/gcc/java/jvgenmain.c
@@ -134,7 +134,8 @@ main (int argc, const char **argv)
 
   /* At this point every element of ARGV from 1 to LAST_ARG is a `-D'
      option.  Process them appropriately.  */
-  fprintf (stream, "const char *_Jv_Compiler_Properties[] =\n{\n");
+  fprintf (stream, "extern const char **_Jv_Compiler_Properties;\n");
+  fprintf (stream, "static const char *props[] =\n{\n");
   for (i = 1; i < last_arg; ++i)
     {
       const char *p;
@@ -156,6 +157,7 @@ main (int argc, const char **argv)
           class_mangling_prefix, 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 (&%s%s, argc, argv);\n",
           class_mangling_prefix, mangled_classname);
   fprintf (stream, "}\n");