Index: test/Sema/wchar.c =================================================================== --- test/Sema/wchar.c (revision 85898) +++ test/Sema/wchar.c (working copy) @@ -1,12 +1,12 @@ -// RUN: clang-cc %s -fsyntax-only -verify +// RUN: clang-cc %s -fshort-wchar -fsyntax-only -verify #include int check_wchar_size[sizeof(*L"") == sizeof(wchar_t) ? 1 : -1]; void foo() { - int t1[] = L"x"; + unsigned short t1[] = L"x"; wchar_t tab[] = L"x"; - int t2[] = "x"; // expected-error {{initialization}} + unsigned short t2[] = "x"; // expected-error {{initialization}} char t3[] = L"x"; // expected-error {{initialization}} } Index: test/Driver/clang_f_opts.c =================================================================== --- test/Driver/clang_f_opts.c (revision 85898) +++ test/Driver/clang_f_opts.c (working copy) @@ -2,10 +2,11 @@ // RUN: grep -F '"-fblocks"' %t && // RUN: grep -F '"--fmath-errno=1"' %t && // RUN: grep -F '"-fpascal-strings"' %t && -// RUN: clang -### -S -x c /dev/null -fblocks -fbuiltin -fmath-errno -fcommon -fpascal-strings -fno-blocks -fno-builtin -fno-math-errno -fno-common -fno-pascal-strings -fno-show-source-location %s 2> %t && +// RUN: clang -### -S -x c /dev/null -fblocks -fbuiltin -fmath-errno -fcommon -fpascal-strings -fno-blocks -fno-builtin -fno-math-errno -fno-common -fno-pascal-strings -fno-show-source-location -fshort-wchar %s 2> %t && // RUN: grep -F '"-fblocks=0"' %t && // RUN: grep -F '"-fbuiltin=0"' %t && // RUN: grep -F '"-fno-common"' %t && // RUN: grep -F '"--fmath-errno=0"' %t && // RUN: grep -F '"-fno-show-source-location"' %t && +// RUN: grep -F '"-fshort-wchar"' %t && // RUN: true Index: include/clang/Basic/DiagnosticFrontendKinds.td =================================================================== --- include/clang/Basic/DiagnosticFrontendKinds.td (revision 85898) +++ include/clang/Basic/DiagnosticFrontendKinds.td (working copy) @@ -162,6 +162,9 @@ def warn_pch_char_signed : Error< "char was %select{unsigned|signed}0 in the PCH file but " "is currently %select{unsigned|signed}1">; +def warn_pch_short_wchar : Error< + "-fshort-wchar was %select{disabled|enabled}0 in the PCH file but " + "is currently %select{disabled|enabled}1">; def err_not_a_pch_file : Error< "'%0' does not appear to be a precompiled header file">, DefaultFatal; Index: include/clang/Basic/TargetInfo.h =================================================================== --- include/clang/Basic/TargetInfo.h (revision 85898) +++ include/clang/Basic/TargetInfo.h (working copy) @@ -346,6 +346,11 @@ /// options. virtual void getDefaultLangOptions(LangOptions &Opts) {} + /// setForcedLangOptions - Set forced language options. + /// Apply changes to the target information with respect to certain + /// language options which change the target configuration. + virtual void setForcedLangOptions(LangOptions &Opts); + /// getDefaultFeatures - Get the default set of target features for /// the \args CPU; this should include all legal feature strings on /// the target. Index: include/clang/Basic/LangOptions.h =================================================================== --- include/clang/Basic/LangOptions.h (revision 85898) +++ include/clang/Basic/LangOptions.h (working copy) @@ -83,6 +83,7 @@ unsigned AccessControl : 1; // Whether C++ access control should // be enabled. unsigned CharIsSigned : 1; // Whether char is a signed or unsigned type + unsigned ShortWChar : 1; // Force wchar_t to be unsigned short int. unsigned OpenCL : 1; // OpenCL C99 language extensions. @@ -159,6 +160,7 @@ NoInline = 0; CharIsSigned = 1; + ShortWChar = 0; MainFileName = 0; } Index: include/clang/Driver/Options.def =================================================================== --- include/clang/Driver/Options.def (revision 85898) +++ include/clang/Driver/Options.def (working copy) @@ -461,6 +461,7 @@ OPTION("-fprofile-generate", fprofile_generate, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-framework", framework, Separate, INVALID, INVALID, "l", 0, 0, 0) OPTION("-frtti", frtti, Flag, f_Group, INVALID, "", 0, 0, 0) +OPTION("-fshort-wchar", fshort_wchar, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fshow-source-location", fshow_source_location, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fsigned-bitfields", fsigned_bitfields, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fsigned-char", fsigned_char, Flag, f_Group, INVALID, "", 0, 0, 0) Index: VER =================================================================== --- VER (revision 85898) +++ VER (working copy) @@ -1 +1 @@ -1.1 +1.1 Index: tools/clang-cc/clang-cc.cpp =================================================================== --- tools/clang-cc/clang-cc.cpp (revision 85898) +++ tools/clang-cc/clang-cc.cpp (working copy) @@ -615,7 +615,11 @@ CharIsSigned("fsigned-char", llvm::cl::desc("Force char to be a signed/unsigned type")); +static llvm::cl::opt +ShortWChar("fshort-wchar", + llvm::cl::desc("Force wchar_t to be a short unsigned int")); + static llvm::cl::opt Trigraphs("trigraphs", llvm::cl::desc("Process trigraph sequences")); @@ -813,6 +817,8 @@ Options.Blocks = EnableBlocks; if (CharIsSigned.getPosition()) Options.CharIsSigned = CharIsSigned; + if (ShortWChar.getPosition()) + Options.ShortWChar = ShortWChar; if (!AllowBuiltins) Options.NoBuiltin = 1; @@ -877,6 +883,8 @@ if (MainFileName.getPosition()) Options.setMainFileName(MainFileName.c_str()); + + Target->setForcedLangOptions(Options); } //===----------------------------------------------------------------------===// Index: lib/Frontend/PCHWriter.cpp =================================================================== --- lib/Frontend/PCHWriter.cpp (revision 85898) +++ lib/Frontend/PCHWriter.cpp (working copy) @@ -765,6 +765,7 @@ // be enabled. Record.push_back(LangOpts.CharIsSigned); // Whether char is a signed or // unsigned type + Record.push_back(LangOpts.ShortWChar); // force wchar_t to be unsigned short Record.push_back(LangOpts.getGCMode()); Record.push_back(LangOpts.getVisibilityMode()); Record.push_back(LangOpts.getStackProtectorMode()); Index: lib/Frontend/PCHReader.cpp =================================================================== --- lib/Frontend/PCHReader.cpp (revision 85898) +++ lib/Frontend/PCHReader.cpp (working copy) @@ -104,6 +104,7 @@ PARSE_LANGOPT_IMPORTANT(NoInline, diag::warn_pch_no_inline); PARSE_LANGOPT_IMPORTANT(AccessControl, diag::warn_pch_access_control); PARSE_LANGOPT_IMPORTANT(CharIsSigned, diag::warn_pch_char_signed); + PARSE_LANGOPT_IMPORTANT(ShortWChar, diag::warn_pch_short_wchar); if ((PPLangOpts.getGCMode() != 0) != (LangOpts.getGCMode() != 0)) { Reader.Diag(diag::warn_pch_gc_mode) << LangOpts.getGCMode() << PPLangOpts.getGCMode(); @@ -1741,6 +1742,7 @@ PARSE_LANGOPT(NoInline); PARSE_LANGOPT(AccessControl); PARSE_LANGOPT(CharIsSigned); + PARSE_LANGOPT(ShortWChar); LangOpts.setGCMode((LangOptions::GCMode)Record[Idx]); ++Idx; LangOpts.setVisibilityMode((LangOptions::VisibilityMode)Record[Idx]); Index: lib/Basic/TargetInfo.cpp =================================================================== --- lib/Basic/TargetInfo.cpp (revision 85898) +++ lib/Basic/TargetInfo.cpp (working copy) @@ -12,6 +12,7 @@ //===----------------------------------------------------------------------===// #include "clang/Basic/TargetInfo.h" +#include "clang/Basic/LangOptions.h" #include "llvm/ADT/APFloat.h" #include "llvm/ADT/STLExtras.h" #include @@ -124,6 +125,15 @@ }; } +/// setForcedLangOptions - Set forced language options. +/// Apply changes to the target information with respect to certain +/// language options which change the target configuration. +void TargetInfo::setForcedLangOptions(LangOptions &Opts) { + if (Opts.ShortWChar) { + WCharType = UnsignedShort; + WCharWidth = WCharAlign = 16; + } +} //===----------------------------------------------------------------------===// Index: lib/Driver/Tools.cpp =================================================================== --- lib/Driver/Tools.cpp (revision 85898) +++ lib/Driver/Tools.cpp (working copy) @@ -908,6 +908,13 @@ CmdArgs.push_back("-fsigned-char=0"); } + // -fshort-wchar default varies depending on platform; only + // pass if specified. + if (Arg *A = Args.getLastArg(options::OPT_fshort_wchar)) { + if (A->getOption().matches(options::OPT_fshort_wchar)) + CmdArgs.push_back("-fshort-wchar"); + } + // -fno-pascal-strings is default, only pass non-default. If the tool chain // happened to translate to -mpascal-strings, we want to back translate here. //