diff options
| -rw-r--r-- | clang/include/clang/Driver/Options.td | 2 | ||||
| -rw-r--r-- | clang/test/Driver/cl-options.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 3a5d58a8ee7..80facb79a48 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -1176,7 +1176,7 @@ def fthinlto_index_EQ : Joined<["-"], "fthinlto-index=">, def fmacro_backtrace_limit_EQ : Joined<["-"], "fmacro-backtrace-limit=">, Group<f_Group>, Flags<[DriverOption, CoreOption]>; def fmerge_all_constants : Flag<["-"], "fmerge-all-constants">, Group<f_Group>, - Flags<[CC1Option]>, HelpText<"Allow merging of constants">; + Flags<[CC1Option, CoreOption]>, HelpText<"Allow merging of constants">; def fmessage_length_EQ : Joined<["-"], "fmessage-length=">, Group<f_Group>; def fms_extensions : Flag<["-"], "fms-extensions">, Group<f_Group>, Flags<[CC1Option, CoreOption]>, HelpText<"Accept some non-standard constructs supported by the Microsoft compiler">; diff --git a/clang/test/Driver/cl-options.c b/clang/test/Driver/cl-options.c index 4b4e2f0883c..37c2fa5b690 100644 --- a/clang/test/Driver/cl-options.c +++ b/clang/test/Driver/cl-options.c @@ -590,6 +590,7 @@ // RUN: -fstandalone-debug \ // RUN: -flimit-debug-info \ // RUN: -flto \ +// RUN: -fmerge-all-constants \ // RUN: --version \ // RUN: -Werror /Zs -- %s 2>&1 |
