From c878765bbf32e3c3505417771f94015da69a33b8 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Mon, 16 Aug 2010 11:17:07 +0100 Subject: options.texi (NoDriverArg): Document. * doc/options.texi (NoDriverArg): Document. * gcc.c (cpp_unique_options): Generate -MD and -MMD instead of -MDX and -MMDX. * opt-functions.awk (switch_flags): Handle NoDriverArg. * opts-common.c (decode_cmdline_option): Ignore CL_SEPARATE marking for CL_NO_DRIVER_ARG options when in the driver. * opts.h (CL_NO_DRIVER_ARG): Define. (CL_PARAMS, CL_WARNING, CL_OPTIMIZATION, CL_DRIVER, CL_TARGET, CL_COMMON): Update values. c-family: * c.opt (MDX): Change back to MD. Mark NoDriverArg instead of RejectDriver. (MMDX): Change back to MMD. Mark NoDriverArg instead of RejectDriver. * c-opts.c (c_common_handle_option): Use OPT_MD and OPT_MMD instead of OPT_MDX and OPT_MMDX. fortran: * lang.opt (MDX): Change back to MD. Mark NoDriverArg instead of RejectDriver. (MMDX): Change back to MMD. Mark NoDriverArg instead of RejectDriver. * cpp.c (gfc_cpp_handle_option): Use OPT_MD and OPT_MMD instead of OPT_MDX and OPT_MMDX. From-SVN: r163280 --- gcc/fortran/ChangeLog | 9 +++++++++ gcc/fortran/cpp.c | 4 ++-- gcc/fortran/lang.opt | 8 ++++---- 3 files changed, 15 insertions(+), 6 deletions(-) (limited to 'gcc/fortran') diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index cf8eb49..a0b5c24 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,14 @@ 2010-08-16 Joseph Myers + * lang.opt (MDX): Change back to MD. Mark NoDriverArg instead of + RejectDriver. + (MMDX): Change back to MMD. Mark NoDriverArg instead of + RejectDriver. + * cpp.c (gfc_cpp_handle_option): Use OPT_MD and OPT_MMD instead of + OPT_MDX and OPT_MMDX. + +2010-08-16 Joseph Myers + * lang.opt (MDX, MMDX): Mark RejectDriver. 2010-08-15 Janus Weil diff --git a/gcc/fortran/cpp.c b/gcc/fortran/cpp.c index 046a9a2..a6a922f 100644 --- a/gcc/fortran/cpp.c +++ b/gcc/fortran/cpp.c @@ -456,11 +456,11 @@ gfc_cpp_handle_option (size_t scode, const char *arg, int value ATTRIBUTE_UNUSED gfc_cpp_option.deps = 1; break; - case OPT_MMDX: + case OPT_MMD: gfc_cpp_option.deps_skip_system = 1; /* fall through */ - case OPT_MDX: + case OPT_MD: gfc_cpp_option.deps = 1; gfc_cpp_option.deps_filename = arg; break; diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt index dea1451..82804a4 100644 --- a/gcc/fortran/lang.opt +++ b/gcc/fortran/lang.opt @@ -60,8 +60,8 @@ M Fortran ; Documented in C -MDX -Fortran Separate RejectDriver +MD +Fortran Separate NoArgDriver ; Documented in C MF @@ -76,8 +76,8 @@ MM Fortran ; Documented in C -MMDX -Fortran Separate RejectDriver +MMD +Fortran Separate NoArgDriver ; Documented in C MP -- cgit v1.1