Author: Fangrui Song Date: 2023-06-12T15:50:29-07:00 New Revision: 591c4b64b3650884c2c68eb47d755ebb62981b99
URL: https://github.com/llvm/llvm-project/commit/591c4b64b3650884c2c68eb47d755ebb62981b99 DIFF: https://github.com/llvm/llvm-project/commit/591c4b64b3650884c2c68eb47d755ebb62981b99.diff LOG: [Driver] Remove misused NoXarchOption from some Windows options If an option has the `NoXarchOption` flag, ClangDriver will emit an error if the option is used after `-Xarch_*` (originally for universal macOS binary, reused by `-Xarch_host`/etc). The error checking only applies to a small set of options (e.g. `-o`) and is not very useful for most options, but `NoXarchOption` was traditionally named `DriverOption` (commit aabb0b11a3c1d8a6bb859db80400cffdcc9b336f) and lured some contributors to add `NoXarchOption` to options that should not have the flag. Added: Modified: clang/include/clang/Driver/Options.td Removed: ################################################################################ diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 980d17b1de9eb..849308142b8ec 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -3575,16 +3575,14 @@ def mdefault_build_attributes : Joined<["-"], "mdefault-build-attributes">, Grou def mno_default_build_attributes : Joined<["-"], "mno-default-build-attributes">, Group<m_Group>; let Flags = [TargetSpecific] in { def mconstant_cfstrings : Flag<["-"], "mconstant-cfstrings">, Group<clang_ignored_m_Group>; -} // let Flags = [TargetSpecific] -def mconsole : Joined<["-"], "mconsole">, Group<m_Group>, Flags<[NoXarchOption]>; -def mwindows : Joined<["-"], "mwindows">, Group<m_Group>, Flags<[NoXarchOption]>; -def mdll : Joined<["-"], "mdll">, Group<m_Group>, Flags<[NoXarchOption]>; -def municode : Joined<["-"], "municode">, Group<m_Group>, Flags<[NoXarchOption]>; -def mthreads : Joined<["-"], "mthreads">, Group<m_Group>, Flags<[NoXarchOption]>; -def mguard_EQ : Joined<["-"], "mguard=">, Group<m_Group>, Flags<[NoXarchOption]>, +def mconsole : Joined<["-"], "mconsole">, Group<m_Group>; +def mwindows : Joined<["-"], "mwindows">, Group<m_Group>; +def mdll : Joined<["-"], "mdll">, Group<m_Group>; +def municode : Joined<["-"], "municode">, Group<m_Group>; +def mthreads : Joined<["-"], "mthreads">, Group<m_Group>; +def mguard_EQ : Joined<["-"], "mguard=">, Group<m_Group>, HelpText<"Enable or disable Control Flow Guard checks and guard tables emission">, Values<"none,cf,cf-nochecks">; -let Flags = [TargetSpecific] in { def mcpu_EQ : Joined<["-"], "mcpu=">, Group<m_Group>, HelpText<"For a list of available CPUs for the target use '-mcpu=help'">; def mmcu_EQ : Joined<["-"], "mmcu=">, Group<m_Group>; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits