re PR java/30607 (gcj -I x -C doesn't include x as source dir search patch)

	PR java/30607:
	* jvspec.c (lang_specific_driver): Handle separate -I argument.
	* lang.opt (-I): Add 'Separate'.

From-SVN: r121311

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 1cd6c07857cc55349fefd0da823008dcde2ef4f0..56a3e3ba4d6c85c63afd5711d49a507a250f37b4 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-29  Tom Tromey  <tromey@redhat.com>
+
+       PR java/30607:
+       * jvspec.c (lang_specific_driver): Handle separate -I argument.
+       * lang.opt (-I): Add 'Separate'.
+
 2007-01-29  Andrew Haley  <aph@redhat.com>
 
        * class.c (add_method_1): Mark fndecl as external unless we are

diff --git a/gcc/java/jvspec.c b/gcc/java/jvspec.c
index a26f4f68567ba6cd2c20ac91e791e720d50589e2..dce2c74c3337a239e06dd763369d9078ee5e1f2e 100644 (file)
--- a/gcc/java/jvspec.c
+++ b/gcc/java/jvspec.c
@@ -305,7 +305,7 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
          else if (argv[i][1] == 'O')
            saw_O = 1;
          else if ((argv[i][2] == '\0'
-                   && strchr ("bBVDUoeTuIYmLiA", argv[i][1]) != NULL)
+                   && strchr ("bBVDUoeTuIYmLiAI", argv[i][1]) != NULL)
                   || strcmp (argv[i], "-Tdata") == 0
                   || strcmp (argv[i], "-MT") == 0
                   || strcmp (argv[i], "-MF") == 0)
@@ -518,7 +518,17 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
 
       if (argv[i][1] == 'I')
        {
-         jcf_path_include_arg (&argv[i][2]);
+         const char *arg;
+         if (argv[i][2] == '\0')
+           {
+             gcc_assert (i + 1 < argc && (args[i + 1] & PARAM_ARG) != 0);
+             arg = argv[i + 1];
+             /* Drop the argument.  */
+             ++i;
+           }
+         else
+           arg = &argv[i][2];
+         jcf_path_include_arg (arg);
          --j;
          continue;
        }

diff --git a/gcc/java/lang.opt b/gcc/java/lang.opt
index 67852eeb3fab890cccde07f2297316619b6093fa..a036ae099921095cff302755be3de63fb99fcc47 100644 (file)
--- a/gcc/java/lang.opt
+++ b/gcc/java/lang.opt
@@ -26,7 +26,7 @@ Language
 Java
 
 I
-Java Joined
+Java Joined Separate
 ; Documented for C
 
 M