From: Andrew Haley <aph@redhat.com>
Date: Tue, 28 Sep 2010 09:54:27 +0000 (+0000)
Subject: re PR java/45773 (gcj fails to compile java)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=06f1db4b1c2e1dbea2e4b6e6f62c4abe5ae7616b;p=gcc.git

re PR java/45773 (gcj fails to compile java)

2010-09-27  Andrew Haley  <aph@redhat.com>

        PR java/45773
        * jvgenmain.c (main): Fix arg processing.

From-SVN: r164679
---

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index f1a1ee1c0fb..664cd32cc44 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-27  Andrew Haley  <aph@redhat.com>
+
+	PR java/45773
+	* jvgenmain.c (main): Fix arg processing.
+
 2010-09-22  Joseph Myers  <joseph@codesourcery.com>
 
 	* jvspec.c (lang_specific_driver): Handle OPT__help instead of
diff --git a/gcc/java/jvgenmain.c b/gcc/java/jvgenmain.c
index 91fa81ce4d4..a6788029f9e 100644
--- a/gcc/java/jvgenmain.c
+++ b/gcc/java/jvgenmain.c
@@ -123,8 +123,12 @@ main (int argc, char **argv)
   for (i = 1; i < last_arg; ++i)
     {
       const char *p;
+
+      if (strcmp (argv[i], "-D") == 0)
+	continue;
+
       fprintf (stream, "  \"");
-      for (p = &argv[i][2]; *p; ++p)
+      for (p = argv[i]; *p; ++p)
 	{
 	  if (! ISPRINT (*p))
 	    fprintf (stream, "\\%o", *p);