From: Tom Tromey <tromey@cygnus.com>
Date: Fri, 22 Oct 1999 19:40:50 +0000 (+0000)
Subject: jvgenmain.c (main): _Jv_Compiler_Properties now an extern; set in generated `main'.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2fca54beb25b7aea46d0d7077df92ee7e3e051f6;p=gcc.git

jvgenmain.c (main): _Jv_Compiler_Properties now an extern; set in generated `main'.

	* jvgenmain.c (main): _Jv_Compiler_Properties now an extern; set
	in generated `main'.

From-SVN: r30132
---

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 96a81cedd3e..ed2ca8066ee 100644
--- 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 86040fcba3f..fc0aa94838f 100644
--- 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");