commit c9b5f35ec1b36e168e169f5abe6b9e16c706c82e
author Richard Barton <richard.barton@arm.com> Mon Feb 24 18:43:28 2014 +0000
committer Richard Barton <richard.barton@arm.com> Mon Feb 24 18:43:28 2014 +0000
tree 6cd13fa6bdde1917ae0bb116365ed245851f9be3
parent e89f310952a35e1110d1235449fba55569d95ab9

Implement -fno-short-wchar

llvm-svn: 202058

clang/lib/Frontend/CompilerInvocation.cpp

diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp
index 256b0fb..4ef5cfe 100644
--- a/clang/lib/Frontend/CompilerInvocation.cpp
+++ b/clang/lib/Frontend/CompilerInvocation.cpp
@@ -1333,7 +1333,7 @@
   Opts.ModulesDeclUse = Args.hasArg(OPT_fmodules_decluse);
   Opts.CharIsSigned = Opts.OpenCL || !Args.hasArg(OPT_fno_signed_char);
   Opts.WChar = Opts.CPlusPlus && !Args.hasArg(OPT_fno_wchar);
-  Opts.ShortWChar = Args.hasArg(OPT_fshort_wchar);
+  Opts.ShortWChar = Args.hasFlag(OPT_fshort_wchar, OPT_fno_short_wchar, false);
   Opts.ShortEnums = Args.hasArg(OPT_fshort_enums);
   Opts.Freestanding = Args.hasArg(OPT_ffreestanding);
   Opts.NoBuiltin = Args.hasArg(OPT_fno_builtin) || Opts.Freestanding;