From b3b002b12f2d6ebdb80b678dec0d14786cbef15a Mon Sep 17 00:00:00 2001 From: Andrzej Warzynski Date: Sat, 20 Mar 2021 15:26:46 +0000 Subject: [PATCH] [clang][flang] Moke the definition of `-module-dir` restricted to Flang `-module-dir` is a Flang specific option and should not be visible in Clang. This patch adds `FlangOnlyOption` flag to its definition. This way Clang will know that it should reject it and skip it when generating output for `clang -help`. The definition of `-module-dir` is moved next to other Flang options. As `-J` is an alias for `-module-dir`, it has to be moved as well (the alias cannot be defined before the original option). As `gfortran` mode is effectively no longer supported (*), `-J` is claimed as Flang only option. This is a follow-up of a post-commit review for https://reviews.llvm.org/D95448. * https://reviews.llvm.org/rG6a75496836ea14bcfd2f4b59d35a1cad4ac58cee Differential Revision: https://reviews.llvm.org/D99018 --- clang/include/clang/Driver/Options.td | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 6e22bd0..2e9d0f5 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -986,11 +986,6 @@ def dependency_dot : Separate<["-"], "dependency-dot">, Flags<[CC1Option]>, def module_dependency_dir : Separate<["-"], "module-dependency-dir">, Flags<[CC1Option]>, HelpText<"Directory to dump module dependencies to">, MarshallingInfoString>; -def module_dir : Separate<["-"], "module-dir">, Flags<[FlangOption,FC1Option]>, MetaVarName<"">, - HelpText<"Put MODULE files in ">, - DocBrief<[{This option specifies where to put .mod files for compiled modules. -It is also added to the list of directories to be searched by an USE statement. -The default is the current directory.}]>; def dsym_dir : JoinedOrSeparate<["-"], "dsym-dir">, Flags<[NoXarchOption, RenderAsInput]>, HelpText<"Directory to output dSYM's (if any) to">, MetaVarName<"">; @@ -4220,7 +4215,6 @@ defm devirtualize_speculatively : BooleanFFlag<"devirtualize-speculatively">, // Generic gfortran options. def A_DASH : Joined<["-"], "A-">, Group; -def J : JoinedOrSeparate<["-"], "J">, Flags<[RenderJoined,FlangOption,FC1Option]>, Group, Alias; def cpp : Flag<["-"], "cpp">, Group; def nocpp : Flag<["-"], "nocpp">, Group; def static_libgfortran : Flag<["-"], "static-libgfortran">, Group; @@ -4303,6 +4297,12 @@ def Xflang : Separate<["-"], "Xflang">, //===----------------------------------------------------------------------===// let Flags = [FC1Option, FlangOption, FlangOnlyOption] in { +def module_dir : Separate<["-"], "module-dir">, MetaVarName<"">, + HelpText<"Put MODULE files in ">, + DocBrief<[{This option specifies where to put .mod files for compiled modules. +It is also added to the list of directories to be searched by an USE statement. +The default is the current directory.}]>; + def ffixed_form : Flag<["-"], "ffixed-form">, Group, HelpText<"Process source files in fixed form">; def ffree_form : Flag<["-"], "ffree-form">, Group, @@ -4340,6 +4340,11 @@ def falternative_parameter_statement : Flag<["-"], "falternative-parameter-state HelpText<"Enable the old style PARAMETER statement">; } +def J : JoinedOrSeparate<["-"], "J">, + Flags<[RenderJoined, FlangOption, FC1Option, FlangOnlyOption]>, + Group, + Alias; + //===----------------------------------------------------------------------===// // FC1 Options //===----------------------------------------------------------------------===// -- 2.7.4