aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorDaniel Franke <franke.daniel@gmail.com>2008-04-21 13:10:15 -0400
committerDaniel Franke <dfranke@gcc.gnu.org>2008-04-21 13:10:15 -0400
commit3d4cb550a7b20cb7b83727b0cd09d81dd74a0653 (patch)
tree184ecef45905be4fba52ba95ad95a71e60b0a9b3 /gcc
parentee34d21ad53623a25ce5700dadfbed5a6a025c0e (diff)
downloadgcc-3d4cb550a7b20cb7b83727b0cd09d81dd74a0653.zip
gcc-3d4cb550a7b20cb7b83727b0cd09d81dd74a0653.tar.gz
gcc-3d4cb550a7b20cb7b83727b0cd09d81dd74a0653.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/gfortranspec.c2
-rw-r--r--gcc/gcc.h9
4 files changed, 20 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a760e7f..a9df38d 100644
--- 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 78d9359..3808eb5 100644
--- 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 9a44287..5f3a8d7 100644
--- 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 8640c97..cf41efc 100644
--- 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. */