Skip to content

Commit 591c4b6

Browse files
committed
[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 aabb0b1) and lured some contributors to add `NoXarchOption` to options that should not have the flag.
1 parent 518621e commit 591c4b6

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

clang/include/clang/Driver/Options.td

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3575,16 +3575,14 @@ def mdefault_build_attributes : Joined<["-"], "mdefault-build-attributes">, Grou
35753575
def mno_default_build_attributes : Joined<["-"], "mno-default-build-attributes">, Group<m_Group>;
35763576
let Flags = [TargetSpecific] in {
35773577
def mconstant_cfstrings : Flag<["-"], "mconstant-cfstrings">, Group<clang_ignored_m_Group>;
3578-
} // let Flags = [TargetSpecific]
3579-
def mconsole : Joined<["-"], "mconsole">, Group<m_Group>, Flags<[NoXarchOption]>;
3580-
def mwindows : Joined<["-"], "mwindows">, Group<m_Group>, Flags<[NoXarchOption]>;
3581-
def mdll : Joined<["-"], "mdll">, Group<m_Group>, Flags<[NoXarchOption]>;
3582-
def municode : Joined<["-"], "municode">, Group<m_Group>, Flags<[NoXarchOption]>;
3583-
def mthreads : Joined<["-"], "mthreads">, Group<m_Group>, Flags<[NoXarchOption]>;
3584-
def mguard_EQ : Joined<["-"], "mguard=">, Group<m_Group>, Flags<[NoXarchOption]>,
3578+
def mconsole : Joined<["-"], "mconsole">, Group<m_Group>;
3579+
def mwindows : Joined<["-"], "mwindows">, Group<m_Group>;
3580+
def mdll : Joined<["-"], "mdll">, Group<m_Group>;
3581+
def municode : Joined<["-"], "municode">, Group<m_Group>;
3582+
def mthreads : Joined<["-"], "mthreads">, Group<m_Group>;
3583+
def mguard_EQ : Joined<["-"], "mguard=">, Group<m_Group>,
35853584
HelpText<"Enable or disable Control Flow Guard checks and guard tables emission">,
35863585
Values<"none,cf,cf-nochecks">;
3587-
let Flags = [TargetSpecific] in {
35883586
def mcpu_EQ : Joined<["-"], "mcpu=">, Group<m_Group>,
35893587
HelpText<"For a list of available CPUs for the target use '-mcpu=help'">;
35903588
def mmcu_EQ : Joined<["-"], "mmcu=">, Group<m_Group>;

0 commit comments

Comments
 (0)