re PR fortran/35019 (Gfortran does not support "-J <dir>" only "-J<dir>")

gcc:
2008-04-21  Daniel Franke  <franke.daniel@gmail.com>

        PR fortran/35019
        * gcc.h: Added fortran options that take arguments to
        DEFAULT_SWITCH_TAKES_ARG and DEFAULT_WORD_SWITCH_TAKES_ARG
        macros.

gcc/fortran:
2008-04-21  Daniel Franke  <franke.daniel@gmail.com>

        PR fortran/35019
        * gfortranspec.c (lookup_option): Properly handle separated arguments
        in -J option, print missing argument message when necessary.

From-SVN: r134518

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a760e7ff4d5544449cb07676b101254d921c6587..a9df38d7e88e47a53a0b8d7d2ad671c9fac5306e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-21  Daniel Franke  <franke.daniel@gmail.com>
+
+       PR fortran/35019
+       * gcc.h: Added fortran options that take arguments to
+       DEFAULT_SWITCH_TAKES_ARG and DEFAULT_WORD_SWITCH_TAKES_ARG
+       macros.
+
 2008-04-20  Eric Botcazou  <ebotcazou@adacore.com>
 
        * tree-sra.c (sra_walk_expr) <VIEW_CONVERT_EXPR>: Disable

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 78d9359c9b2418a859cc901c9e127b9768eb6065..3808eb56ff5e9d1749e3a9098d6bc6067a41516e 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-21  Daniel Franke  <franke.daniel@gmail.com>
+
+       PR fortran/35019
+       * gfortranspec.c (lookup_option): Properly handle separated arguments
+       in -J option, print missing argument message when necessary.
+
 2008-04-20  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
        PR fortran/35882

diff --git a/gcc/fortran/gfortranspec.c b/gcc/fortran/gfortranspec.c
index 9a4428728b9c8cfbb1c1723d05798a57a6650278..5f3a8d793547c9e92a1c7be677243d481e727d29 100644 (file)
--- a/gcc/fortran/gfortranspec.c
+++ b/gcc/fortran/gfortranspec.c
@@ -175,6 +175,8 @@ lookup_option (Option *xopt, int *xskip, const char **xarg, const char *text)
     opt = OPTION_v, skip = 0;
   else if (text[1] == 'x')
     opt = OPTION_x, arg = text + 2;
+  else if (text[1] == 'J')
+    ;
   else
     {
       if ((skip = WORD_SWITCH_TAKES_ARG (text + 1)) != 0)  /* See gcc.c.  */

diff --git a/gcc/gcc.h b/gcc/gcc.h
index 8640c97c2da4c37dd7ad8ac88411e19df6b5473c..cf41efc77585eced346a15a04749804b968a5ecd 100644 (file)
--- a/gcc/gcc.h
+++ b/gcc/gcc.h
@@ -35,9 +35,9 @@ struct spec_function
 #define DEFAULT_SWITCH_TAKES_ARG(CHAR) \
   ((CHAR) == 'D' || (CHAR) == 'U' || (CHAR) == 'o' \
    || (CHAR) == 'e' || (CHAR) == 'T' || (CHAR) == 'u' \
-   || (CHAR) == 'I' || (CHAR) == 'm' || (CHAR) == 'x' \
-   || (CHAR) == 'L' || (CHAR) == 'A' || (CHAR) == 'V' \
-   || (CHAR) == 'B' || (CHAR) == 'b')
+   || (CHAR) == 'I' || (CHAR) == 'J' || (CHAR) == 'm' \
+   || (CHAR) == 'x' || (CHAR) == 'L' || (CHAR) == 'A' \
+   || (CHAR) == 'V' || (CHAR) == 'B' || (CHAR) == 'b')
 
 /* This defines which multi-letter switches take arguments.  */
 
@@ -50,7 +50,8 @@ struct spec_function
   || !strcmp (STR, "iquote") || !strcmp (STR, "isystem") \
   || !strcmp (STR, "isysroot") \
   || !strcmp (STR, "-param") || !strcmp (STR, "specs") \
-  || !strcmp (STR, "MF") || !strcmp (STR, "MT") || !strcmp (STR, "MQ"))
+  || !strcmp (STR, "MF") || !strcmp (STR, "MT") || !strcmp (STR, "MQ") \
+  || !strcmp (STR, "fintrinsic-modules-path"))
 
 
 /* These are exported by gcc.c.  */