From 3d4cb550a7b20cb7b83727b0cd09d81dd74a0653 Mon Sep 17 00:00:00 2001 From: Daniel Franke Date: Mon, 21 Apr 2008 13:10:15 -0400 Subject: [PATCH] re PR fortran/35019 (Gfortran does not support "-J " only "-J") gcc: 2008-04-21 Daniel Franke 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 PR fortran/35019 * gfortranspec.c (lookup_option): Properly handle separated arguments in -J option, print missing argument message when necessary. From-SVN: r134518 --- gcc/ChangeLog | 7 +++++++ gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/gfortranspec.c | 2 ++ gcc/gcc.h | 9 +++++---- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a760e7ff4d5..a9df38d7e88 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2008-04-21 Daniel Franke + + 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 * tree-sra.c (sra_walk_expr) : Disable diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 78d9359c9b2..3808eb56ff5 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2008-04-21 Daniel Franke + + 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 PR fortran/35882 diff --git a/gcc/fortran/gfortranspec.c b/gcc/fortran/gfortranspec.c index 9a4428728b9..5f3a8d79354 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 8640c97c2da..cf41efc7758 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. */ -- 2.30.2