diff options
| -rw-r--r-- | clang/include/clang/Driver/CLCompatOptions.td | 2 | ||||
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Driver/cl-options.c | 5 |
3 files changed, 8 insertions, 1 deletions
diff --git a/clang/include/clang/Driver/CLCompatOptions.td b/clang/include/clang/Driver/CLCompatOptions.td index b1d2459f71c..864a3489c52 100644 --- a/clang/include/clang/Driver/CLCompatOptions.td +++ b/clang/include/clang/Driver/CLCompatOptions.td @@ -120,6 +120,8 @@ def _SLASH_Qvec_ : CLFlag<"Qvec-">, def _SLASH_showIncludes : CLFlag<"showIncludes">, HelpText<"Print info about included files to stderr">, Alias<show_includes>; +def _SLASH_source_charset : CLCompileJoined<"source-charset:">, + HelpText<"Source encoding, supports only UTF-8">, Alias<finput_charset_EQ>; def _SLASH_std : CLCompileJoined<"std:">, HelpText<"Language standard to compile for">; def _SLASH_U : CLJoinedOrSeparate<"U">, HelpText<"Undefine macro">, diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index a814df3c64c..747f3ea57a1 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -5801,7 +5801,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, // -finput_charset=UTF-8 is default. Reject others if (Arg *inputCharset = Args.getLastArg(options::OPT_finput_charset_EQ)) { StringRef value = inputCharset->getValue(); - if (value != "UTF-8") + if (value.lower() != "utf-8") D.Diag(diag::err_drv_invalid_value) << inputCharset->getAsString(Args) << value; } diff --git a/clang/test/Driver/cl-options.c b/clang/test/Driver/cl-options.c index 4d9416b1f87..3e207f2c95e 100644 --- a/clang/test/Driver/cl-options.c +++ b/clang/test/Driver/cl-options.c @@ -171,6 +171,10 @@ // RUN: %clang_cl /EP /showIncludes -### -- %s 2>&1 | FileCheck -check-prefix=showIncludes_E %s // showIncludes_E: warning: argument unused during compilation: '--show-includes' +// /source-charset: should warn on everything except UTF-8. +// RUN: %clang_cl /source-charset:utf-16 -### -- %s 2>&1 | FileCheck -check-prefix=source-charset-utf-16 %s +// source-charset-utf-16: invalid value 'utf-16' + // RUN: %clang_cl /Umymacro -### -- %s 2>&1 | FileCheck -check-prefix=U %s // RUN: %clang_cl /U mymacro -### -- %s 2>&1 | FileCheck -check-prefix=U %s // U: "-U" "mymacro" @@ -288,6 +292,7 @@ // RUN: /RTC1 \ // RUN: /sdl \ // RUN: /sdl- \ +// RUN: /source-charset:utf-8 \ // RUN: /vmg \ // RUN: /volatile:iso \ // RUN: /w12345 \ |
