diff options
| -rw-r--r-- | gcc/fortran/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/fortran/cpp.c | 2 | ||||
| -rw-r--r-- | gcc/fortran/lang-specs.h | 4 | ||||
| -rw-r--r-- | gcc/fortran/lang.opt | 6 |
4 files changed, 16 insertions, 4 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 4e3fb7d..2942701 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,11 @@ +2010-07-29 Joseph Myers <joseph@codesourcery.com> + + * lang.opt (cpp): Remove Joined and Separate markers. + (cpp=): New internal option. + * lang-specs.h (F951_CPP_OPTIONS): Generate -cpp= option. + * cpp.c (gfc_cpp_handle_option): Handle OPT_cpp_ instead of + OPT_cpp. + 2010-07-29 Daniel Kraft <d@domob.eu> PR fortran/45117 diff --git a/gcc/fortran/cpp.c b/gcc/fortran/cpp.c index b98d83f..a6a922f 100644 --- a/gcc/fortran/cpp.c +++ b/gcc/fortran/cpp.c @@ -354,7 +354,7 @@ gfc_cpp_handle_option (size_t scode, const char *arg, int value ATTRIBUTE_UNUSED result = 0; break; - case OPT_cpp: + case OPT_cpp_: gfc_cpp_option.temporary_filename = arg; break; diff --git a/gcc/fortran/lang-specs.h b/gcc/fortran/lang-specs.h index 4fe24de..73bfc89 100644 --- a/gcc/fortran/lang-specs.h +++ b/gcc/fortran/lang-specs.h @@ -1,6 +1,6 @@ /* Contribution to the specs for the GNU Compiler Collection from GNU Fortran 95 compiler. - Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 + Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010 Free Software Foundation, Inc. This file is free software; you can redistribute it and/or modify @@ -30,7 +30,7 @@ /* Options that f951 should know about, even if not preprocessing. */ #define CPP_FORWARD_OPTIONS "%{i*} %{I*} %{M*}" -#define F951_CPP_OPTIONS "%{!nocpp: -cpp %g.f90 %{E} %(cpp_unique_options) \ +#define F951_CPP_OPTIONS "%{!nocpp: -cpp=%g.f90 %{E} %(cpp_unique_options) \ %{E|M|MM:%(cpp_debug_options) " CPP_ONLY_OPTIONS \ " -fsyntax-only};: " CPP_FORWARD_OPTIONS "}" #define F951_OPTIONS "%(cc1_options) %{J*} \ diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt index 1f3ef9d..2f73316 100644 --- a/gcc/fortran/lang.opt +++ b/gcc/fortran/lang.opt @@ -173,9 +173,13 @@ Fortran Warning Warn about unused dummy arguments. cpp -Fortran Joined Separate Negative(nocpp) +Fortran Negative(nocpp) Enable preprocessing +cpp= +Fortran Joined Negative(nocpp) Undocumented +; Internal option generated by specs from -cpp. + nocpp Fortran Negative(cpp) Disable preprocessing |