diff options
-rw-r--r-- | clang/include/clang/Driver/Options.td | 11 | ||||
-rw-r--r-- | clang/test/Driver/fast-math.c | 3 |
2 files changed, 9 insertions, 5 deletions
diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 091e25fa9ab..897db8e7c4b 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -188,7 +188,8 @@ def objcmt_migrate_designated_init : Flag<["-"], "objcmt-migrate-designated-init HelpText<"Enable migration to infer NS_DESIGNATED_INITIALIZER for initializer methods">; def objcmt_whitelist_dir_path: Joined<["-"], "objcmt-whitelist-dir-path=">, Flags<[CC1Option]>, HelpText<"Only modify files with a filename contained in the provided directory path">; -def objcmt_white_list_dir_path: Joined<["-"], "objcmt-white-list-dir-path=">, Flags<[CC1Option]>, +// The misspelt "white-list" [sic] alias is due for removal. +def : Joined<["-"], "objcmt-white-list-dir-path=">, Flags<[CC1Option]>, Alias<objcmt_whitelist_dir_path>; // Make sure all other -ccc- options are rejected. @@ -516,9 +517,9 @@ def fhonor_nans : Flag<["-"], "fhonor-nans">, Group<f_Group>; def fno_honor_nans : Flag<["-"], "fno-honor-nans">, Group<f_Group>; def fhonor_infinities : Flag<["-"], "fhonor-infinities">, Group<f_Group>; def fno_honor_infinities : Flag<["-"], "fno-honor-infinities">, Group<f_Group>; -// Sic. This option was misspelled originally. -def fhonor_infinites : Flag<["-"], "fhonor-infinites">, Alias<fhonor_infinities>; -def fno_honor_infinites : Flag<["-"], "fno-honor-infinites">, Alias<fno_honor_infinities>; +// This option was originally misspelt "infinites" [sic]. +def : Flag<["-"], "fhonor-infinites">, Alias<fhonor_infinities>; +def : Flag<["-"], "fno-honor-infinites">, Alias<fno_honor_infinities>; def ftrapping_math : Flag<["-"], "ftrapping-math">, Group<f_Group>; def fno_trapping_math : Flag<["-"], "fno-trapping-math">, Group<f_Group>; def ffp_contract : Joined<["-"], "ffp-contract=">, Group<f_Group>, @@ -759,7 +760,7 @@ def frtti : Flag<["-"], "frtti">, Group<f_Group>; def fsched_interblock : Flag<["-"], "fsched-interblock">, Group<clang_ignored_f_Group>; def fshort_enums : Flag<["-"], "fshort-enums">, Group<f_Group>, Flags<[CC1Option]>, HelpText<"Allocate to an enum type only as many bytes as it needs for the declared range of possible values">; -def freorder_blocks : Flag<["-"], "freorder-blocks">, Group<clang_ignored_f_Group>; +def : Flag<["-"], "freorder-blocks">, Group<clang_ignored_f_Group>; def fshort_wchar : Flag<["-"], "fshort-wchar">, Group<f_Group>, Flags<[CC1Option]>, HelpText<"Force wchar_t to be a short unsigned int">; def fshow_overloads_EQ : Joined<["-"], "fshow-overloads=">, Group<f_Group>, Flags<[CC1Option]>, diff --git a/clang/test/Driver/fast-math.c b/clang/test/Driver/fast-math.c index eba25c8fe85..16b1efcfde6 100644 --- a/clang/test/Driver/fast-math.c +++ b/clang/test/Driver/fast-math.c @@ -8,6 +8,9 @@ // REQUIRES: clang-driver // // RUN: %clang -### -fno-honor-infinities -c %s 2>&1 \ +// RUN: FileCheck --check-prefix=CHECK-NO-INFS %s +// infinites [sic] is a supported alternative spelling of infinities. +// RUN: %clang -### -fno-honor-infinites -c %s 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-NO-INFS %s // CHECK-NO-INFS: "-cc1" // CHECK-NO-INFS: "-menable-no-infs" |