r199250 - Remove the -cxx-abi command-line flag.
Rafael Espíndola
rafael.espindola at gmail.com
Tue Jan 14 11:50:50 PST 2014
Nice!
On 14 January 2014 11:35, Hans Wennborg <hans at hanshq.net> wrote:
> Author: hans
> Date: Tue Jan 14 13:35:09 2014
> New Revision: 199250
>
> URL: http://llvm.org/viewvc/llvm-project?rev=199250&view=rev
> Log:
> Remove the -cxx-abi command-line flag.
>
> This makes the C++ ABI depend entirely on the target: MS ABI for -win32 triples,
> Itanium otherwise. It's no longer possible to do weird combinations.
>
> To be able to run a test with a specific ABI without constraining it to a
> specific triple, new substitutions are added to lit: %itanium_abi_triple and
> %ms_abi_triple can be used to get the current target triple adjusted to the
> desired ABI. For example, if the test suite is running with the i686-pc-win32
> target, %itanium_abi_triple will expand to i686-pc-mingw32.
>
> Differential Revision: http://llvm-reviews.chandlerc.com/D2545
>
> Modified:
> cfe/trunk/include/clang/Basic/TargetOptions.h
> cfe/trunk/include/clang/Driver/CC1Options.td
> cfe/trunk/lib/Basic/TargetInfo.cpp
> cfe/trunk/lib/Basic/Targets.cpp
> cfe/trunk/lib/Driver/Tools.cpp
> cfe/trunk/lib/Frontend/CompilerInvocation.cpp
> cfe/trunk/lib/Frontend/FrontendActions.cpp
> cfe/trunk/lib/Serialization/ASTReader.cpp
> cfe/trunk/lib/Serialization/ASTWriter.cpp
> cfe/trunk/test/CXX/dcl.dcl/dcl.link/p7.cpp
> cfe/trunk/test/CXX/dcl.dcl/dcl.spec/dcl.constexpr/p2.cpp
> cfe/trunk/test/CXX/drs/dr2xx.cpp
> cfe/trunk/test/CXX/special/class.copy/implicit-move-def.cpp
> cfe/trunk/test/CXX/special/class.dtor/p3-0x.cpp
> cfe/trunk/test/CXX/special/class.dtor/p9.cpp
> cfe/trunk/test/CodeGen/builtin-ms-noop.cpp
> cfe/trunk/test/CodeGen/captured-statements.c
> cfe/trunk/test/CodeGen/cxx-default-arg.cpp
> cfe/trunk/test/CodeGen/fp-contract-pragma.cpp
> cfe/trunk/test/CodeGen/mangle-windows.c
> cfe/trunk/test/CodeGen/overloadable.c
> cfe/trunk/test/CodeGen/tbaa-for-vptr.cpp
> cfe/trunk/test/CodeGen/tbaa-ms-abi.cpp
> cfe/trunk/test/CodeGenCUDA/filter-decl.cu
> cfe/trunk/test/CodeGenCXX/2003-11-27-MultipleInheritanceThunk.cpp
> cfe/trunk/test/CodeGenCXX/2004-03-08-ReinterpretCastCopy.cpp
> cfe/trunk/test/CodeGenCXX/2004-03-09-UnmangledBuiltinMethods.cpp
> cfe/trunk/test/CodeGenCXX/2006-09-12-OpaqueStructCrash.cpp
> cfe/trunk/test/CodeGenCXX/2010-05-11-alwaysinlineinstantiation.cpp
> cfe/trunk/test/CodeGenCXX/PR5093-static-member-function.cpp
> cfe/trunk/test/CodeGenCXX/PR5863-unreachable-block.cpp
> cfe/trunk/test/CodeGenCXX/address-of-fntemplate.cpp
> cfe/trunk/test/CodeGenCXX/attr-cleanup.cpp
> cfe/trunk/test/CodeGenCXX/attr-used.cpp
> cfe/trunk/test/CodeGenCXX/block-byref-cxx-objc.cpp
> cfe/trunk/test/CodeGenCXX/block.cpp
> cfe/trunk/test/CodeGenCXX/c-linkage.cpp
> cfe/trunk/test/CodeGenCXX/captured-statements.cpp
> cfe/trunk/test/CodeGenCXX/const-base-cast.cpp
> cfe/trunk/test/CodeGenCXX/const-global-linkage.cpp
> cfe/trunk/test/CodeGenCXX/constructor-attr.cpp
> cfe/trunk/test/CodeGenCXX/constructor-destructor-return-this.cpp
> cfe/trunk/test/CodeGenCXX/constructor-init-reference.cpp
> cfe/trunk/test/CodeGenCXX/copy-assign-synthesis-2.cpp
> cfe/trunk/test/CodeGenCXX/copy-constructor-synthesis-2.cpp
> cfe/trunk/test/CodeGenCXX/coverage.cpp
> cfe/trunk/test/CodeGenCXX/cxx0x-defaulted-templates.cpp
> cfe/trunk/test/CodeGenCXX/cxx11-noreturn.cpp
> cfe/trunk/test/CodeGenCXX/cxx11-unrestricted-union.cpp
> cfe/trunk/test/CodeGenCXX/debug-info-char16.cpp
> cfe/trunk/test/CodeGenCXX/debug-info-enum.cpp
> cfe/trunk/test/CodeGenCXX/debug-info-global-ctor-dtor.cpp
> cfe/trunk/test/CodeGenCXX/debug-info-method.cpp
> cfe/trunk/test/CodeGenCXX/debug-info-same-line.cpp
> cfe/trunk/test/CodeGenCXX/debug-info-template-limit.cpp
> cfe/trunk/test/CodeGenCXX/debug-info-thunk.cpp
> cfe/trunk/test/CodeGenCXX/debug-info-use-after-free.cpp
> cfe/trunk/test/CodeGenCXX/debug-info-uuid.cpp
> cfe/trunk/test/CodeGenCXX/default-constructor-default-argument.cpp
> cfe/trunk/test/CodeGenCXX/default-constructor-template-member.cpp
> cfe/trunk/test/CodeGenCXX/default-destructor-nested.cpp
> cfe/trunk/test/CodeGenCXX/deferred-global-init.cpp
> cfe/trunk/test/CodeGenCXX/delayed-template-parsing.cpp
> cfe/trunk/test/CodeGenCXX/derived-to-virtual-base-class-calls-final.cpp
> cfe/trunk/test/CodeGenCXX/destructor-exception-spec.cpp
> cfe/trunk/test/CodeGenCXX/duplicate-mangled-name.cpp
> cfe/trunk/test/CodeGenCXX/dynamic_cast-no-rtti.cpp
> cfe/trunk/test/CodeGenCXX/elide-call-reference.cpp
> cfe/trunk/test/CodeGenCXX/extern-c.cpp
> cfe/trunk/test/CodeGenCXX/function-template-explicit-specialization.cpp
> cfe/trunk/test/CodeGenCXX/function-template-specialization.cpp
> cfe/trunk/test/CodeGenCXX/global-llvm-constant.cpp
> cfe/trunk/test/CodeGenCXX/implicit-instantiation-1.cpp
> cfe/trunk/test/CodeGenCXX/instr-profile.cpp
> cfe/trunk/test/CodeGenCXX/instrument-functions.cpp
> cfe/trunk/test/CodeGenCXX/internal-linkage.cpp
> cfe/trunk/test/CodeGenCXX/mangle-abi-examples.cpp
> cfe/trunk/test/CodeGenCXX/mangle-address-space.cpp
> cfe/trunk/test/CodeGenCXX/mangle-local-class-names.cpp
> cfe/trunk/test/CodeGenCXX/mangle-local-class-vtables.cpp
> cfe/trunk/test/CodeGenCXX/mangle-local-classes-nested.cpp
> cfe/trunk/test/CodeGenCXX/mangle-ms-abi-examples.cpp
> cfe/trunk/test/CodeGenCXX/mangle-ms-arg-qualifiers.cpp
> cfe/trunk/test/CodeGenCXX/mangle-ms-back-references-pr13207.cpp
> cfe/trunk/test/CodeGenCXX/mangle-ms-back-references.cpp
> cfe/trunk/test/CodeGenCXX/mangle-ms-cxx11.cpp
> cfe/trunk/test/CodeGenCXX/mangle-ms-return-qualifiers.cpp
> cfe/trunk/test/CodeGenCXX/mangle-ms-template-callback.cpp
> cfe/trunk/test/CodeGenCXX/mangle-ms-templates.cpp
> cfe/trunk/test/CodeGenCXX/mangle-ms-vector-types.cpp
> cfe/trunk/test/CodeGenCXX/mangle-ms.cpp
> cfe/trunk/test/CodeGenCXX/mangle-nullptr-arg.cpp
> cfe/trunk/test/CodeGenCXX/mangle-std-externc.cpp
> cfe/trunk/test/CodeGenCXX/mangle-template.cpp
> cfe/trunk/test/CodeGenCXX/mangle-windows.cpp
> cfe/trunk/test/CodeGenCXX/member-alignment.cpp
> cfe/trunk/test/CodeGenCXX/microsoft-abi-alignment-fail.cpp
> cfe/trunk/test/CodeGenCXX/microsoft-abi-arg-order.cpp
> cfe/trunk/test/CodeGenCXX/microsoft-abi-array-cookies.cpp
> cfe/trunk/test/CodeGenCXX/microsoft-abi-constexpr-vs-inheritance.cpp
> cfe/trunk/test/CodeGenCXX/microsoft-abi-default-cc.cpp
> cfe/trunk/test/CodeGenCXX/microsoft-abi-exceptions.cpp
> cfe/trunk/test/CodeGenCXX/microsoft-abi-member-pointers.cpp
> cfe/trunk/test/CodeGenCXX/microsoft-abi-methods.cpp
> cfe/trunk/test/CodeGenCXX/microsoft-abi-multiple-nonvirtual-inheritance.cpp
> cfe/trunk/test/CodeGenCXX/microsoft-abi-non-virtual-base-ordering.cpp
> cfe/trunk/test/CodeGenCXX/microsoft-abi-sret-and-byval.cpp
> cfe/trunk/test/CodeGenCXX/microsoft-abi-static-initializers.cpp
> cfe/trunk/test/CodeGenCXX/microsoft-abi-structors-alias.cpp
> cfe/trunk/test/CodeGenCXX/microsoft-abi-structors.cpp
> cfe/trunk/test/CodeGenCXX/microsoft-abi-thunks.cpp
> cfe/trunk/test/CodeGenCXX/microsoft-abi-vbtables.cpp
> cfe/trunk/test/CodeGenCXX/microsoft-abi-virtual-inheritance-vtordisps.cpp
> cfe/trunk/test/CodeGenCXX/microsoft-abi-virtual-inheritance.cpp
> cfe/trunk/test/CodeGenCXX/microsoft-abi-virtual-member-pointers.cpp
> cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance.cpp
> cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-return-thunks.cpp
> cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-single-inheritance.cpp
> cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance-vtordisps.cpp
> cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance.cpp
> cfe/trunk/test/CodeGenCXX/microsoft-new.cpp
> cfe/trunk/test/CodeGenCXX/microsoft-uuidof.cpp
> cfe/trunk/test/CodeGenCXX/ms-integer-static-data-members.cpp
> cfe/trunk/test/CodeGenCXX/ms_wide_predefined_expr.cpp
> cfe/trunk/test/CodeGenCXX/noinline-template.cpp
> cfe/trunk/test/CodeGenCXX/pr11797.cpp
> cfe/trunk/test/CodeGenCXX/pr12104.cpp
> cfe/trunk/test/CodeGenCXX/pr9965.cpp
> cfe/trunk/test/CodeGenCXX/pragma-weak.cpp
> cfe/trunk/test/CodeGenCXX/predefined-expr.cpp
> cfe/trunk/test/CodeGenCXX/reference-field.cpp
> cfe/trunk/test/CodeGenCXX/reference-init.cpp
> cfe/trunk/test/CodeGenCXX/return.cpp
> cfe/trunk/test/CodeGenCXX/scoped-enums.cpp
> cfe/trunk/test/CodeGenCXX/specialized-static-data-mem-init.cpp
> cfe/trunk/test/CodeGenCXX/stmtexpr.cpp
> cfe/trunk/test/CodeGenCXX/template-dependent-bind-temporary.cpp
> cfe/trunk/test/CodeGenCXX/template-inner-struct-visibility-hidden.cpp
> cfe/trunk/test/CodeGenCXX/throw-expression-dtor.cpp
> cfe/trunk/test/CodeGenCXX/thunk-use-after-free.cpp
> cfe/trunk/test/CodeGenCXX/trivial-constructor-init.cpp
> cfe/trunk/test/CodeGenCXX/vararg-non-pod.cpp
> cfe/trunk/test/CodeGenCXX/virt-dtor-gen.cpp
> cfe/trunk/test/CodeGenCXX/virt-dtor-key.cpp
> cfe/trunk/test/CodeGenCXX/virt-template-vtable.cpp
> cfe/trunk/test/CodeGenCXX/virtual-base-cast.cpp
> cfe/trunk/test/CodeGenCXX/virtual-base-ctor.cpp
> cfe/trunk/test/CodeGenCXX/virtual-base-destructor-call.cpp
> cfe/trunk/test/CodeGenCXX/virtual-destructor-synthesis.cpp
> cfe/trunk/test/CodeGenCXX/virtual-function-calls.cpp
> cfe/trunk/test/CodeGenCXX/virtual-implicit-copy-assignment.cpp
> cfe/trunk/test/CodeGenCXX/virtual-implicit-move-assignment.cpp
> cfe/trunk/test/CodeGenCXX/virtual-inherited-destructor.cpp
> cfe/trunk/test/CodeGenCXX/virtual-pseudo-destructor-call.cpp
> cfe/trunk/test/CodeGenCXX/visibility-hidden-extern-templates.cpp
> cfe/trunk/test/CodeGenCXX/volatile-1.cpp
> cfe/trunk/test/CodeGenCXX/vtable-cast-crash.cpp
> cfe/trunk/test/CodeGenCXX/weak-extern-typeinfo.cpp
> cfe/trunk/test/CodeGenCXX/weak-external.cpp
> cfe/trunk/test/CodeGenObjC/debug-info-self.m
> cfe/trunk/test/CodeGenObjC/overloadable.m
> cfe/trunk/test/CodeGenObjCXX/arc-mangle.mm
> cfe/trunk/test/CodeGenObjCXX/microsoft-abi-arc-param-order.mm
> cfe/trunk/test/CodeGenOpenCL/address-spaces-mangling.cl
> cfe/trunk/test/CodeGenOpenCL/local.cl
> cfe/trunk/test/Driver/cl.c
> cfe/trunk/test/Layout/ms-x86-alias-avoidance-padding.cpp
> cfe/trunk/test/Layout/ms-x86-aligned-tail-padding.cpp
> cfe/trunk/test/Layout/ms-x86-basic-layout.cpp
> cfe/trunk/test/Layout/ms-x86-bitfields-vbases.cpp
> cfe/trunk/test/Layout/ms-x86-empty-base-after-base-with-vbptr.cpp
> cfe/trunk/test/Layout/ms-x86-empty-nonvirtual-bases.cpp
> cfe/trunk/test/Layout/ms-x86-empty-virtual-base.cpp
> cfe/trunk/test/Layout/ms-x86-lazy-empty-nonvirtual-base.cpp
> cfe/trunk/test/Layout/ms-x86-misalignedarray.cpp
> cfe/trunk/test/Layout/ms-x86-pack-and-align.cpp
> cfe/trunk/test/Layout/ms-x86-primary-bases.cpp
> cfe/trunk/test/Layout/ms-x86-size-alignment-fail.cpp
> cfe/trunk/test/Layout/ms-x86-vfvb-alignment.cpp
> cfe/trunk/test/Layout/ms-x86-vfvb-sharing.cpp
> cfe/trunk/test/Layout/ms-x86-vtordisp.cpp
> cfe/trunk/test/Modules/module_file_info.m
> cfe/trunk/test/PCH/cxx-reference.cpp
> cfe/trunk/test/PCH/cxx-required-decls.cpp
> cfe/trunk/test/PCH/cxx-templates.cpp
> cfe/trunk/test/PCH/irgen-rdar13114142.mm
> cfe/trunk/test/PCH/objc_literals.mm
> cfe/trunk/test/PCH/objcxx-ivar-class.mm
> cfe/trunk/test/Sema/empty1.c
> cfe/trunk/test/Sema/ms_bitfield_layout.c
> cfe/trunk/test/Sema/ms_class_layout.cpp
> cfe/trunk/test/SemaCXX/calling-conv-compat.cpp
> cfe/trunk/test/SemaCXX/decl-microsoft-call-conv.cpp
> cfe/trunk/test/SemaCXX/destructor.cpp
> cfe/trunk/test/SemaCXX/implicit-virtual-member-functions.cpp
> cfe/trunk/test/SemaCXX/member-pointer-ms.cpp
> cfe/trunk/test/SemaCXX/microsoft-dtor-lookup-cxx11.cpp
> cfe/trunk/test/SemaCXX/microsoft-dtor-lookup.cpp
> cfe/trunk/test/SemaCXX/primary-base.cpp
> cfe/trunk/test/SemaCXX/typeid-ref.cpp
> cfe/trunk/test/SemaCXX/undefined-internal.cpp
> cfe/trunk/test/SemaCXX/virtual-base-used.cpp
> cfe/trunk/test/SemaCXX/virtual-override-x86.cpp
> cfe/trunk/test/SemaCXX/virtual-override.cpp
> cfe/trunk/test/SemaCXX/warn-reinterpret-base-class.cpp
> cfe/trunk/test/SemaCXX/warn-weak-vtables.cpp
> cfe/trunk/test/SemaObjCXX/microsoft-abi-byval.mm
> cfe/trunk/test/SemaTemplate/inject-templated-friend-post.cpp
> cfe/trunk/test/SemaTemplate/inject-templated-friend.cpp
> cfe/trunk/test/SemaTemplate/instantiate-complete.cpp
> cfe/trunk/test/SemaTemplate/instantiate-exception-spec-cxx11.cpp
> cfe/trunk/test/SemaTemplate/virtual-member-functions.cpp
> cfe/trunk/test/lit.cfg
>
> Modified: cfe/trunk/include/clang/Basic/TargetOptions.h
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/TargetOptions.h?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/include/clang/Basic/TargetOptions.h (original)
> +++ cfe/trunk/include/clang/Basic/TargetOptions.h Tue Jan 14 13:35:09 2014
> @@ -38,10 +38,6 @@ public:
> /// If given, the name of the target ABI to use.
> std::string ABI;
>
> - /// If given, the name of the target C++ ABI to use. If not given, defaults
> - /// to "itanium".
> - std::string CXXABI;
> -
> /// If given, the version string of the linker in use.
> std::string LinkerVersion;
>
>
> Modified: cfe/trunk/include/clang/Driver/CC1Options.td
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/CC1Options.td?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/include/clang/Driver/CC1Options.td (original)
> +++ cfe/trunk/include/clang/Driver/CC1Options.td Tue Jan 14 13:35:09 2014
> @@ -17,8 +17,6 @@ let Flags = [CC1Option, NoDriverOption]
> // Target Options
> //===----------------------------------------------------------------------===//
>
> -def cxx_abi : Separate<["-"], "cxx-abi">,
> - HelpText<"Target a particular C++ ABI type">;
> def target_abi : Separate<["-"], "target-abi">,
> HelpText<"Target a particular ABI type">;
> def target_cpu : Separate<["-"], "target-cpu">,
>
> Modified: cfe/trunk/lib/Basic/TargetInfo.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/TargetInfo.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Basic/TargetInfo.cpp (original)
> +++ cfe/trunk/lib/Basic/TargetInfo.cpp Tue Jan 14 13:35:09 2014
> @@ -82,8 +82,10 @@ TargetInfo::TargetInfo(const llvm::Tripl
> // Default to not using fp2ret for __Complex long double
> ComplexLongDoubleUsesFP2Ret = false;
>
> - // Default to using the Itanium ABI.
> - TheCXXABI.set(TargetCXXABI::GenericItanium);
> + // Set the C++ ABI based on the triple.
> + TheCXXABI.set(Triple.getOS() == llvm::Triple::Win32
> + ? TargetCXXABI::Microsoft
> + : TargetCXXABI::GenericItanium);
>
> // Default to an empty address space map.
> AddrSpaceMap = &DefaultAddrSpaceMap;
>
> Modified: cfe/trunk/lib/Basic/Targets.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Basic/Targets.cpp (original)
> +++ cfe/trunk/lib/Basic/Targets.cpp Tue Jan 14 13:35:09 2014
> @@ -5841,12 +5841,6 @@ TargetInfo *TargetInfo::CreateTargetInfo
> return 0;
> }
>
> - // Set the target C++ ABI.
> - if (!Opts->CXXABI.empty() && !Target->setCXXABI(Opts->CXXABI)) {
> - Diags.Report(diag::err_target_unknown_cxxabi) << Opts->CXXABI;
> - return 0;
> - }
> -
> // Set the fp math unit.
> if (!Opts->FPMath.empty() && !Target->setFPMath(Opts->FPMath)) {
> Diags.Report(diag::err_target_unknown_fpmath) << Opts->FPMath;
>
> Modified: cfe/trunk/lib/Driver/Tools.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Driver/Tools.cpp (original)
> +++ cfe/trunk/lib/Driver/Tools.cpp Tue Jan 14 13:35:09 2014
> @@ -3933,10 +3933,6 @@ void Clang::AddClangCLArgs(const ArgList
> // implemented in clang.
> CmdArgs.push_back("--dependent-lib=oldnames");
>
> - // FIXME: Make this default for the win32 triple.
> - CmdArgs.push_back("-cxx-abi");
> - CmdArgs.push_back("microsoft");
> -
> if (Arg *A = Args.getLastArg(options::OPT_show_includes))
> A->render(Args, CmdArgs);
>
>
> Modified: cfe/trunk/lib/Frontend/CompilerInvocation.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/CompilerInvocation.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Frontend/CompilerInvocation.cpp (original)
> +++ cfe/trunk/lib/Frontend/CompilerInvocation.cpp Tue Jan 14 13:35:09 2014
> @@ -1617,7 +1617,6 @@ static void ParsePreprocessorOutputArgs(
> static void ParseTargetArgs(TargetOptions &Opts, ArgList &Args) {
> using namespace options;
> Opts.ABI = Args.getLastArgValue(OPT_target_abi);
> - Opts.CXXABI = Args.getLastArgValue(OPT_cxx_abi);
> Opts.CPU = Args.getLastArgValue(OPT_target_cpu);
> Opts.FPMath = Args.getLastArgValue(OPT_mfpmath);
> Opts.FeaturesAsWritten = Args.getAllArgValues(OPT_target_feature);
> @@ -1627,11 +1626,6 @@ static void ParseTargetArgs(TargetOption
> // Use the default target triple if unspecified.
> if (Opts.Triple.empty())
> Opts.Triple = llvm::sys::getDefaultTargetTriple();
> -
> - // Use the MS ABI for Win32 targets unless otherwise specified.
> - if (Opts.CXXABI.empty() &&
> - llvm::Triple(Opts.Triple).getOS() == llvm::Triple::Win32)
> - Opts.CXXABI = "microsoft";
> }
>
> bool CompilerInvocation::CreateFromArgs(CompilerInvocation &Res,
> @@ -1767,8 +1761,7 @@ std::string CompilerInvocation::getModul
>
> // Extend the signature with the target options.
> code = hash_combine(code, TargetOpts->Triple, TargetOpts->CPU,
> - TargetOpts->ABI, TargetOpts->CXXABI,
> - TargetOpts->LinkerVersion);
> + TargetOpts->ABI, TargetOpts->LinkerVersion);
> for (unsigned i = 0, n = TargetOpts->FeaturesAsWritten.size(); i != n; ++i)
> code = hash_combine(code, TargetOpts->FeaturesAsWritten[i]);
>
>
> Modified: cfe/trunk/lib/Frontend/FrontendActions.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/FrontendActions.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Frontend/FrontendActions.cpp (original)
> +++ cfe/trunk/lib/Frontend/FrontendActions.cpp Tue Jan 14 13:35:09 2014
> @@ -363,7 +363,6 @@ namespace {
> Out.indent(4) << " Triple: " << TargetOpts.Triple << "\n";
> Out.indent(4) << " CPU: " << TargetOpts.CPU << "\n";
> Out.indent(4) << " ABI: " << TargetOpts.ABI << "\n";
> - Out.indent(4) << " C++ ABI: " << TargetOpts.CXXABI << "\n";
> Out.indent(4) << " Linker version: " << TargetOpts.LinkerVersion << "\n";
>
> if (!TargetOpts.FeaturesAsWritten.empty()) {
>
> Modified: cfe/trunk/lib/Serialization/ASTReader.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReader.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Serialization/ASTReader.cpp (original)
> +++ cfe/trunk/lib/Serialization/ASTReader.cpp Tue Jan 14 13:35:09 2014
> @@ -140,7 +140,6 @@ static bool checkTargetOptions(const Tar
> CHECK_TARGET_OPT(Triple, "target");
> CHECK_TARGET_OPT(CPU, "target CPU");
> CHECK_TARGET_OPT(ABI, "target ABI");
> - CHECK_TARGET_OPT(CXXABI, "target C++ ABI");
> CHECK_TARGET_OPT(LinkerVersion, "target linker version");
> #undef CHECK_TARGET_OPT
>
> @@ -4009,7 +4008,6 @@ bool ASTReader::ParseTargetOptions(const
> TargetOpts.Triple = ReadString(Record, Idx);
> TargetOpts.CPU = ReadString(Record, Idx);
> TargetOpts.ABI = ReadString(Record, Idx);
> - TargetOpts.CXXABI = ReadString(Record, Idx);
> TargetOpts.LinkerVersion = ReadString(Record, Idx);
> for (unsigned N = Record[Idx++]; N; --N) {
> TargetOpts.FeaturesAsWritten.push_back(ReadString(Record, Idx));
>
> Modified: cfe/trunk/lib/Serialization/ASTWriter.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTWriter.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Serialization/ASTWriter.cpp (original)
> +++ cfe/trunk/lib/Serialization/ASTWriter.cpp Tue Jan 14 13:35:09 2014
> @@ -1103,7 +1103,6 @@ void ASTWriter::WriteControlBlock(Prepro
> AddString(TargetOpts.Triple, Record);
> AddString(TargetOpts.CPU, Record);
> AddString(TargetOpts.ABI, Record);
> - AddString(TargetOpts.CXXABI, Record);
> AddString(TargetOpts.LinkerVersion, Record);
> Record.push_back(TargetOpts.FeaturesAsWritten.size());
> for (unsigned I = 0, N = TargetOpts.FeaturesAsWritten.size(); I != N; ++I) {
>
> Modified: cfe/trunk/test/CXX/dcl.dcl/dcl.link/p7.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/dcl.dcl/dcl.link/p7.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CXX/dcl.dcl/dcl.link/p7.cpp (original)
> +++ cfe/trunk/test/CXX/dcl.dcl/dcl.link/p7.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm -o - %s | FileCheck %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm -o - %s | FileCheck %s
>
> struct X { };
>
>
> Modified: cfe/trunk/test/CXX/dcl.dcl/dcl.spec/dcl.constexpr/p2.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/dcl.dcl/dcl.spec/dcl.constexpr/p2.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CXX/dcl.dcl/dcl.spec/dcl.constexpr/p2.cpp (original)
> +++ cfe/trunk/test/CXX/dcl.dcl/dcl.spec/dcl.constexpr/p2.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -std=c++11 -emit-llvm -cxx-abi itanium %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -std=c++11 -emit-llvm -triple %itanium_abi_triple %s -o - | FileCheck %s
>
> // constexpr functions and constexpr constructors are implicitly inline.
> struct S {
>
> Modified: cfe/trunk/test/CXX/drs/dr2xx.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/drs/dr2xx.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CXX/drs/dr2xx.cpp (original)
> +++ cfe/trunk/test/CXX/drs/dr2xx.cpp Tue Jan 14 13:35:09 2014
> @@ -1,10 +1,10 @@
> -// RUN: %clang_cc1 -std=c++98 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -cxx-abi itanium
> -// RUN: %clang_cc1 -std=c++11 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -cxx-abi itanium
> -// RUN: %clang_cc1 -std=c++1y %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -cxx-abi itanium
> +// RUN: %clang_cc1 -std=c++98 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -triple %itanium_abi_triple
> +// RUN: %clang_cc1 -std=c++11 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -triple %itanium_abi_triple
> +// RUN: %clang_cc1 -std=c++1y %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -triple %itanium_abi_triple
>
> -// RUN: %clang_cc1 -std=c++98 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -cxx-abi microsoft -DMSABI
> -// RUN: %clang_cc1 -std=c++11 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -cxx-abi microsoft -DMSABI
> -// RUN: %clang_cc1 -std=c++1y %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -cxx-abi microsoft -DMSABI
> +// RUN: %clang_cc1 -std=c++98 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -triple %ms_abi_triple -DMSABI
> +// RUN: %clang_cc1 -std=c++11 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -triple %ms_abi_triple -DMSABI
> +// RUN: %clang_cc1 -std=c++1y %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -triple %ms_abi_triple -DMSABI
>
> // PR13819 -- __SIZE_TYPE__ is incompatible.
> typedef __SIZE_TYPE__ size_t; // expected-error 0-1 {{extension}}
>
> Modified: cfe/trunk/test/CXX/special/class.copy/implicit-move-def.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/special/class.copy/implicit-move-def.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CXX/special/class.copy/implicit-move-def.cpp (original)
> +++ cfe/trunk/test/CXX/special/class.copy/implicit-move-def.cpp Tue Jan 14 13:35:09 2014
> @@ -1,6 +1,6 @@
> -// FIXME: %clang_cc1 -emit-llvm -cxx-abi itanium -o - -std=c++11 %s | FileCheck -check-prefix=CHECK %s
> -// RUN: %clang_cc1 -emit-llvm -cxx-abi itanium -o - -std=c++11 %s | FileCheck -check-prefix=CHECK-ASSIGN %s
> -// RUN: %clang_cc1 -emit-llvm -cxx-abi itanium -o - -std=c++11 %s | FileCheck -check-prefix=CHECK-CTOR %s
> +// FIXME: %clang_cc1 -emit-llvm -triple %itanium_abi_triple -o - -std=c++11 %s | FileCheck -check-prefix=CHECK %s
> +// RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple -o - -std=c++11 %s | FileCheck -check-prefix=CHECK-ASSIGN %s
> +// RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple -o - -std=c++11 %s | FileCheck -check-prefix=CHECK-CTOR %s
>
> // construct
>
>
> Modified: cfe/trunk/test/CXX/special/class.dtor/p3-0x.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/special/class.dtor/p3-0x.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CXX/special/class.dtor/p3-0x.cpp (original)
> +++ cfe/trunk/test/CXX/special/class.dtor/p3-0x.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -fexceptions -fcxx-exceptions -emit-llvm -o - %s | FileCheck %s
> +// RUN: %clang_cc1 -std=c++11 -triple %itanium_abi_triple -fexceptions -fcxx-exceptions -emit-llvm -o - %s | FileCheck %s
>
> struct A {
> ~A();
>
> Modified: cfe/trunk/test/CXX/special/class.dtor/p9.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/special/class.dtor/p9.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CXX/special/class.dtor/p9.cpp (original)
> +++ cfe/trunk/test/CXX/special/class.dtor/p9.cpp Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,5 @@
> -// RUN: %clang_cc1 -fsyntax-only -cxx-abi itanium -verify %s
> -// RUN: %clang_cc1 -fsyntax-only -cxx-abi microsoft -DMSABI -verify %s
> +// RUN: %clang_cc1 -fsyntax-only -triple %itanium_abi_triple -verify %s
> +// RUN: %clang_cc1 -fsyntax-only -triple %ms_abi_triple -DMSABI -verify %s
>
> typedef typeof(sizeof(int)) size_t;
>
>
> Modified: cfe/trunk/test/CodeGen/builtin-ms-noop.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/builtin-ms-noop.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGen/builtin-ms-noop.cpp (original)
> +++ cfe/trunk/test/CodeGen/builtin-ms-noop.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -fms-extensions -triple i686-pc-win32 -cxx-abi itanium -emit-llvm %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -fms-extensions -triple %itanium_abi_triple -emit-llvm %s -o - | FileCheck %s
>
> class A {
> public:
>
> Modified: cfe/trunk/test/CodeGen/captured-statements.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/captured-statements.c?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGen/captured-statements.c (original)
> +++ cfe/trunk/test/CodeGen/captured-statements.c Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm %s -o %t
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm %s -o %t
> // RUN: FileCheck %s -input-file=%t -check-prefix=CHECK-GLOBALS
> // RUN: FileCheck %s -input-file=%t -check-prefix=CHECK-1
> // RUN: FileCheck %s -input-file=%t -check-prefix=CHECK-2
>
> Modified: cfe/trunk/test/CodeGen/cxx-default-arg.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/cxx-default-arg.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGen/cxx-default-arg.cpp (original)
> +++ cfe/trunk/test/CodeGen/cxx-default-arg.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm %s -o %t
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm %s -o %t
>
> // Note-LABEL: define CLANG_GENERATE_KNOWN_GOOD and compile to generate code
> // that makes all of the defaulted arguments explicit. The resulting
>
> Modified: cfe/trunk/test/CodeGen/fp-contract-pragma.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/fp-contract-pragma.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGen/fp-contract-pragma.cpp (original)
> +++ cfe/trunk/test/CodeGen/fp-contract-pragma.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -O3 -cxx-abi itanium -emit-llvm -o - %s | FileCheck %s
> +// RUN: %clang_cc1 -O3 -triple %itanium_abi_triple -emit-llvm -o - %s | FileCheck %s
>
> // Is FP_CONTRACT is honored in a simple case?
> float fp_contract_1(float a, float b, float c) {
>
> Modified: cfe/trunk/test/CodeGen/mangle-windows.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/mangle-windows.c?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGen/mangle-windows.c (original)
> +++ cfe/trunk/test/CodeGen/mangle-windows.c Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm %s -o - -cxx-abi microsoft \
> -// RUN: -triple=i386-pc-win32 | FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm %s -o - -triple=i386-pc-win32 | FileCheck %s
> // RUN: %clang_cc1 -emit-llvm %s -o - -triple=i386-mingw32 | FileCheck %s
>
> void __stdcall f1(void) {}
>
> Modified: cfe/trunk/test/CodeGen/overloadable.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/overloadable.c?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGen/overloadable.c (original)
> +++ cfe/trunk/test/CodeGen/overloadable.c Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,6 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm %s -o - | grep _Z1fPA10_1X
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm %s -o - | FileCheck %s
> +// CHECK: _Z1fPA10_1X
> +
> int __attribute__((overloadable)) f(int x) { return x; }
> float __attribute__((overloadable)) f(float x) { return x; }
> double __attribute__((overloadable)) f(double x) { return x; }
>
> Modified: cfe/trunk/test/CodeGen/tbaa-for-vptr.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/tbaa-for-vptr.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGen/tbaa-for-vptr.cpp (original)
> +++ cfe/trunk/test/CodeGen/tbaa-for-vptr.cpp Tue Jan 14 13:35:09 2014
> @@ -1,9 +1,9 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm -o - -fsanitize=thread %s | FileCheck %s
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm -o - -O1 %s | FileCheck %s
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm -o - -O1 -relaxed-aliasing -fsanitize=thread %s | FileCheck %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm -o - -fsanitize=thread %s | FileCheck %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm -o - -O1 %s | FileCheck %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm -o - -O1 -relaxed-aliasing -fsanitize=thread %s | FileCheck %s
> //
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm -o - %s | FileCheck %s --check-prefix=NOTBAA
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm -o - -O2 -relaxed-aliasing %s | FileCheck %s --check-prefix=NOTBAA
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm -o - %s | FileCheck %s --check-prefix=NOTBAA
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm -o - -O2 -relaxed-aliasing %s | FileCheck %s --check-prefix=NOTBAA
> //
> // Check that we generate TBAA for vtable pointer loads and stores.
> // When -fthread-sanitizer is used TBAA should be generated at all opt levels
>
> Modified: cfe/trunk/test/CodeGen/tbaa-ms-abi.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/tbaa-ms-abi.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGen/tbaa-ms-abi.cpp (original)
> +++ cfe/trunk/test/CodeGen/tbaa-ms-abi.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -cxx-abi microsoft -triple i686-pc-win32 -disable-llvm-optzns -emit-llvm -o - -O1 %s | FileCheck %s
> +// RUN: %clang_cc1 -triple i686-pc-win32 -disable-llvm-optzns -emit-llvm -o - -O1 %s | FileCheck %s
> //
> // Test that TBAA works in the Microsoft C++ ABI. We used to error out while
> // attempting to mangle RTTI.
>
> Modified: cfe/trunk/test/CodeGenCUDA/filter-decl.cu
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCUDA/filter-decl.cu?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCUDA/filter-decl.cu (original)
> +++ cfe/trunk/test/CodeGenCUDA/filter-decl.cu Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,5 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm %s -o - | FileCheck -check-prefix=CHECK-HOST %s
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm %s -o - -fcuda-is-device | FileCheck -check-prefix=CHECK-DEVICE %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm %s -o - | FileCheck -check-prefix=CHECK-HOST %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm %s -o - -fcuda-is-device | FileCheck -check-prefix=CHECK-DEVICE %s
>
> #include "../SemaCUDA/cuda.h"
>
>
> Modified: cfe/trunk/test/CodeGenCXX/2003-11-27-MultipleInheritanceThunk.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/2003-11-27-MultipleInheritanceThunk.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/2003-11-27-MultipleInheritanceThunk.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/2003-11-27-MultipleInheritanceThunk.cpp Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,5 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm %s -o -
> -// RUN: %clang_cc1 -cxx-abi microsoft -fno-rtti -emit-llvm %s -o -
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm %s -o -
> +// RUN: %clang_cc1 -triple %ms_abi_triple -fno-rtti -emit-llvm %s -o -
>
>
> struct CallSite {
>
> Modified: cfe/trunk/test/CodeGenCXX/2004-03-08-ReinterpretCastCopy.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/2004-03-08-ReinterpretCastCopy.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/2004-03-08-ReinterpretCastCopy.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/2004-03-08-ReinterpretCastCopy.cpp Tue Jan 14 13:35:09 2014
> @@ -1,7 +1,7 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm %s -o -
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm %s -o -
>
> // FIXME: Don't assert for non-Win32 triples (PR18251).
> -// RUN: %clang_cc1 -triple i686-pc-win32 -cxx-abi microsoft -fno-rtti -emit-llvm %s -o -
> +// RUN: %clang_cc1 -triple i686-pc-win32 -fno-rtti -emit-llvm %s -o -
>
> struct A {
> virtual void Method() = 0;
>
> Modified: cfe/trunk/test/CodeGenCXX/2004-03-09-UnmangledBuiltinMethods.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/2004-03-09-UnmangledBuiltinMethods.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/2004-03-09-UnmangledBuiltinMethods.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/2004-03-09-UnmangledBuiltinMethods.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm -cxx-abi itanium -o - %s | FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple -o - %s | FileCheck %s
>
> // CHECK: _ZN11AccessFlags6strlenEv
> struct AccessFlags {
>
> Modified: cfe/trunk/test/CodeGenCXX/2006-09-12-OpaqueStructCrash.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/2006-09-12-OpaqueStructCrash.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/2006-09-12-OpaqueStructCrash.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/2006-09-12-OpaqueStructCrash.cpp Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,5 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm -o - %s
> -// RUN: %clang_cc1 -cxx-abi microsoft -fno-rtti -emit-llvm -o - %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm -o - %s
> +// RUN: %clang_cc1 -triple %ms_abi_triple -fno-rtti -emit-llvm -o - %s
>
> struct A {
> virtual ~A();
>
> Modified: cfe/trunk/test/CodeGenCXX/2010-05-11-alwaysinlineinstantiation.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/2010-05-11-alwaysinlineinstantiation.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/2010-05-11-alwaysinlineinstantiation.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/2010-05-11-alwaysinlineinstantiation.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm -cxx-abi itanium %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple %s -o - | FileCheck %s
>
> // CHECK-NOT: ZN12basic_stringIcEC1Ev
> // CHECK: ZN12basic_stringIcED1Ev
>
> Modified: cfe/trunk/test/CodeGenCXX/PR5093-static-member-function.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/PR5093-static-member-function.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/PR5093-static-member-function.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/PR5093-static-member-function.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -emit-llvm -cxx-abi itanium -o - | FileCheck %s
> +// RUN: %clang_cc1 %s -emit-llvm -triple %itanium_abi_triple -o - | FileCheck %s
> struct a {
> static void f();
> };
>
> Modified: cfe/trunk/test/CodeGenCXX/PR5863-unreachable-block.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/PR5863-unreachable-block.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/PR5863-unreachable-block.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/PR5863-unreachable-block.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -fcxx-exceptions -fexceptions -emit-llvm-only %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -fcxx-exceptions -fexceptions -emit-llvm-only %s
>
> // PR5863
> class E { };
>
> Modified: cfe/trunk/test/CodeGenCXX/address-of-fntemplate.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/address-of-fntemplate.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/address-of-fntemplate.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/address-of-fntemplate.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -emit-llvm -cxx-abi itanium -o - | FileCheck %s
> +// RUN: %clang_cc1 %s -emit-llvm -triple %itanium_abi_triple -o - | FileCheck %s
> template <typename T> void f(T) {}
> template <typename T> void f() { }
>
>
> Modified: cfe/trunk/test/CodeGenCXX/attr-cleanup.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/attr-cleanup.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/attr-cleanup.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/attr-cleanup.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm -cxx-abi itanium -o - %s | FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple -o - %s | FileCheck %s
>
> namespace N {
> void free(void *i) {}
>
> Modified: cfe/trunk/test/CodeGenCXX/attr-used.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/attr-used.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/attr-used.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/attr-used.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm -cxx-abi itanium -o - %s | FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple -o - %s | FileCheck %s
>
> // <rdar://problem/8684363>: clang++ not respecting __attribute__((used)) on destructors
> struct X0 {
>
> Modified: cfe/trunk/test/CodeGenCXX/block-byref-cxx-objc.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/block-byref-cxx-objc.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/block-byref-cxx-objc.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/block-byref-cxx-objc.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -emit-llvm -cxx-abi itanium -o - -fblocks | FileCheck %s
> +// RUN: %clang_cc1 %s -emit-llvm -triple %itanium_abi_triple -o - -fblocks | FileCheck %s
> // rdar://8594790
>
> struct A {
>
> Modified: cfe/trunk/test/CodeGenCXX/block.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/block.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/block.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/block.cpp Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,5 @@
> -// RUN: %clang_cc1 %s -cxx-abi itanium -emit-llvm -o - -fblocks
> -// RUN: %clang_cc1 %s -cxx-abi microsoft -fno-rtti -emit-llvm -o - -fblocks
> +// RUN: %clang_cc1 %s -triple %itanium_abi_triple -emit-llvm -o - -fblocks
> +// RUN: %clang_cc1 %s -triple %ms_abi_triple -fno-rtti -emit-llvm -o - -fblocks
> // Just test that this doesn't crash the compiler...
>
> void func(void*);
>
> Modified: cfe/trunk/test/CodeGenCXX/c-linkage.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/c-linkage.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/c-linkage.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/c-linkage.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm -cxx-abi itanium -o - %s | FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple -o - %s | FileCheck %s
> // pr6644
>
> extern "C" {
>
> Modified: cfe/trunk/test/CodeGenCXX/captured-statements.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/captured-statements.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/captured-statements.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/captured-statements.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -emit-llvm %s -o %t
> +// RUN: %clang_cc1 -std=c++11 -triple %itanium_abi_triple -emit-llvm %s -o %t
> // RUN: FileCheck %s -input-file=%t -check-prefix=CHECK-1
> // RUN: FileCheck %s -input-file=%t -check-prefix=CHECK-2
> // RUN: FileCheck %s -input-file=%t -check-prefix=CHECK-3
>
> Modified: cfe/trunk/test/CodeGenCXX/const-base-cast.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/const-base-cast.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/const-base-cast.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/const-base-cast.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm %s -o - | FileCheck %s
>
> // Check that the following construct, which is similar to one which occurs
> // in Firefox, is folded correctly.
>
> Modified: cfe/trunk/test/CodeGenCXX/const-global-linkage.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/const-global-linkage.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/const-global-linkage.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/const-global-linkage.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm -o - %s | FileCheck %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm -o - %s | FileCheck %s
>
> const int x = 10;
> const int y = 20;
>
> Modified: cfe/trunk/test/CodeGenCXX/constructor-attr.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/constructor-attr.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/constructor-attr.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/constructor-attr.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm -o - %s | FileCheck %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm -o - %s | FileCheck %s
>
> // CHECK: @llvm.global_ctors
>
>
> Modified: cfe/trunk/test/CodeGenCXX/constructor-destructor-return-this.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/constructor-destructor-return-this.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/constructor-destructor-return-this.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/constructor-destructor-return-this.cpp Tue Jan 14 13:35:09 2014
> @@ -1,6 +1,6 @@
> //RUN: %clang_cc1 %s -emit-llvm -o - -triple=i686-unknown-linux | FileCheck --check-prefix=CHECKGEN %s
> //RUN: %clang_cc1 %s -emit-llvm -o - -triple=thumbv7-apple-ios3.0 -target-abi apcs-gnu | FileCheck --check-prefix=CHECKARM %s
> -//RUN: %clang_cc1 %s -emit-llvm -o - -triple=i386-pc-win32 -cxx-abi microsoft -fno-rtti | FileCheck --check-prefix=CHECKMS %s
> +//RUN: %clang_cc1 %s -emit-llvm -o - -triple=i386-pc-win32 -fno-rtti | FileCheck --check-prefix=CHECKMS %s
> // FIXME: these tests crash on the bots when run with -triple=x86_64-pc-win32
>
> // Make sure we attach the 'returned' attribute to the 'this' parameter of
>
> Modified: cfe/trunk/test/CodeGenCXX/constructor-init-reference.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/constructor-init-reference.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/constructor-init-reference.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/constructor-init-reference.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm -o - %s | FileCheck %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm -o - %s | FileCheck %s
>
> int x;
> struct A {
>
> Modified: cfe/trunk/test/CodeGenCXX/copy-assign-synthesis-2.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/copy-assign-synthesis-2.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/copy-assign-synthesis-2.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/copy-assign-synthesis-2.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm %s -o - | FileCheck %s
> struct A {};
> A& (A::*x)(const A&) = &A::operator=;
> // CHECK-LABEL: define linkonce_odr {{.*}}%struct.A* @_ZN1AaSERKS_
>
> Modified: cfe/trunk/test/CodeGenCXX/copy-constructor-synthesis-2.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/copy-constructor-synthesis-2.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/copy-constructor-synthesis-2.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/copy-constructor-synthesis-2.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm -o - %s | FileCheck %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm -o - %s | FileCheck %s
>
> struct A { virtual void a(); };
> A x(A& y) { return y; }
>
> Modified: cfe/trunk/test/CodeGenCXX/coverage.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/coverage.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/coverage.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/coverage.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -cxx-abi itanium -emit-llvm -o - -test-coverage -femit-coverage-notes | FileCheck %s
> +// RUN: %clang_cc1 %s -triple %itanium_abi_triple -emit-llvm -o - -test-coverage -femit-coverage-notes | FileCheck %s
>
> extern "C" void test_name1() {}
> void test_name2() {}
>
> Modified: cfe/trunk/test/CodeGenCXX/cxx0x-defaulted-templates.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/cxx0x-defaulted-templates.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/cxx0x-defaulted-templates.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/cxx0x-defaulted-templates.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -emit-llvm -o - %s | FileCheck %s
> +// RUN: %clang_cc1 -std=c++11 -triple %itanium_abi_triple -emit-llvm -o - %s | FileCheck %s
>
> template <typename T>
> struct X {
>
> Modified: cfe/trunk/test/CodeGenCXX/cxx11-noreturn.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/cxx11-noreturn.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/cxx11-noreturn.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/cxx11-noreturn.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm -cxx-abi itanium -std=c++11 %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple -std=c++11 %s -o - | FileCheck %s
>
> int g();
>
>
> Modified: cfe/trunk/test/CodeGenCXX/cxx11-unrestricted-union.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/cxx11-unrestricted-union.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/cxx11-unrestricted-union.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/cxx11-unrestricted-union.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -std=c++11 -emit-llvm %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -std=c++11 -emit-llvm %s -o - | FileCheck %s
>
> struct A {
> A(); A(const A&); A(A&&); A &operator=(const A&); A &operator=(A&&); ~A();
>
> Modified: cfe/trunk/test/CodeGenCXX/debug-info-char16.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info-char16.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/debug-info-char16.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/debug-info-char16.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm -cxx-abi itanium -std=c++11 -g %s -o -| FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple -std=c++11 -g %s -o -| FileCheck %s
>
> // 16 is DW_ATE_UTF (0x10) encoding attribute.
> char16_t char_a = u'h';
>
> Modified: cfe/trunk/test/CodeGenCXX/debug-info-enum.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info-enum.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/debug-info-enum.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/debug-info-enum.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm -g %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm -g %s -o - | FileCheck %s
>
> // CHECK: [[ENUMS:![0-9]*]], {{[^,]*}}, {{[^,]*}}, {{[^,]*}}, {{[^,]*}}, {{[^,]*}}} ; [ DW_TAG_compile_unit ]
> // CHECK: [[ENUMS]] = metadata !{metadata [[E1:![0-9]*]], metadata [[E2:![0-9]*]], metadata [[E3:![0-9]*]]}
>
> Modified: cfe/trunk/test/CodeGenCXX/debug-info-global-ctor-dtor.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info-global-ctor-dtor.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/debug-info-global-ctor-dtor.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/debug-info-global-ctor-dtor.cpp Tue Jan 14 13:35:09 2014
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 %s -g -cxx-abi itanium -fno-use-cxa-atexit -S -emit-llvm -o - \
> +// RUN: %clang_cc1 %s -g -triple %itanium_abi_triple -fno-use-cxa-atexit -S -emit-llvm -o - \
> // RUN: | FileCheck %s --check-prefix=CHECK-NOKEXT
> -// RUN: %clang_cc1 %s -g -cxx-abi itanium -fno-use-cxa-atexit -fapple-kext -S -emit-llvm -o - \
> +// RUN: %clang_cc1 %s -g -triple %itanium_abi_triple -fno-use-cxa-atexit -fapple-kext -S -emit-llvm -o - \
> // RUN: | FileCheck %s --check-prefix=CHECK-KEXT
>
> class A {
>
> Modified: cfe/trunk/test/CodeGenCXX/debug-info-method.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info-method.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/debug-info-method.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/debug-info-method.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm -cxx-abi itanium -std=c++11 -g %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple -std=c++11 -g %s -o - | FileCheck %s
> // CHECK: metadata !"_ZTS1A"} ; [ DW_TAG_class_type ] [A]
> // CHECK: metadata !"_ZN1A3fooEiS_3$_0", {{.*}} [protected]
> // CHECK: ![[THISTYPE:[0-9]+]] = {{.*}} ; [ DW_TAG_pointer_type ] {{.*}} [artificial] [from _ZTS1A]
>
> Modified: cfe/trunk/test/CodeGenCXX/debug-info-same-line.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info-same-line.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/debug-info-same-line.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/debug-info-same-line.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -g -cxx-abi itanium -emit-llvm -o - %s | FileCheck %s
> +// RUN: %clang_cc1 -g -triple %itanium_abi_triple -emit-llvm -o - %s | FileCheck %s
>
> // Make sure that clang outputs distinct debug info for a function
> // that is inlined twice on the same line. Otherwise it would appear
>
> Modified: cfe/trunk/test/CodeGenCXX/debug-info-template-limit.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info-template-limit.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/debug-info-template-limit.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/debug-info-template-limit.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm -fno-standalone-debug -cxx-abi itanium -g %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm -fno-standalone-debug -triple %itanium_abi_triple -g %s -o - | FileCheck %s
>
> // Check that this pointer type is TC<int>
> // CHECK: ![[LINE:[0-9]+]] = {{.*}}"TC<int>", {{.*}} metadata !"_ZTS2TCIiE"} ; [ DW_TAG_class_type ]
>
> Modified: cfe/trunk/test/CodeGenCXX/debug-info-thunk.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info-thunk.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/debug-info-thunk.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/debug-info-thunk.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -cxx-abi itanium -g -S -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 %s -triple %itanium_abi_triple -g -S -emit-llvm -o - | FileCheck %s
>
> struct A {
> virtual void f();
>
> Modified: cfe/trunk/test/CodeGenCXX/debug-info-use-after-free.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info-use-after-free.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/debug-info-use-after-free.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/debug-info-use-after-free.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -g -cxx-abi itanium -emit-llvm-only %s
> +// RUN: %clang_cc1 -g -triple %itanium_abi_triple -emit-llvm-only %s
> // Check that we don't crash.
> // PR12305, PR12315
>
>
> Modified: cfe/trunk/test/CodeGenCXX/debug-info-uuid.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info-uuid.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/debug-info-uuid.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/debug-info-uuid.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm -fms-extensions -triple=x86_64-pc-win32 -cxx-abi microsoft -g %s -o - -std=c++11 | FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm -fms-extensions -triple=x86_64-pc-win32 -g %s -o - -std=c++11 | FileCheck %s
> // RUN: not %clang_cc1 -emit-llvm -fms-extensions -triple=x86_64-unknown-unknown -g %s -o - -std=c++11 2>&1 | FileCheck %s --check-prefix=CHECK-ITANIUM
>
> // CHECK: metadata [[TGIARGS:![0-9]*]], null} ; [ DW_TAG_structure_type ] [tmpl_guid<&__uuidof(uuid)>]
>
> Modified: cfe/trunk/test/CodeGenCXX/default-constructor-default-argument.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/default-constructor-default-argument.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/default-constructor-default-argument.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/default-constructor-default-argument.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -cxx-abi itanium -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 %s -triple %itanium_abi_triple -emit-llvm -o - | FileCheck %s
>
> // Check that call to constructor for struct A is generated correctly.
> struct A { A(int x = 2); };
>
> Modified: cfe/trunk/test/CodeGenCXX/default-constructor-template-member.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/default-constructor-template-member.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/default-constructor-template-member.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/default-constructor-template-member.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm %s -o - | FileCheck %s
>
> template <class T> struct A { A(); };
> struct B { A<int> x; };
>
> Modified: cfe/trunk/test/CodeGenCXX/default-destructor-nested.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/default-destructor-nested.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/default-destructor-nested.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/default-destructor-nested.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -cxx-abi itanium -emit-llvm-only
> +// RUN: %clang_cc1 %s -triple %itanium_abi_triple -emit-llvm-only
> // PR6294
>
> class A {
>
> Modified: cfe/trunk/test/CodeGenCXX/deferred-global-init.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/deferred-global-init.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/deferred-global-init.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/deferred-global-init.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -cxx-abi itanium -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 %s -triple %itanium_abi_triple -emit-llvm -o - | FileCheck %s
> // PR5967
>
> extern void* foo;
>
> Modified: cfe/trunk/test/CodeGenCXX/delayed-template-parsing.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/delayed-template-parsing.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/delayed-template-parsing.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/delayed-template-parsing.cpp Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,5 @@
> -// RUN: %clang_cc1 -std=c++11 -emit-llvm %s -o - -cxx-abi microsoft -fms-extensions -fdelayed-template-parsing -triple=i386-pc-win32 | FileCheck %s
> -// RUN: %clang_cc1 -std=c++11 -emit-llvm %s -o - -cxx-abi microsoft -fms-extensions -fdelayed-template-parsing -triple=x86_64-pc-win32 | FileCheck -check-prefix X64 %s
> +// RUN: %clang_cc1 -std=c++11 -emit-llvm %s -o - -fms-extensions -fdelayed-template-parsing -triple=i386-pc-win32 | FileCheck %s
> +// RUN: %clang_cc1 -std=c++11 -emit-llvm %s -o - -fms-extensions -fdelayed-template-parsing -triple=x86_64-pc-win32 | FileCheck -check-prefix X64 %s
>
> namespace ClassScopeSpecialization {
> struct Type {
>
> Modified: cfe/trunk/test/CodeGenCXX/derived-to-virtual-base-class-calls-final.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/derived-to-virtual-base-class-calls-final.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/derived-to-virtual-base-class-calls-final.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/derived-to-virtual-base-class-calls-final.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -cxx-abi itanium -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 %s -triple %itanium_abi_triple -emit-llvm -o - | FileCheck %s
>
> struct A { int i; };
> struct B { char j; };
>
> Modified: cfe/trunk/test/CodeGenCXX/destructor-exception-spec.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/destructor-exception-spec.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/destructor-exception-spec.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/destructor-exception-spec.cpp Tue Jan 14 13:35:09 2014
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm-only %s -std=c++11
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm-only -fno-use-cxa-atexit %s -std=c++11
> -// RUN: %clang_cc1 -cxx-abi microsoft -fno-rtti -emit-llvm-only %s -std=c++11
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm-only %s -std=c++11
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm-only -fno-use-cxa-atexit %s -std=c++11
> +// RUN: %clang_cc1 -triple %ms_abi_triple -fno-rtti -emit-llvm-only %s -std=c++11
>
> // PR13479: don't crash with -fno-exceptions.
> namespace {
>
> Modified: cfe/trunk/test/CodeGenCXX/duplicate-mangled-name.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/duplicate-mangled-name.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/duplicate-mangled-name.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/duplicate-mangled-name.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm-only %s -verify
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm-only %s -verify
>
> // rdar://15522601
> class MyClass {
>
> Modified: cfe/trunk/test/CodeGenCXX/dynamic_cast-no-rtti.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/dynamic_cast-no-rtti.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/dynamic_cast-no-rtti.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/dynamic_cast-no-rtti.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm %s -verify -fno-rtti -cxx-abi itanium -o - | FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm %s -verify -fno-rtti -triple %itanium_abi_triple -o - | FileCheck %s
> // expected-no-diagnostics
>
> struct A {
>
> Modified: cfe/trunk/test/CodeGenCXX/elide-call-reference.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/elide-call-reference.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/elide-call-reference.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/elide-call-reference.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -emit-llvm -cxx-abi itanium -o - | FileCheck %s
> +// RUN: %clang_cc1 %s -emit-llvm -triple %itanium_abi_triple -o - | FileCheck %s
> // PR5695
>
> struct A { A(const A&); ~A(); };
>
> Modified: cfe/trunk/test/CodeGenCXX/extern-c.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/extern-c.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/extern-c.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/extern-c.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm %s -o - | FileCheck %s
> namespace foo {
>
> // CHECK-NOT: @a = global i32
>
> Modified: cfe/trunk/test/CodeGenCXX/function-template-explicit-specialization.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/function-template-explicit-specialization.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/function-template-explicit-specialization.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/function-template-explicit-specialization.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm -cxx-abi itanium %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple %s -o - | FileCheck %s
>
> template<typename T> void a(T);
> template<> void a(int) {}
>
> Modified: cfe/trunk/test/CodeGenCXX/function-template-specialization.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/function-template-specialization.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/function-template-specialization.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/function-template-specialization.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm -cxx-abi itanium %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple %s -o - | FileCheck %s
> template<typename T, typename U>
> T* next(T* ptr, const U& diff);
>
>
> Modified: cfe/trunk/test/CodeGenCXX/global-llvm-constant.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/global-llvm-constant.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/global-llvm-constant.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/global-llvm-constant.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm -cxx-abi itanium -o - %s | FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple -o - %s | FileCheck %s
>
> struct A {
> A() { x = 10; }
>
> Modified: cfe/trunk/test/CodeGenCXX/implicit-instantiation-1.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/implicit-instantiation-1.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/implicit-instantiation-1.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/implicit-instantiation-1.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm -cxx-abi itanium %s -o %t
> +// RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple %s -o %t
>
> template<typename T>
> struct X {
>
> Modified: cfe/trunk/test/CodeGenCXX/instr-profile.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/instr-profile.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/instr-profile.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/instr-profile.cpp Tue Jan 14 13:35:09 2014
> @@ -7,11 +7,11 @@
> // FIXME: Don't seek bb labels, like "if.else"
> // REQUIRES: asserts
>
> -// RUN: %clangxx %s -o - -emit-llvm -S -fprofile-instr-generate -Xclang -cxx-abi -Xclang itanium | FileCheck -check-prefix=PGOGEN %s
> -// RUN: %clangxx %s -o - -emit-llvm -S -fprofile-instr-generate -Xclang -cxx-abi -Xclang itanium | FileCheck -check-prefix=PGOGEN-EXC %s
> +// RUN: %clangxx %s -o - -emit-llvm -S -fprofile-instr-generate -target %itanium_abi_triple | FileCheck -check-prefix=PGOGEN %s
> +// RUN: %clangxx %s -o - -emit-llvm -S -fprofile-instr-generate -target %itanium_abi_triple | FileCheck -check-prefix=PGOGEN-EXC %s
>
> -// RUN: %clang %s -o - -emit-llvm -S -fprofile-instr-use=%S/Inputs/instr-profile.pgodata -Xclang -cxx-abi -Xclang itanium | FileCheck -check-prefix=PGOUSE %s
> -// RUN: %clang %s -o - -emit-llvm -S -fprofile-instr-use=%S/Inputs/instr-profile.pgodata -Xclang -cxx-abi -Xclang itanium | FileCheck -check-prefix=PGOUSE-EXC %s
> +// RUN: %clang %s -o - -emit-llvm -S -fprofile-instr-use=%S/Inputs/instr-profile.pgodata -target %itanium_abi_triple | FileCheck -check-prefix=PGOUSE %s
> +// RUN: %clang %s -o - -emit-llvm -S -fprofile-instr-use=%S/Inputs/instr-profile.pgodata -target %itanium_abi_triple | FileCheck -check-prefix=PGOUSE-EXC %s
>
> // PGOGEN: @[[THC:__llvm_pgo_ctr[0-9]*]] = private global [11 x i64] zeroinitializer
> // PGOGEN-EXC: @[[THC:__llvm_pgo_ctr[0-9]*]] = private global [11 x i64] zeroinitializer
>
> Modified: cfe/trunk/test/CodeGenCXX/instrument-functions.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/instrument-functions.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/instrument-functions.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/instrument-functions.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -S -emit-llvm -cxx-abi itanium -o - %s -finstrument-functions | FileCheck %s
> +// RUN: %clang_cc1 -S -emit-llvm -triple %itanium_abi_triple -o - %s -finstrument-functions | FileCheck %s
>
> // CHECK: @_Z5test1i
> int test1(int x) {
>
> Modified: cfe/trunk/test/CodeGenCXX/internal-linkage.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/internal-linkage.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/internal-linkage.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/internal-linkage.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm -cxx-abi itanium -o - %s | FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple -o - %s | FileCheck %s
>
> struct Global { Global(); };
> template<typename T> struct X { X() {} };
>
> Modified: cfe/trunk/test/CodeGenCXX/mangle-abi-examples.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle-abi-examples.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/mangle-abi-examples.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/mangle-abi-examples.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -emit-llvm -cxx-abi itanium -o - | FileCheck %s
> +// RUN: %clang_cc1 %s -emit-llvm -triple %itanium_abi_triple -o - | FileCheck %s
>
> // CHECK: @_ZTVZ3foovEN1C1DE =
> // CHECK: @_ZTVZN1A3fooEiE1B =
>
> Modified: cfe/trunk/test/CodeGenCXX/mangle-address-space.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle-address-space.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/mangle-address-space.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/mangle-address-space.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm -cxx-abi itanium -o - %s | FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple -o - %s | FileCheck %s
>
> // CHECK-LABEL: define void @_Z2f0Pc
> void f0(char *p) { }
>
> Modified: cfe/trunk/test/CodeGenCXX/mangle-local-class-names.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle-local-class-names.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/mangle-local-class-names.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/mangle-local-class-names.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -emit-llvm -cxx-abi itanium -o - | FileCheck %s
> +// RUN: %clang_cc1 %s -emit-llvm -triple %itanium_abi_triple -o - | FileCheck %s
>
> // CHECK: @_ZZ4FUNCvEN4SSSSC1ERKf
> // CHECK: @_ZZ4FUNCvEN4SSSSC2E_0RKf
>
> Modified: cfe/trunk/test/CodeGenCXX/mangle-local-class-vtables.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle-local-class-vtables.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/mangle-local-class-vtables.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/mangle-local-class-vtables.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -emit-llvm -cxx-abi itanium -o - | FileCheck %s
> +// RUN: %clang_cc1 %s -emit-llvm -triple %itanium_abi_triple -o - | FileCheck %s
>
> // CHECK: @_ZTVZN1J1KEvE1C = {{.*}} @_ZTIZN1J1KEvE1C {{.*}} @_ZZN1J1KEvENK1C1FEv
> // CHECK: @_ZTIZN1J1KEvE1C = {{.*}} @_ZTSZN1J1KEvE1C
>
> Modified: cfe/trunk/test/CodeGenCXX/mangle-local-classes-nested.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle-local-classes-nested.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/mangle-local-classes-nested.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/mangle-local-classes-nested.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -emit-llvm -cxx-abi itanium -o - | FileCheck %s
> +// RUN: %clang_cc1 %s -emit-llvm -triple %itanium_abi_triple -o - | FileCheck %s
>
> // CHECK: @_ZTVZZ1HvEN1S1IEvE1S =
>
>
> Modified: cfe/trunk/test/CodeGenCXX/mangle-ms-abi-examples.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle-ms-abi-examples.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/mangle-ms-abi-examples.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/mangle-ms-abi-examples.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -fms-extensions -fno-rtti -emit-llvm %s -o - -cxx-abi microsoft -triple=i386-pc-win32 | FileCheck %s
> +// RUN: %clang_cc1 -fms-extensions -fno-rtti -emit-llvm %s -o - -triple=i386-pc-win32 | FileCheck %s
>
> // CHECK: @"\01??_7D at C@?1??foo@@YAXXZ at 6B@" =
> // CHECK: @"\01??_7B@?1??foo at A@@QAEXH at Z@6B@" =
>
> Modified: cfe/trunk/test/CodeGenCXX/mangle-ms-arg-qualifiers.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle-ms-arg-qualifiers.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/mangle-ms-arg-qualifiers.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/mangle-ms-arg-qualifiers.cpp Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,5 @@
> -// RUN: %clang_cc1 -emit-llvm %s -o - -cxx-abi microsoft -triple=i386-pc-win32 | FileCheck %s
> -// RUN: %clang_cc1 -emit-llvm %s -o - -cxx-abi microsoft -triple=x86_64-pc-win32 | FileCheck -check-prefix=X64 %s
> +// RUN: %clang_cc1 -emit-llvm %s -o - -triple=i386-pc-win32 | FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm %s -o - -triple=x86_64-pc-win32 | FileCheck -check-prefix=X64 %s
>
> void foo(const unsigned int) {}
> // CHECK: "\01?foo@@YAXI at Z"
>
> Modified: cfe/trunk/test/CodeGenCXX/mangle-ms-back-references-pr13207.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle-ms-back-references-pr13207.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/mangle-ms-back-references-pr13207.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/mangle-ms-back-references-pr13207.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm %s -o - -cxx-abi microsoft -triple=i386-pc-win32 | FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm %s -o - -triple=i386-pc-win32 | FileCheck %s
>
> template<class X, class Y, class Z>
> class A {};
>
> Modified: cfe/trunk/test/CodeGenCXX/mangle-ms-back-references.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle-ms-back-references.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/mangle-ms-back-references.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/mangle-ms-back-references.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -fms-extensions -fblocks -emit-llvm %s -o - -cxx-abi microsoft -triple=i386-pc-win32 | FileCheck %s
> +// RUN: %clang_cc1 -fms-extensions -fblocks -emit-llvm %s -o - -triple=i386-pc-win32 | FileCheck %s
>
> void f1(const char* a, const char* b) {}
> // CHECK: "\01?f1@@YAXPBD0 at Z"
>
> Modified: cfe/trunk/test/CodeGenCXX/mangle-ms-cxx11.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle-ms-cxx11.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/mangle-ms-cxx11.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/mangle-ms-cxx11.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -std=c++11 -fms-extensions -emit-llvm %s -o - -cxx-abi microsoft -triple=i386-pc-win32 | FileCheck %s
> +// RUN: %clang_cc1 -std=c++11 -fms-extensions -emit-llvm %s -o - -triple=i386-pc-win32 | FileCheck %s
>
> // CHECK: "\01?LRef@@YAXAAH at Z"
> void LRef(int& a) { }
>
> Modified: cfe/trunk/test/CodeGenCXX/mangle-ms-return-qualifiers.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle-ms-return-qualifiers.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/mangle-ms-return-qualifiers.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/mangle-ms-return-qualifiers.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm %s -o - -cxx-abi microsoft -triple=i386-pc-win32 | FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm %s -o - -triple=i386-pc-win32 | FileCheck %s
>
> void a1() {}
> // CHECK: "\01?a1@@YAXXZ"
>
> Modified: cfe/trunk/test/CodeGenCXX/mangle-ms-template-callback.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle-ms-template-callback.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/mangle-ms-template-callback.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/mangle-ms-template-callback.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -fblocks -emit-llvm %s -o - -cxx-abi microsoft -triple=i386-pc-win32 | FileCheck %s
> +// RUN: %clang_cc1 -fblocks -emit-llvm %s -o - -triple=i386-pc-win32 | FileCheck %s
>
> template<typename Signature>
> class C;
>
> Modified: cfe/trunk/test/CodeGenCXX/mangle-ms-templates.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle-ms-templates.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/mangle-ms-templates.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/mangle-ms-templates.cpp Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,5 @@
> -// RUN: %clang_cc1 -std=c++11 -emit-llvm %s -o - -cxx-abi microsoft -fms-extensions -fdelayed-template-parsing -triple=i386-pc-win32 | FileCheck %s
> -// RUN: %clang_cc1 -std=c++11 -emit-llvm %s -o - -cxx-abi microsoft -fms-extensions -fdelayed-template-parsing -triple=x86_64-pc-win32 | FileCheck -check-prefix X64 %s
> +// RUN: %clang_cc1 -std=c++11 -emit-llvm %s -o - -fms-extensions -fdelayed-template-parsing -triple=i386-pc-win32 | FileCheck %s
> +// RUN: %clang_cc1 -std=c++11 -emit-llvm %s -o - -fms-extensions -fdelayed-template-parsing -triple=x86_64-pc-win32 | FileCheck -check-prefix X64 %s
>
> template<typename T>
> class Class {
>
> Modified: cfe/trunk/test/CodeGenCXX/mangle-ms-vector-types.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle-ms-vector-types.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/mangle-ms-vector-types.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/mangle-ms-vector-types.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -fms-extensions -ffreestanding -target-feature +avx -emit-llvm %s -o - -cxx-abi microsoft -triple=i686-pc-win32 | FileCheck %s
> +// RUN: %clang_cc1 -fms-extensions -ffreestanding -target-feature +avx -emit-llvm %s -o - -triple=i686-pc-win32 | FileCheck %s
>
> #include <xmmintrin.h>
> #include <emmintrin.h>
>
> Modified: cfe/trunk/test/CodeGenCXX/mangle-ms.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle-ms.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/mangle-ms.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/mangle-ms.cpp Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,5 @@
> -// RUN: %clang_cc1 -fblocks -emit-llvm %s -o - -cxx-abi microsoft -triple=i386-pc-win32 -std=c++11 | FileCheck %s
> -// RUN: %clang_cc1 -fblocks -emit-llvm %s -o - -cxx-abi microsoft -triple=x86_64-pc-win32 -std=c++11| FileCheck -check-prefix X64 %s
> +// RUN: %clang_cc1 -fblocks -emit-llvm %s -o - -triple=i386-pc-win32 -std=c++11 | FileCheck %s
> +// RUN: %clang_cc1 -fblocks -emit-llvm %s -o - -triple=x86_64-pc-win32 -std=c++11| FileCheck -check-prefix X64 %s
>
> int a;
> // CHECK-DAG: @"\01?a@@3HA"
>
> Modified: cfe/trunk/test/CodeGenCXX/mangle-nullptr-arg.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle-nullptr-arg.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/mangle-nullptr-arg.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/mangle-nullptr-arg.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -emit-llvm -o - %s | FileCheck %s
> +// RUN: %clang_cc1 -std=c++11 -triple %itanium_abi_triple -emit-llvm -o - %s | FileCheck %s
>
> template<int *ip> struct IP {};
>
>
> Modified: cfe/trunk/test/CodeGenCXX/mangle-std-externc.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle-std-externc.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/mangle-std-externc.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/mangle-std-externc.cpp Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,5 @@
> -// RUN: %clang_cc1 %s -DNS=std -emit-llvm -cxx-abi itanium -o - | FileCheck %s --check-prefix=CHECK-STD
> -// RUN: %clang_cc1 %s -DNS=n -emit-llvm -cxx-abi itanium -o - | FileCheck %s --check-prefix=CHECK-N
> +// RUN: %clang_cc1 %s -DNS=std -emit-llvm -triple %itanium_abi_triple -o - | FileCheck %s --check-prefix=CHECK-STD
> +// RUN: %clang_cc1 %s -DNS=n -emit-llvm -triple %itanium_abi_triple -o - | FileCheck %s --check-prefix=CHECK-N
>
> // _ZNSt1DISt1CE1iE = std::D<std::C>::i
> // CHECK-STD: @_ZNSt1DISt1CE1iE =
>
> Modified: cfe/trunk/test/CodeGenCXX/mangle-template.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle-template.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/mangle-template.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/mangle-template.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -verify -Wno-return-type -Wno-main -std=c++11 -emit-llvm -cxx-abi itanium -o - %s | FileCheck %s
> +// RUN: %clang_cc1 -verify -Wno-return-type -Wno-main -std=c++11 -emit-llvm -triple %itanium_abi_triple -o - %s | FileCheck %s
> // expected-no-diagnostics
>
> namespace test1 {
>
> Modified: cfe/trunk/test/CodeGenCXX/mangle-windows.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle-windows.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/mangle-windows.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/mangle-windows.cpp Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,5 @@
> -// RUN: %clang_cc1 -emit-llvm %s -o - -cxx-abi microsoft \
> -// RUN: -triple=i386-pc-win32 | FileCheck --check-prefix=WIN %s
> +// RUN: %clang_cc1 -emit-llvm %s -o - -triple=i386-pc-win32 | \
> +// RUN: FileCheck --check-prefix=WIN %s
> //
> // RUN: %clang_cc1 -emit-llvm %s -o - -triple=i386-mingw32 | \
> // RUN: FileCheck --check-prefix=ITANIUM %s
>
> Modified: cfe/trunk/test/CodeGenCXX/member-alignment.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/member-alignment.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/member-alignment.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/member-alignment.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm -cxx-abi itanium %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple %s -o - | FileCheck %s
>
> // rdar://7268289
>
>
> Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-alignment-fail.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-alignment-fail.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/microsoft-abi-alignment-fail.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-alignment-fail.cpp Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,5 @@
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm -cxx-abi microsoft -triple=i686-pc-win32 -o - %s 2>/dev/null | FileCheck %s
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm -cxx-abi microsoft -triple=x86_64-pc-win32 -o - %s 2>/dev/null | FileCheck %s -check-prefix CHECK-X64
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm -triple=i686-pc-win32 -o - %s 2>/dev/null | FileCheck %s
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm -triple=x86_64-pc-win32 -o - %s 2>/dev/null | FileCheck %s -check-prefix CHECK-X64
>
> struct B { char a; };
> struct A : virtual B {} a;
>
> Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-arg-order.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-arg-order.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/microsoft-abi-arg-order.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-arg-order.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -mconstructor-aliases -std=c++11 -fexceptions -emit-llvm %s -o - -cxx-abi microsoft -triple=i386-pc-win32 | FileCheck %s
> +// RUN: %clang_cc1 -mconstructor-aliases -std=c++11 -fexceptions -emit-llvm %s -o - -triple=i386-pc-win32 | FileCheck %s
>
> struct A {
> A(int a);
>
> Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-array-cookies.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-array-cookies.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/microsoft-abi-array-cookies.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-array-cookies.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm %s -o - -cxx-abi microsoft -triple=i386-pc-win32 | FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm %s -o - -triple=i386-pc-win32 | FileCheck %s
>
> struct ClassWithoutDtor {
> char x;
>
> Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-constexpr-vs-inheritance.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-constexpr-vs-inheritance.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/microsoft-abi-constexpr-vs-inheritance.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-constexpr-vs-inheritance.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -std=c++11 -fno-rtti -emit-llvm %s -o - -cxx-abi microsoft -triple=i386-pc-win32 | FileCheck %s
> +// RUN: %clang_cc1 -std=c++11 -fno-rtti -emit-llvm %s -o - -triple=i386-pc-win32 | FileCheck %s
>
> struct A {
> constexpr A(int x) : x(x) {}
>
> Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-default-cc.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-default-cc.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/microsoft-abi-default-cc.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-default-cc.cpp Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,5 @@
> // RUN: %clang_cc1 -triple i386-pc-linux -emit-llvm %s -o - | FileCheck -check-prefix GCABI %s
> -// RUN: %clang_cc1 -emit-llvm %s -o - -DMS_ABI -cxx-abi microsoft -triple=i386-pc-win32 | FileCheck -check-prefix MSABI %s
> +// RUN: %clang_cc1 -emit-llvm %s -o - -DMS_ABI -triple=i386-pc-win32 | FileCheck -check-prefix MSABI %s
>
> #ifdef MS_ABI
> # define METHOD_CC __thiscall
>
> Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-exceptions.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-exceptions.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/microsoft-abi-exceptions.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-exceptions.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm %s -o - -triple=i386-pc-win32 -mconstructor-aliases -cxx-abi microsoft -fexceptions -fno-rtti | FileCheck -check-prefix WIN32 %s
> +// RUN: %clang_cc1 -emit-llvm %s -o - -triple=i386-pc-win32 -mconstructor-aliases -fexceptions -fno-rtti | FileCheck -check-prefix WIN32 %s
>
> struct A {
> A();
>
> Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-member-pointers.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-member-pointers.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/microsoft-abi-member-pointers.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-member-pointers.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm %s -o - -cxx-abi microsoft -triple=i386-pc-win32 | FileCheck %s
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm %s -o - -triple=i386-pc-win32 | FileCheck %s
> // FIXME: Test x86_64 member pointers when codegen no longer asserts on records
> // with virtual bases.
>
>
> Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-methods.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-methods.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/microsoft-abi-methods.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-methods.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm %s -o - -cxx-abi microsoft -triple=i386-pc-win32 | FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm %s -o - -triple=i386-pc-win32 | FileCheck %s
>
> class C {
> public:
>
> Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-multiple-nonvirtual-inheritance.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-multiple-nonvirtual-inheritance.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/microsoft-abi-multiple-nonvirtual-inheritance.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-multiple-nonvirtual-inheritance.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm %s -o - -mconstructor-aliases -cxx-abi microsoft -triple=i386-pc-win32 | FileCheck %s
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm %s -o - -mconstructor-aliases -triple=i386-pc-win32 | FileCheck %s
>
> struct Left {
> virtual void left();
>
> Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-non-virtual-base-ordering.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-non-virtual-base-ordering.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/microsoft-abi-non-virtual-base-ordering.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-non-virtual-base-ordering.cpp Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,5 @@
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm -cxx-abi microsoft -triple=i686-pc-win32 -o - %s 2>/dev/null | FileCheck %s
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm -cxx-abi microsoft -triple=x86_64-pc-win32 -o - %s 2>/dev/null | FileCheck %s
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm -triple=i686-pc-win32 -o - %s 2>/dev/null | FileCheck %s
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm -triple=x86_64-pc-win32 -o - %s 2>/dev/null | FileCheck %s
>
> struct C0 { int a; };
> struct C1 { int a; virtual void C1M() {} };
>
> Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-sret-and-byval.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-sret-and-byval.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/microsoft-abi-sret-and-byval.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-sret-and-byval.cpp Tue Jan 14 13:35:09 2014
> @@ -1,6 +1,6 @@
> // RUN: %clang_cc1 -emit-llvm %s -o - -triple=i386-pc-linux | FileCheck -check-prefix LINUX %s
> -// RUN: %clang_cc1 -emit-llvm %s -o - -triple=i386-pc-win32 -mconstructor-aliases -cxx-abi microsoft -fno-rtti | FileCheck -check-prefix WIN32 %s
> -// RUN: %clang_cc1 -emit-llvm %s -o - -triple=x86_64-pc-win32 -mconstructor-aliases -cxx-abi microsoft -fno-rtti | FileCheck -check-prefix WIN64 %s
> +// RUN: %clang_cc1 -emit-llvm %s -o - -triple=i386-pc-win32 -mconstructor-aliases -fno-rtti | FileCheck -check-prefix WIN32 %s
> +// RUN: %clang_cc1 -emit-llvm %s -o - -triple=x86_64-pc-win32 -mconstructor-aliases -fno-rtti | FileCheck -check-prefix WIN64 %s
>
> struct Empty {};
>
>
> Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-static-initializers.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-static-initializers.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/microsoft-abi-static-initializers.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-static-initializers.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm %s -o - -mconstructor-aliases -cxx-abi microsoft -triple=i386-pc-win32 | FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm %s -o - -mconstructor-aliases -triple=i386-pc-win32 | FileCheck %s
>
> // CHECK: @llvm.global_ctors = appending global [2 x { i32, void ()* }]
> // CHECK: [{ i32, void ()* } { i32 65535, void ()* @"\01??__Efoo@?$B at H@@YAXXZ" },
>
> Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-structors-alias.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-structors-alias.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/microsoft-abi-structors-alias.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-structors-alias.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm %s -o - -cxx-abi microsoft -triple=i386-pc-win32 -fno-rtti -mconstructor-aliases | FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm %s -o - -triple=i386-pc-win32 -fno-rtti -mconstructor-aliases | FileCheck %s
>
> namespace test1 {
> template <typename T> class A {
>
> Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-structors.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-structors.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/microsoft-abi-structors.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-structors.cpp Tue Jan 14 13:35:09 2014
> @@ -1,10 +1,10 @@
> -// RUN: %clang_cc1 -emit-llvm %s -o - -mconstructor-aliases -cxx-abi microsoft -triple=i386-pc-win32 -fno-rtti > %t
> +// RUN: %clang_cc1 -emit-llvm %s -o - -mconstructor-aliases -triple=i386-pc-win32 -fno-rtti > %t
> // RUN: FileCheck %s < %t
> // vftables are emitted very late, so do another pass to try to keep the checks
> // in source order.
> // RUN: FileCheck --check-prefix DTORS %s < %t
> //
> -// RUN: %clang_cc1 -emit-llvm %s -o - -mconstructor-aliases -cxx-abi microsoft -triple=x86_64-pc-win32 -fno-rtti | FileCheck --check-prefix DTORS-X64 %s
> +// RUN: %clang_cc1 -emit-llvm %s -o - -mconstructor-aliases -triple=x86_64-pc-win32 -fno-rtti | FileCheck --check-prefix DTORS-X64 %s
>
> namespace basic {
>
>
> Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-thunks.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-thunks.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/microsoft-abi-thunks.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-thunks.cpp Tue Jan 14 13:35:09 2014
> @@ -1,8 +1,8 @@
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm %s -o - -cxx-abi microsoft -triple=i386-pc-win32 >%t 2>&1
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm %s -o - -triple=i386-pc-win32 >%t 2>&1
> // RUN: FileCheck --check-prefix=MANGLING %s < %t
> // RUN: FileCheck --check-prefix=XMANGLING %s < %t
> // RUN: FileCheck --check-prefix=CODEGEN %s < %t
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm %s -o - -cxx-abi microsoft -triple=x86_64-pc-win32 2>&1 | FileCheck --check-prefix=MANGLING-X64 %s
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm %s -o - -triple=x86_64-pc-win32 2>&1 | FileCheck --check-prefix=MANGLING-X64 %s
>
> void foo(void *);
>
>
> Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-vbtables.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-vbtables.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/microsoft-abi-vbtables.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-vbtables.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -fno-rtti -cxx-abi microsoft -triple=i386-pc-win32 -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 %s -fno-rtti -triple=i386-pc-win32 -emit-llvm -o - | FileCheck %s
>
> // See microsoft-abi-structors.cpp for constructor codegen tests.
>
>
> Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-virtual-inheritance-vtordisps.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-virtual-inheritance-vtordisps.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/microsoft-abi-virtual-inheritance-vtordisps.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-virtual-inheritance-vtordisps.cpp Tue Jan 14 13:35:09 2014
> @@ -1,7 +1,7 @@
> -// RUN: %clang_cc1 %s -fno-rtti -cxx-abi microsoft -triple=i386-pc-win32 -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 %s -fno-rtti -triple=i386-pc-win32 -emit-llvm -o - | FileCheck %s
>
> // For now, just make sure x86_64 doesn't crash.
> -// RUN: %clang_cc1 %s -fno-rtti -cxx-abi microsoft -triple=x86_64-pc-win32 -emit-llvm -o %t
> +// RUN: %clang_cc1 %s -fno-rtti -triple=x86_64-pc-win32 -emit-llvm -o %t
>
> struct A {
> virtual void f();
>
> Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-virtual-inheritance.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-virtual-inheritance.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/microsoft-abi-virtual-inheritance.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-virtual-inheritance.cpp Tue Jan 14 13:35:09 2014
> @@ -1,9 +1,9 @@
> -// RUN: %clang_cc1 %s -fno-rtti -cxx-abi microsoft -triple=i386-pc-win32 -emit-llvm -o %t
> +// RUN: %clang_cc1 %s -fno-rtti -triple=i386-pc-win32 -emit-llvm -o %t
> // RUN: FileCheck %s < %t
> // RUN: FileCheck --check-prefix=CHECK2 %s < %t
>
> // For now, just make sure x86_64 doesn't crash.
> -// RUN: %clang_cc1 %s -fno-rtti -cxx-abi microsoft -triple=x86_64-pc-win32 -emit-llvm -o %t
> +// RUN: %clang_cc1 %s -fno-rtti -triple=x86_64-pc-win32 -emit-llvm -o %t
>
> struct VBase {
> virtual ~VBase();
>
> Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-virtual-member-pointers.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-virtual-member-pointers.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/microsoft-abi-virtual-member-pointers.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-virtual-member-pointers.cpp Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,5 @@
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm -cxx-abi microsoft -triple=i386-pc-win32 %s -o - | FileCheck %s --check-prefix=CHECK32
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm -cxx-abi microsoft -triple=x86_64-pc-win32 %s -o - | FileCheck %s --check-prefix=CHECK64
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm -triple=i386-pc-win32 %s -o - | FileCheck %s --check-prefix=CHECK32
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm -triple=x86_64-pc-win32 %s -o - | FileCheck %s --check-prefix=CHECK64
>
> struct S {
> int x, y, z;
>
> Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -fno-rtti -cxx-abi microsoft -triple=i386-pc-win32 -emit-llvm -o %t.ll -fdump-vtable-layouts >%t
> +// RUN: %clang_cc1 %s -fno-rtti -triple=i386-pc-win32 -emit-llvm -o %t.ll -fdump-vtable-layouts >%t
>
> // RUN: FileCheck --check-prefix=NO-THUNKS-Test1 %s < %t
> // RUN: FileCheck --check-prefix=NO-THUNKS-Test2 %s < %t
>
> Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-return-thunks.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-return-thunks.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-return-thunks.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-return-thunks.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -fno-rtti %s -emit-llvm -o %t -cxx-abi microsoft -triple=i386-pc-win32 -fdump-vtable-layouts 2>&1 | FileCheck --check-prefix=VFTABLES %s
> +// RUN: %clang_cc1 -fno-rtti %s -emit-llvm -o %t -triple=i386-pc-win32 -fdump-vtable-layouts 2>&1 | FileCheck --check-prefix=VFTABLES %s
> // RUN: FileCheck --check-prefix=GLOBALS %s < %t
> // RUN: FileCheck --check-prefix=CODEGEN %s < %t
>
>
> Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-single-inheritance.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-single-inheritance.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-single-inheritance.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-single-inheritance.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -fno-rtti -cxx-abi microsoft -triple=i386-pc-win32 -emit-llvm -fdump-vtable-layouts -o %t.ll > %t
> +// RUN: %clang_cc1 %s -fno-rtti -triple=i386-pc-win32 -emit-llvm -fdump-vtable-layouts -o %t.ll > %t
> // RUN: FileCheck --check-prefix=EMITS-VFTABLE %s < %t.ll
> // RUN: FileCheck --check-prefix=NO-VFTABLE %s < %t.ll
> // RUN: FileCheck --check-prefix=CHECK-A %s < %t
>
> Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance-vtordisps.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance-vtordisps.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance-vtordisps.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance-vtordisps.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm -fdump-vtable-layouts %s -o %t.ll -cxx-abi microsoft -triple=i386-pc-win32 >%t
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm -fdump-vtable-layouts %s -o %t.ll -triple=i386-pc-win32 > %t
> // RUN: FileCheck --check-prefix=VTABLE-SIMPLE-A %s < %t
> // RUN: FileCheck --check-prefix=VTABLE-SIMPLE-B %s < %t
> // RUN: FileCheck --check-prefix=VTABLE-SIMPLE-C %s < %t
> @@ -13,7 +13,7 @@
> // RUN: FileCheck --check-prefix=MANGLING %s < %t.ll
>
> // For now, just make sure x86_64 doesn't crash.
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -fdump-vtable-layouts %s -cxx-abi microsoft -triple=x86_64-pc-win32 >/dev/null
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -fdump-vtable-layouts %s -triple=x86_64-pc-win32 > /dev/null
>
> struct V1 {
> virtual void f();
>
> Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm -o %t.ll -fdump-vtable-layouts %s -cxx-abi microsoft -triple=i386-pc-win32 >%t
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm -o %t.ll -fdump-vtable-layouts %s -triple=i386-pc-win32 >%t
>
> // RUN: FileCheck --check-prefix=VTABLE-C %s < %t
> // RUN: FileCheck --check-prefix=VTABLE-D %s < %t
>
> Modified: cfe/trunk/test/CodeGenCXX/microsoft-new.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-new.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/microsoft-new.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/microsoft-new.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -triple i686-pc-win32 -cxx-abi itanium -fms-compatibility %s -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 -triple i686-pc-win32 -fms-compatibility %s -emit-llvm -o - | FileCheck %s
>
> #include <stddef.h>
>
> @@ -13,7 +13,7 @@ namespace PR13164 {
> // MSVC will fall back on the non-array operator new.
> void *a;
> int *p = new(arbitrary) int[4];
> - // CHECK: call i8* @_Znwj11arbitrary_t(i32 16, %struct.arbitrary_t*
> + // CHECK: call i8* @"\01??2 at YAPAXIUarbitrary_t@@@Z"(i32 16, %struct.arbitrary_t*
> }
>
> struct S {
> @@ -22,9 +22,9 @@ namespace PR13164 {
>
> void g() {
> S *s = new(arbitrary) S[2];
> - // CHECK: call i8* @_ZN7PR131641SnaEj11arbitrary_t(i32 2, %struct.arbitrary_t*
> + // CHECK: call i8* @"\01??_US at PR13164@@SAPAXIUarbitrary_t@@@Z"(i32 2, %struct.arbitrary_t*
> S *s1 = new(arbitrary) S;
> - // CHECK: call i8* @_Znwj11arbitrary_t(i32 1, %struct.arbitrary_t*
> + // CHECK: call i8* @"\01??2 at YAPAXIUarbitrary_t@@@Z"(i32 1, %struct.arbitrary_t*
> }
>
> struct T {
> @@ -34,6 +34,6 @@ namespace PR13164 {
> void h() {
> // This should still call the global operator new[].
> T *t = new(arbitrary2) T[2];
> - // CHECK: call i8* @_Znaj12arbitrary2_t(i32 2, %struct.arbitrary2_t*
> + // CHECK: call i8* @"\01??_U at YAPAXIUarbitrary2_t@@@Z"(i32 2, %struct.arbitrary2_t*
> }
> }
>
> Modified: cfe/trunk/test/CodeGenCXX/microsoft-uuidof.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-uuidof.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/microsoft-uuidof.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/microsoft-uuidof.cpp Tue Jan 14 13:35:09 2014
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -emit-llvm %s -o - -DDEFINE_GUID -triple=i386-pc-win32 -fms-extensions -cxx-abi itanium | FileCheck %s --check-prefix=CHECK-DEFINE-GUID
> -// RUN: %clang_cc1 -emit-llvm %s -o - -triple=i386-pc-win32 -fms-extensions -cxx-abi itanium | FileCheck %s
> -// RUN: %clang_cc1 -emit-llvm %s -o - -DDEFINE_GUID -DWRONG_GUID -triple=i386-pc-win32 -fms-extensions -cxx-abi itanium | FileCheck %s --check-prefix=CHECK-DEFINE-WRONG-GUID
> +// RUN: %clang_cc1 -emit-llvm %s -o - -DDEFINE_GUID -triple=i386-pc-linux -fms-extensions | FileCheck %s --check-prefix=CHECK-DEFINE-GUID
> +// RUN: %clang_cc1 -emit-llvm %s -o - -triple=i386-pc-linux -fms-extensions | FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm %s -o - -DDEFINE_GUID -DWRONG_GUID -triple=i386-pc-linux -fms-extensions | FileCheck %s --check-prefix=CHECK-DEFINE-WRONG-GUID
>
> #ifdef DEFINE_GUID
> struct _GUID {
>
> Modified: cfe/trunk/test/CodeGenCXX/ms-integer-static-data-members.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/ms-integer-static-data-members.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/ms-integer-static-data-members.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/ms-integer-static-data-members.cpp Tue Jan 14 13:35:09 2014
> @@ -1,7 +1,7 @@
> -// RUN: %clang_cc1 -emit-llvm -cxx-abi microsoft -triple=i386-pc-win32 %s -o - | FileCheck %s
> -// RUN: %clang_cc1 -DINLINE_INIT -emit-llvm -cxx-abi microsoft -triple=i386-pc-win32 %s -o - | FileCheck %s --check-prefix=CHECK-INLINE
> -// RUN: %clang_cc1 -DREAL_DEFINITION -emit-llvm -cxx-abi microsoft -triple=i386-pc-win32 %s -o - | FileCheck %s --check-prefix=CHECK-OUTOFLINE
> -// RUN: %clang_cc1 -DINLINE_INIT -DREAL_DEFINITION -emit-llvm -cxx-abi microsoft -triple=i386-pc-win32 %s -o - | FileCheck %s --check-prefix=CHECK-INLINE
> +// RUN: %clang_cc1 -emit-llvm -triple=i386-pc-win32 %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -DINLINE_INIT -emit-llvm -triple=i386-pc-win32 %s -o - | FileCheck %s --check-prefix=CHECK-INLINE
> +// RUN: %clang_cc1 -DREAL_DEFINITION -emit-llvm -triple=i386-pc-win32 %s -o - | FileCheck %s --check-prefix=CHECK-OUTOFLINE
> +// RUN: %clang_cc1 -DINLINE_INIT -DREAL_DEFINITION -emit-llvm -triple=i386-pc-win32 %s -o - | FileCheck %s --check-prefix=CHECK-INLINE
>
> struct S {
> // For MS ABI, we emit a linkonce_odr definition here, even though it's really just a declaration.
>
> Modified: cfe/trunk/test/CodeGenCXX/ms_wide_predefined_expr.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/ms_wide_predefined_expr.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/ms_wide_predefined_expr.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/ms_wide_predefined_expr.cpp Tue Jan 14 13:35:09 2014
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 %s -fms-extensions -triple i686-pc-win32 -cxx-abi itanium -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 %s -fms-extensions -triple i686-pc-win32 -emit-llvm -o - | FileCheck %s
>
> -// CHECK: @L__FUNCTION__._Z4funcv = private constant [5 x i16] [i16 102, i16 117, i16 110, i16 99, i16 0], align 2
> +// CHECK: @"L__FUNCTION__.?func@@YAXXZ" = private constant [5 x i16] [i16 102, i16 117, i16 110, i16 99, i16 0], align 2
>
> void wprint(const wchar_t*);
>
>
> Modified: cfe/trunk/test/CodeGenCXX/noinline-template.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/noinline-template.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/noinline-template.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/noinline-template.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -emit-llvm -cxx-abi itanium -o - | FileCheck %s
> +// RUN: %clang_cc1 %s -emit-llvm -triple %itanium_abi_triple -o - | FileCheck %s
>
> // This was a problem in Sema, but only shows up as noinline missing
> // in CodeGen.
>
> Modified: cfe/trunk/test/CodeGenCXX/pr11797.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/pr11797.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/pr11797.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/pr11797.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -fvisibility hidden -cxx-abi itanium -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 %s -fvisibility hidden -triple %itanium_abi_triple -emit-llvm -o - | FileCheck %s
>
> namespace std __attribute__ ((__visibility__ ("default"))) {}
> #pragma GCC visibility push(default)
>
> Modified: cfe/trunk/test/CodeGenCXX/pr12104.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/pr12104.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/pr12104.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/pr12104.cpp Tue Jan 14 13:35:09 2014
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -include %S/pr12104.h %s -cxx-abi itanium -emit-llvm -o - | FileCheck %s
> -// RUN: %clang_cc1 -x c++ -cxx-abi itanium -emit-pch -o %t %S/pr12104.h
> -// RUN: %clang_cc1 -include-pch %t %s -cxx-abi itanium -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 -include %S/pr12104.h %s -triple %itanium_abi_triple -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 -x c++ -triple %itanium_abi_triple -emit-pch -o %t %S/pr12104.h
> +// RUN: %clang_cc1 -include-pch %t %s -triple %itanium_abi_triple -emit-llvm -o - | FileCheck %s
>
> template struct Patch<1>;
>
>
> Modified: cfe/trunk/test/CodeGenCXX/pr9965.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/pr9965.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/pr9965.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/pr9965.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -emit-llvm -o - %s | FileCheck %s
> +// RUN: %clang_cc1 -std=c++11 -triple %itanium_abi_triple -emit-llvm -o - %s | FileCheck %s
> struct A { A(); };
> template<typename T>
> struct X : A // default constructor is not trivial
>
> Modified: cfe/trunk/test/CodeGenCXX/pragma-weak.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/pragma-weak.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/pragma-weak.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/pragma-weak.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm %s -o - | FileCheck %s
>
> #pragma weak zex
> int zex;
>
> Modified: cfe/trunk/test/CodeGenCXX/predefined-expr.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/predefined-expr.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/predefined-expr.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/predefined-expr.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -std=c++11 %s -cxx-abi itanium -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 -std=c++11 %s -triple %itanium_abi_triple -emit-llvm -o - | FileCheck %s
>
> // CHECK: private unnamed_addr constant [15 x i8] c"externFunction\00"
> // CHECK: private unnamed_addr constant [26 x i8] c"void NS::externFunction()\00"
>
> Modified: cfe/trunk/test/CodeGenCXX/reference-field.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/reference-field.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/reference-field.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/reference-field.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm -cxx-abi itanium -o - %s -O2 | FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple -o - %s -O2 | FileCheck %s
>
> // Make sure the call to b() doesn't get optimized out.
> extern struct x {char& x,y;}y;
>
> Modified: cfe/trunk/test/CodeGenCXX/reference-init.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/reference-init.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/reference-init.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/reference-init.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm-only -cxx-abi itanium -verify %s
> +// RUN: %clang_cc1 -emit-llvm-only -triple %itanium_abi_triple -verify %s
> // expected-no-diagnostics
>
> struct XPTParamDescriptor {};
>
> Modified: cfe/trunk/test/CodeGenCXX/return.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/return.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/return.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/return.cpp Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,5 @@
> -// RUN: %clang_cc1 -emit-llvm -cxx-abi itanium -o - %s | FileCheck %s
> -// RUN: %clang_cc1 -emit-llvm -cxx-abi itanium -O -o - %s | FileCheck %s --check-prefix=CHECK-OPT
> +// RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple -o - %s | FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple -O -o - %s | FileCheck %s --check-prefix=CHECK-OPT
>
> // CHECK: @_Z9no_return
> // CHECK-OPT: @_Z9no_return
>
> Modified: cfe/trunk/test/CodeGenCXX/scoped-enums.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/scoped-enums.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/scoped-enums.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/scoped-enums.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -emit-llvm -o - %s | FileCheck %s
> +// RUN: %clang_cc1 -std=c++11 -triple %itanium_abi_triple -emit-llvm -o - %s | FileCheck %s
>
> // PR9923
> enum class Color { red, blue, green };
>
> Modified: cfe/trunk/test/CodeGenCXX/specialized-static-data-mem-init.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/specialized-static-data-mem-init.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/specialized-static-data-mem-init.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/specialized-static-data-mem-init.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -emit-llvm -cxx-abi itanium -o - | FileCheck %s
> +// RUN: %clang_cc1 %s -emit-llvm -triple %itanium_abi_triple -o - | FileCheck %s
> // rdar: // 8562966
> // pr8409
>
>
> Modified: cfe/trunk/test/CodeGenCXX/stmtexpr.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/stmtexpr.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/stmtexpr.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/stmtexpr.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -Wno-unused-value -cxx-abi itanium -emit-llvm -o - %s | FileCheck %s
> +// RUN: %clang_cc1 -Wno-unused-value -triple %itanium_abi_triple -emit-llvm -o - %s | FileCheck %s
> // rdar: //8540501
> extern "C" int printf(...);
> extern "C" void abort();
>
> Modified: cfe/trunk/test/CodeGenCXX/template-dependent-bind-temporary.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/template-dependent-bind-temporary.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/template-dependent-bind-temporary.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/template-dependent-bind-temporary.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -emit-llvm -cxx-abi itanium -o - | FileCheck %s
> +// RUN: %clang_cc1 %s -emit-llvm -triple %itanium_abi_triple -o - | FileCheck %s
> // rdar: //8620524
> // PR7851
> struct string {
>
> Modified: cfe/trunk/test/CodeGenCXX/template-inner-struct-visibility-hidden.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/template-inner-struct-visibility-hidden.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/template-inner-struct-visibility-hidden.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/template-inner-struct-visibility-hidden.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -fvisibility hidden -cxx-abi itanium -emit-llvm -o - %s | FileCheck %s
> +// RUN: %clang_cc1 -fvisibility hidden -triple %itanium_abi_triple -emit-llvm -o - %s | FileCheck %s
>
> // Verify that symbols are hidden.
> // CHECK: @_ZN1CIiE5Inner6Inner26StaticE = weak_odr hidden global
>
> Modified: cfe/trunk/test/CodeGenCXX/throw-expression-dtor.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/throw-expression-dtor.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/throw-expression-dtor.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/throw-expression-dtor.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -emit-llvm-only -verify -cxx-abi itanium -fcxx-exceptions -fexceptions
> +// RUN: %clang_cc1 %s -emit-llvm-only -verify -triple %itanium_abi_triple -fcxx-exceptions -fexceptions
> // expected-no-diagnostics
> // PR7281
>
>
> Modified: cfe/trunk/test/CodeGenCXX/thunk-use-after-free.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/thunk-use-after-free.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/thunk-use-after-free.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/thunk-use-after-free.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm-only -cxx-abi itanium -O1 %s
> +// RUN: %clang_cc1 -emit-llvm-only -triple %itanium_abi_triple -O1 %s
> // This used to crash under asan and valgrind.
> // PR12284
>
>
> Modified: cfe/trunk/test/CodeGenCXX/trivial-constructor-init.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/trivial-constructor-init.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/trivial-constructor-init.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/trivial-constructor-init.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm %s -o - -std=c++11 -cxx-abi itanium | FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm %s -o - -std=c++11 -triple %itanium_abi_triple | FileCheck %s
>
> extern "C" int printf(...);
>
>
> Modified: cfe/trunk/test/CodeGenCXX/vararg-non-pod.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/vararg-non-pod.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/vararg-non-pod.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/vararg-non-pod.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -Wno-error=non-pod-varargs -cxx-abi itanium -emit-llvm -o - %s | FileCheck %s
> +// RUN: %clang_cc1 -Wno-error=non-pod-varargs -triple %itanium_abi_triple -emit-llvm -o - %s | FileCheck %s
>
> struct X {
> X();
>
> Modified: cfe/trunk/test/CodeGenCXX/virt-dtor-gen.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/virt-dtor-gen.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/virt-dtor-gen.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/virt-dtor-gen.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -o - -cxx-abi itanium -emit-llvm %s | FileCheck %s
> +// RUN: %clang_cc1 -o - -triple %itanium_abi_triple -emit-llvm %s | FileCheck %s
> // PR5483
>
> // Make sure we generate all three forms of the destructor when it is virtual.
>
> Modified: cfe/trunk/test/CodeGenCXX/virt-dtor-key.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/virt-dtor-key.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/virt-dtor-key.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/virt-dtor-key.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm %s -o - | FileCheck %s
> // CHECK: @_ZTI3foo = unnamed_addr constant
> class foo {
> foo();
>
> Modified: cfe/trunk/test/CodeGenCXX/virt-template-vtable.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/virt-template-vtable.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/virt-template-vtable.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/virt-template-vtable.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -cxx-abi itanium -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 %s -triple %itanium_abi_triple -emit-llvm -o - | FileCheck %s
>
> template<class T> class A {
> public:
>
> Modified: cfe/trunk/test/CodeGenCXX/virtual-base-cast.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/virtual-base-cast.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/virtual-base-cast.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/virtual-base-cast.cpp Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,5 @@
> // RUN: %clang_cc1 -emit-llvm %s -o - -triple i686-pc-linux-gnu | FileCheck %s
> -// RUN: %clang_cc1 -cxx-abi microsoft -emit-llvm %s -o - -triple i686-pc-win32 | FileCheck -check-prefix MSVC %s
> +// RUN: %clang_cc1 -emit-llvm %s -o - -triple i686-pc-win32 | FileCheck -check-prefix MSVC %s
>
> struct A { int a; virtual int aa(); };
> struct B { int b; virtual int bb(); };
>
> Modified: cfe/trunk/test/CodeGenCXX/virtual-base-ctor.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/virtual-base-ctor.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/virtual-base-ctor.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/virtual-base-ctor.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -emit-llvm -cxx-abi itanium -o - -O2 | FileCheck %s
> +// RUN: %clang_cc1 %s -emit-llvm -triple %itanium_abi_triple -o - -O2 | FileCheck %s
>
> struct B;
> extern B x;
>
> Modified: cfe/trunk/test/CodeGenCXX/virtual-base-destructor-call.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/virtual-base-destructor-call.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/virtual-base-destructor-call.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/virtual-base-destructor-call.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -cxx-abi itanium -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 %s -triple %itanium_abi_triple -emit-llvm -o - | FileCheck %s
>
> struct basic_ios{~basic_ios(); };
>
>
> Modified: cfe/trunk/test/CodeGenCXX/virtual-destructor-synthesis.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/virtual-destructor-synthesis.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/virtual-destructor-synthesis.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/virtual-destructor-synthesis.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -cxx-abi itanium -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 %s -triple %itanium_abi_triple -emit-llvm -o - | FileCheck %s
>
> struct box {
> virtual ~box();
>
> Modified: cfe/trunk/test/CodeGenCXX/virtual-function-calls.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/virtual-function-calls.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/virtual-function-calls.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/virtual-function-calls.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -cxx-abi itanium -std=c++11 -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 %s -triple %itanium_abi_triple -std=c++11 -emit-llvm -o - | FileCheck %s
>
> // PR5021
> namespace PR5021 {
>
> Modified: cfe/trunk/test/CodeGenCXX/virtual-implicit-copy-assignment.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/virtual-implicit-copy-assignment.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/virtual-implicit-copy-assignment.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/virtual-implicit-copy-assignment.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm -o - %s | FileCheck %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm -o - %s | FileCheck %s
>
> struct D;
> struct B {
>
> Modified: cfe/trunk/test/CodeGenCXX/virtual-implicit-move-assignment.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/virtual-implicit-move-assignment.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/virtual-implicit-move-assignment.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/virtual-implicit-move-assignment.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm -std=c++11 -o - %s | FileCheck %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm -std=c++11 -o - %s | FileCheck %s
>
> struct D;
> struct B {
>
> Modified: cfe/trunk/test/CodeGenCXX/virtual-inherited-destructor.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/virtual-inherited-destructor.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/virtual-inherited-destructor.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/virtual-inherited-destructor.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -cxx-abi itanium -emit-llvm-only
> +// RUN: %clang_cc1 %s -triple %itanium_abi_triple -emit-llvm-only
>
> struct A { virtual ~A(); };
> struct B : A {
>
> Modified: cfe/trunk/test/CodeGenCXX/virtual-pseudo-destructor-call.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/virtual-pseudo-destructor-call.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/virtual-pseudo-destructor-call.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/virtual-pseudo-destructor-call.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -cxx-abi itanium -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 %s -triple %itanium_abi_triple -emit-llvm -o - | FileCheck %s
>
> struct A {
> virtual ~A();
>
> Modified: cfe/trunk/test/CodeGenCXX/visibility-hidden-extern-templates.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/visibility-hidden-extern-templates.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/visibility-hidden-extern-templates.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/visibility-hidden-extern-templates.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -O1 -cxx-abi itanium -emit-llvm -o - -fvisibility hidden %s | FileCheck %s
> +// RUN: %clang_cc1 -O1 -triple %itanium_abi_triple -emit-llvm -o - -fvisibility hidden %s | FileCheck %s
>
> template<typename T>
> struct X {
>
> Modified: cfe/trunk/test/CodeGenCXX/volatile-1.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/volatile-1.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/volatile-1.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/volatile-1.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -Wno-unused-value -cxx-abi itanium -emit-llvm %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -Wno-unused-value -triple %itanium_abi_triple -emit-llvm %s -o - | FileCheck %s
>
> // CHECK: @i = global [[INT:i[0-9]+]] 0
> volatile int i, j, k;
>
> Modified: cfe/trunk/test/CodeGenCXX/vtable-cast-crash.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/vtable-cast-crash.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/vtable-cast-crash.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/vtable-cast-crash.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm-only -cxx-abi itanium %s
> +// RUN: %clang_cc1 -emit-llvm-only -triple %itanium_abi_triple %s
> struct A
> {
> A();
>
> Modified: cfe/trunk/test/CodeGenCXX/weak-extern-typeinfo.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/weak-extern-typeinfo.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/weak-extern-typeinfo.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/weak-extern-typeinfo.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -emit-llvm -cxx-abi itanium -o - | FileCheck %s
> +// RUN: %clang_cc1 %s -emit-llvm -triple %itanium_abi_triple -o - | FileCheck %s
> // rdar://10246395
>
> #define WEAK __attribute__ ((weak))
>
> Modified: cfe/trunk/test/CodeGenCXX/weak-external.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/weak-external.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/weak-external.cpp (original)
> +++ cfe/trunk/test/CodeGenCXX/weak-external.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -fcxx-exceptions -fexceptions -cxx-abi itanium %s -S -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 -fcxx-exceptions -fexceptions -triple %itanium_abi_triple %s -S -emit-llvm -o - | FileCheck %s
> // PR4262
>
> // CHECK-NOT: _ZNSs12_S_constructIPKcEEPcT_S3_RKSaIcESt20forward_iterator_tag
>
> Modified: cfe/trunk/test/CodeGenObjC/debug-info-self.m
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/debug-info-self.m?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenObjC/debug-info-self.m (original)
> +++ cfe/trunk/test/CodeGenObjC/debug-info-self.m Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm -cxx-abi itanium -g %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple -g %s -o - | FileCheck %s
> // self and _cmd are marked as DW_AT_artificial.
> // myarg is not marked as DW_AT_artificial.
>
>
> Modified: cfe/trunk/test/CodeGenObjC/overloadable.m
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/overloadable.m?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenObjC/overloadable.m (original)
> +++ cfe/trunk/test/CodeGenObjC/overloadable.m Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,5 @@
> // rdar://6657613
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm %s -o - | FileCheck %s
>
> @class C;
>
>
> Modified: cfe/trunk/test/CodeGenObjCXX/arc-mangle.mm
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjCXX/arc-mangle.mm?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenObjCXX/arc-mangle.mm (original)
> +++ cfe/trunk/test/CodeGenObjCXX/arc-mangle.mm Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -fobjc-arc -fobjc-runtime-has-weak -cxx-abi itanium -emit-llvm -o - %s | FileCheck %s
> +// RUN: %clang_cc1 -fobjc-arc -fobjc-runtime-has-weak -triple %itanium_abi_triple -emit-llvm -o - %s | FileCheck %s
>
> // CHECK-LABEL: define void @_Z1fPU8__strongP11objc_object(i8**)
> void f(__strong id *) {}
>
> Modified: cfe/trunk/test/CodeGenObjCXX/microsoft-abi-arc-param-order.mm
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjCXX/microsoft-abi-arc-param-order.mm?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenObjCXX/microsoft-abi-arc-param-order.mm (original)
> +++ cfe/trunk/test/CodeGenObjCXX/microsoft-abi-arc-param-order.mm Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -cxx-abi microsoft -mconstructor-aliases -fobjc-arc -triple i686-pc-win32 -emit-llvm -o - %s | FileCheck %s
> +// RUN: %clang_cc1 -mconstructor-aliases -fobjc-arc -triple i686-pc-win32 -emit-llvm -o - %s | FileCheck %s
>
> struct A {
> A();
>
> Modified: cfe/trunk/test/CodeGenOpenCL/address-spaces-mangling.cl
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCL/address-spaces-mangling.cl?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenOpenCL/address-spaces-mangling.cl (original)
> +++ cfe/trunk/test/CodeGenOpenCL/address-spaces-mangling.cl Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,5 @@
> -// RUN: %clang_cc1 %s -ffake-address-space-map -faddress-space-map-mangling=yes -cxx-abi itanium -emit-llvm -o - | FileCheck -check-prefix=ASMANG %s
> -// RUN: %clang_cc1 %s -ffake-address-space-map -faddress-space-map-mangling=no -cxx-abi itanium -emit-llvm -o - | FileCheck -check-prefix=NOASMANG %s
> +// RUN: %clang_cc1 %s -ffake-address-space-map -faddress-space-map-mangling=yes -triple %itanium_abi_triple -emit-llvm -o - | FileCheck -check-prefix=ASMANG %s
> +// RUN: %clang_cc1 %s -ffake-address-space-map -faddress-space-map-mangling=no -triple %itanium_abi_triple -emit-llvm -o - | FileCheck -check-prefix=NOASMANG %s
>
> // We can't name this f as private is equivalent to default
> // no specifier given address space so we get multiple definition
>
> Modified: cfe/trunk/test/CodeGenOpenCL/local.cl
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCL/local.cl?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGenOpenCL/local.cl (original)
> +++ cfe/trunk/test/CodeGenOpenCL/local.cl Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -ffake-address-space-map -faddress-space-map-mangling=no -cxx-abi itanium -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 %s -ffake-address-space-map -faddress-space-map-mangling=no -triple %itanium_abi_triple -emit-llvm -o - | FileCheck %s
>
> __kernel void foo(void) {
> // CHECK: @foo.i = internal addrspace(2)
>
> Modified: cfe/trunk/test/Driver/cl.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/cl.c?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/Driver/cl.c (original)
> +++ cfe/trunk/test/Driver/cl.c Tue Jan 14 13:35:09 2014
> @@ -31,5 +31,4 @@
> // CL-NOT: -fapple-kext
>
> // RUN: %clang_cl /c -### -- %s 2>&1 | FileCheck -check-prefix=COMPILE %s
> -// COMPILE: "-cxx-abi" "microsoft"
> // COMPILE: "-fdiagnostics-format" "msvc"
>
> Modified: cfe/trunk/test/Layout/ms-x86-alias-avoidance-padding.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Layout/ms-x86-alias-avoidance-padding.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/Layout/ms-x86-alias-avoidance-padding.cpp (original)
> +++ cfe/trunk/test/Layout/ms-x86-alias-avoidance-padding.cpp Tue Jan 14 13:35:09 2014
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -fsyntax-only -cxx-abi microsoft %s 2>/dev/null \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -fsyntax-only %s 2>/dev/null \
> // RUN: | FileCheck %s
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts -fsyntax-only -cxx-abi microsoft %s 2>/dev/null \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts -fsyntax-only %s 2>/dev/null \
> // RUN: | FileCheck %s -check-prefix CHECK-X64
>
> extern "C" int printf(const char *fmt, ...);
>
> Modified: cfe/trunk/test/Layout/ms-x86-aligned-tail-padding.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Layout/ms-x86-aligned-tail-padding.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/Layout/ms-x86-aligned-tail-padding.cpp (original)
> +++ cfe/trunk/test/Layout/ms-x86-aligned-tail-padding.cpp Tue Jan 14 13:35:09 2014
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -fsyntax-only -cxx-abi microsoft %s 2>/dev/null \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -fsyntax-only %s 2>/dev/null \
> // RUN: | FileCheck %s
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts -fsyntax-only -cxx-abi microsoft %s 2>/dev/null \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts -fsyntax-only %s 2>/dev/null \
> // RUN: | FileCheck %s -check-prefix CHECK-X64
>
> extern "C" int printf(const char *fmt, ...);
>
> Modified: cfe/trunk/test/Layout/ms-x86-basic-layout.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Layout/ms-x86-basic-layout.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/Layout/ms-x86-basic-layout.cpp (original)
> +++ cfe/trunk/test/Layout/ms-x86-basic-layout.cpp Tue Jan 14 13:35:09 2014
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -fsyntax-only -cxx-abi microsoft %s 2>/dev/null \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -fsyntax-only %s 2>/dev/null \
> // RUN: | FileCheck %s
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts -fsyntax-only -cxx-abi microsoft %s 2>/dev/null \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts -fsyntax-only %s 2>/dev/null \
> // RUN: | FileCheck %s -check-prefix CHECK-X64
>
> extern "C" int printf(const char *fmt, ...);
>
> Modified: cfe/trunk/test/Layout/ms-x86-bitfields-vbases.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Layout/ms-x86-bitfields-vbases.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/Layout/ms-x86-bitfields-vbases.cpp (original)
> +++ cfe/trunk/test/Layout/ms-x86-bitfields-vbases.cpp Tue Jan 14 13:35:09 2014
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -fsyntax-only -cxx-abi microsoft %s 2>&1 \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -fsyntax-only %s 2>&1 \
> // RUN: | FileCheck %s
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts -fsyntax-only -cxx-abi microsoft %s 2>/dev/null \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts -fsyntax-only %s 2>/dev/null \
> // RUN: | FileCheck %s -check-prefix CHECK-X64
>
> struct B0 { int a; };
>
> Modified: cfe/trunk/test/Layout/ms-x86-empty-base-after-base-with-vbptr.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Layout/ms-x86-empty-base-after-base-with-vbptr.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/Layout/ms-x86-empty-base-after-base-with-vbptr.cpp (original)
> +++ cfe/trunk/test/Layout/ms-x86-empty-base-after-base-with-vbptr.cpp Tue Jan 14 13:35:09 2014
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -cxx-abi microsoft %s 2>/dev/null \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts %s 2>/dev/null \
> // RUN: | FileCheck %s
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts -cxx-abi microsoft %s 2>/dev/null \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts %s 2>/dev/null \
> // RUN: | FileCheck %s -check-prefix CHECK-X64
>
>
>
> Modified: cfe/trunk/test/Layout/ms-x86-empty-nonvirtual-bases.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Layout/ms-x86-empty-nonvirtual-bases.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/Layout/ms-x86-empty-nonvirtual-bases.cpp (original)
> +++ cfe/trunk/test/Layout/ms-x86-empty-nonvirtual-bases.cpp Tue Jan 14 13:35:09 2014
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -fsyntax-only -cxx-abi microsoft %s 2>/dev/null \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -fsyntax-only %s 2>/dev/null \
> // RUN: | FileCheck %s
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts -fsyntax-only -cxx-abi microsoft %s 2>/dev/null \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts -fsyntax-only %s 2>/dev/null \
> // RUN: | FileCheck %s
>
> extern "C" int printf(const char *fmt, ...);
>
> Modified: cfe/trunk/test/Layout/ms-x86-empty-virtual-base.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Layout/ms-x86-empty-virtual-base.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/Layout/ms-x86-empty-virtual-base.cpp (original)
> +++ cfe/trunk/test/Layout/ms-x86-empty-virtual-base.cpp Tue Jan 14 13:35:09 2014
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -fsyntax-only -cxx-abi microsoft %s 2>/dev/null \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -fsyntax-only %s 2>/dev/null \
> // RUN: | FileCheck %s
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts -fsyntax-only -cxx-abi microsoft %s 2>/dev/null \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts -fsyntax-only %s 2>/dev/null \
> // RUN: | FileCheck %s -check-prefix CHECK-X64
>
> extern "C" int printf(const char *fmt, ...);
> @@ -757,4 +757,4 @@ sizeof(S)+
> sizeof(T)+
> sizeof(U)+
> sizeof(V)+
> -sizeof(T3)];
> \ No newline at end of file
> +sizeof(T3)];
>
> Modified: cfe/trunk/test/Layout/ms-x86-lazy-empty-nonvirtual-base.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Layout/ms-x86-lazy-empty-nonvirtual-base.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/Layout/ms-x86-lazy-empty-nonvirtual-base.cpp (original)
> +++ cfe/trunk/test/Layout/ms-x86-lazy-empty-nonvirtual-base.cpp Tue Jan 14 13:35:09 2014
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -fsyntax-only -cxx-abi microsoft %s 2>/dev/null \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -fsyntax-only %s 2>/dev/null \
> // RUN: | FileCheck %s
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts -fsyntax-only -cxx-abi microsoft %s 2>/dev/null \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts -fsyntax-only %s 2>/dev/null \
> // RUN: | FileCheck %s -check-prefix CHECK-X64
>
> extern "C" int printf(const char *fmt, ...);
>
> Modified: cfe/trunk/test/Layout/ms-x86-misalignedarray.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Layout/ms-x86-misalignedarray.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/Layout/ms-x86-misalignedarray.cpp (original)
> +++ cfe/trunk/test/Layout/ms-x86-misalignedarray.cpp Tue Jan 14 13:35:09 2014
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -fsyntax-only -cxx-abi microsoft %s 2>&1 \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -fsyntax-only %s 2>&1 \
> // RUN: | FileCheck %s
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts -fsyntax-only -cxx-abi microsoft %s 2>/dev/null \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts -fsyntax-only %s 2>/dev/null \
> // RUN: | FileCheck %s -check-prefix CHECK-X64
>
> struct T0 { char c; };
>
> Modified: cfe/trunk/test/Layout/ms-x86-pack-and-align.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Layout/ms-x86-pack-and-align.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/Layout/ms-x86-pack-and-align.cpp (original)
> +++ cfe/trunk/test/Layout/ms-x86-pack-and-align.cpp Tue Jan 14 13:35:09 2014
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -fsyntax-only -cxx-abi microsoft %s 2>&1 \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -fsyntax-only %s 2>&1 \
> // RUN: | FileCheck %s
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts -fsyntax-only -cxx-abi microsoft %s 2>/dev/null \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts -fsyntax-only %s 2>/dev/null \
> // RUN: | FileCheck %s -check-prefix CHECK-X64
>
> extern "C" int printf(const char *fmt, ...);
>
> Modified: cfe/trunk/test/Layout/ms-x86-primary-bases.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Layout/ms-x86-primary-bases.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/Layout/ms-x86-primary-bases.cpp (original)
> +++ cfe/trunk/test/Layout/ms-x86-primary-bases.cpp Tue Jan 14 13:35:09 2014
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -fsyntax-only -cxx-abi microsoft %s 2>/dev/null \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -fsyntax-only %s 2>/dev/null \
> // RUN: | FileCheck %s
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts -fsyntax-only -cxx-abi microsoft %s 2>/dev/null \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts -fsyntax-only %s 2>/dev/null \
> // RUN: | FileCheck %s -check-prefix CHECK-X64
>
> extern "C" int printf(const char *fmt, ...);
>
> Modified: cfe/trunk/test/Layout/ms-x86-size-alignment-fail.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Layout/ms-x86-size-alignment-fail.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/Layout/ms-x86-size-alignment-fail.cpp (original)
> +++ cfe/trunk/test/Layout/ms-x86-size-alignment-fail.cpp Tue Jan 14 13:35:09 2014
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -cxx-abi microsoft %s 2>/dev/null \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts %s 2>/dev/null \
> // RUN: | FileCheck %s
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts -cxx-abi microsoft %s 2>/dev/null \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts %s 2>/dev/null \
> // RUN: | FileCheck %s -check-prefix CHECK-X64
>
> extern "C" int printf(const char *fmt, ...);
>
> Modified: cfe/trunk/test/Layout/ms-x86-vfvb-alignment.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Layout/ms-x86-vfvb-alignment.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/Layout/ms-x86-vfvb-alignment.cpp (original)
> +++ cfe/trunk/test/Layout/ms-x86-vfvb-alignment.cpp Tue Jan 14 13:35:09 2014
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -fsyntax-only -cxx-abi microsoft %s 2>&1 \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -fsyntax-only %s 2>&1 \
> // RUN: | FileCheck %s
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts -fsyntax-only -cxx-abi microsoft %s 2>/dev/null \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts -fsyntax-only %s 2>/dev/null \
> // RUN: | FileCheck %s -check-prefix CHECK-X64
>
> extern "C" int printf(const char *fmt, ...);
>
> Modified: cfe/trunk/test/Layout/ms-x86-vfvb-sharing.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Layout/ms-x86-vfvb-sharing.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/Layout/ms-x86-vfvb-sharing.cpp (original)
> +++ cfe/trunk/test/Layout/ms-x86-vfvb-sharing.cpp Tue Jan 14 13:35:09 2014
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -fsyntax-only -cxx-abi microsoft %s 2>&1 \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -fsyntax-only %s 2>&1 \
> // RUN: | FileCheck %s
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts -fsyntax-only -cxx-abi microsoft %s 2>/dev/null \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts -fsyntax-only %s 2>/dev/null \
> // RUN: | FileCheck %s -check-prefix CHECK-X64
>
> extern "C" int printf(const char *fmt, ...);
>
> Modified: cfe/trunk/test/Layout/ms-x86-vtordisp.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Layout/ms-x86-vtordisp.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/Layout/ms-x86-vtordisp.cpp (original)
> +++ cfe/trunk/test/Layout/ms-x86-vtordisp.cpp Tue Jan 14 13:35:09 2014
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -fsyntax-only -cxx-abi microsoft %s 2>&1 \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -fsyntax-only %s 2>&1 \
> // RUN: | FileCheck %s
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts -fsyntax-only -cxx-abi microsoft %s 2>/dev/null \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts -fsyntax-only %s 2>/dev/null \
> // RUN: | FileCheck %s -check-prefix CHECK-X64
>
> extern "C" int printf(const char *fmt, ...);
>
> Modified: cfe/trunk/test/Modules/module_file_info.m
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/module_file_info.m?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/Modules/module_file_info.m (original)
> +++ cfe/trunk/test/Modules/module_file_info.m Tue Jan 14 13:35:09 2014
> @@ -16,7 +16,6 @@
> // CHECK: Triple:
> // CHECK: CPU:
> // CHECK: ABI:
> -// CHECK: C++ ABI:
> // CHECK: Linker version:
>
> // CHECK: Header search options:
>
> Modified: cfe/trunk/test/PCH/cxx-reference.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/cxx-reference.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/PCH/cxx-reference.cpp (original)
> +++ cfe/trunk/test/PCH/cxx-reference.cpp Tue Jan 14 13:35:09 2014
> @@ -1,6 +1,6 @@
> // Test this without pch.
> -// RUN: %clang_cc1 -x c++ -cxx-abi itanium -std=c++11 -include %S/cxx-reference.h -fsyntax-only -emit-llvm -o - %s
> +// RUN: %clang_cc1 -x c++ -triple %itanium_abi_triple -std=c++11 -include %S/cxx-reference.h -fsyntax-only -emit-llvm -o - %s
>
> // Test with pch.
> -// RUN: %clang_cc1 -x c++ -cxx-abi itanium -std=c++11 -emit-pch -o %t %S/cxx-reference.h
> -// RUN: %clang_cc1 -x c++ -cxx-abi itanium -std=c++11 -include-pch %t -fsyntax-only -emit-llvm -o - %s
> +// RUN: %clang_cc1 -x c++ -triple %itanium_abi_triple -std=c++11 -emit-pch -o %t %S/cxx-reference.h
> +// RUN: %clang_cc1 -x c++ -triple %itanium_abi_triple -std=c++11 -include-pch %t -fsyntax-only -emit-llvm -o - %s
>
> Modified: cfe/trunk/test/PCH/cxx-required-decls.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/cxx-required-decls.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/PCH/cxx-required-decls.cpp (original)
> +++ cfe/trunk/test/PCH/cxx-required-decls.cpp Tue Jan 14 13:35:09 2014
> @@ -1,9 +1,9 @@
> // Test this without pch.
> -// RUN: %clang_cc1 -include %S/cxx-required-decls.h %s -cxx-abi itanium -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 -include %S/cxx-required-decls.h %s -triple %itanium_abi_triple -emit-llvm -o - | FileCheck %s
>
> // Test with pch.
> -// RUN: %clang_cc1 -x c++-header -cxx-abi itanium -emit-pch -o %t %S/cxx-required-decls.h
> -// RUN: %clang_cc1 -include-pch %t %s -cxx-abi itanium -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 -x c++-header -triple %itanium_abi_triple -emit-pch -o %t %S/cxx-required-decls.h
> +// RUN: %clang_cc1 -include-pch %t %s -triple %itanium_abi_triple -emit-llvm -o - | FileCheck %s
>
> // CHECK: @_ZL5globS = internal global %struct.S zeroinitializer
> // CHECK: @_ZL3bar = internal global i32 0, align 4
>
> Modified: cfe/trunk/test/PCH/cxx-templates.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/cxx-templates.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/PCH/cxx-templates.cpp (original)
> +++ cfe/trunk/test/PCH/cxx-templates.cpp Tue Jan 14 13:35:09 2014
> @@ -1,21 +1,21 @@
> // Test this without pch.
> -// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -fcxx-exceptions -fexceptions -include %S/cxx-templates.h -verify %s -ast-dump -o -
> -// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -fcxx-exceptions -fexceptions -include %S/cxx-templates.h %s -emit-llvm -o - -DNO_ERRORS | FileCheck %s
> +// RUN: %clang_cc1 -std=c++11 -triple %itanium_abi_triple -fcxx-exceptions -fexceptions -include %S/cxx-templates.h -verify %s -ast-dump -o -
> +// RUN: %clang_cc1 -std=c++11 -triple %itanium_abi_triple -fcxx-exceptions -fexceptions -include %S/cxx-templates.h %s -emit-llvm -o - -DNO_ERRORS | FileCheck %s
>
> // Test with pch.
> -// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -fcxx-exceptions -fexceptions -x c++-header -emit-pch -o %t %S/cxx-templates.h
> -// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -fcxx-exceptions -fexceptions -include-pch %t -verify %s -ast-dump -o -
> -// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -fcxx-exceptions -fexceptions -include-pch %t %s -emit-llvm -o - -error-on-deserialized-decl doNotDeserialize -DNO_ERRORS | FileCheck %s
> +// RUN: %clang_cc1 -std=c++11 -triple %itanium_abi_triple -fcxx-exceptions -fexceptions -x c++-header -emit-pch -o %t %S/cxx-templates.h
> +// RUN: %clang_cc1 -std=c++11 -triple %itanium_abi_triple -fcxx-exceptions -fexceptions -include-pch %t -verify %s -ast-dump -o -
> +// RUN: %clang_cc1 -std=c++11 -triple %itanium_abi_triple -fcxx-exceptions -fexceptions -include-pch %t %s -emit-llvm -o - -error-on-deserialized-decl doNotDeserialize -DNO_ERRORS | FileCheck %s
>
> // Test with modules.
> -// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -fcxx-exceptions -fexceptions -fmodules -x c++-header -emit-pch -o %t %S/cxx-templates.h
> -// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -fcxx-exceptions -fexceptions -fmodules -include-pch %t -verify %s -ast-dump -o -
> -// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -fcxx-exceptions -fexceptions -fmodules -include-pch %t %s -emit-llvm -o - -error-on-deserialized-decl doNotDeserialize -DNO_ERRORS | FileCheck %s
> +// RUN: %clang_cc1 -std=c++11 -triple %itanium_abi_triple -fcxx-exceptions -fexceptions -fmodules -x c++-header -emit-pch -o %t %S/cxx-templates.h
> +// RUN: %clang_cc1 -std=c++11 -triple %itanium_abi_triple -fcxx-exceptions -fexceptions -fmodules -include-pch %t -verify %s -ast-dump -o -
> +// RUN: %clang_cc1 -std=c++11 -triple %itanium_abi_triple -fcxx-exceptions -fexceptions -fmodules -include-pch %t %s -emit-llvm -o - -error-on-deserialized-decl doNotDeserialize -DNO_ERRORS | FileCheck %s
>
> // Test with pch and delayed template parsing.
> -// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -fcxx-exceptions -fdelayed-template-parsing -fexceptions -x c++-header -emit-pch -o %t %S/cxx-templates.h
> -// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -fcxx-exceptions -fdelayed-template-parsing -fexceptions -include-pch %t -verify %s -ast-dump -o -
> -// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -fcxx-exceptions -fdelayed-template-parsing -fexceptions -include-pch %t %s -emit-llvm -o - -DNO_ERRORS | FileCheck %s
> +// RUN: %clang_cc1 -std=c++11 -triple %itanium_abi_triple -fcxx-exceptions -fdelayed-template-parsing -fexceptions -x c++-header -emit-pch -o %t %S/cxx-templates.h
> +// RUN: %clang_cc1 -std=c++11 -triple %itanium_abi_triple -fcxx-exceptions -fdelayed-template-parsing -fexceptions -include-pch %t -verify %s -ast-dump -o -
> +// RUN: %clang_cc1 -std=c++11 -triple %itanium_abi_triple -fcxx-exceptions -fdelayed-template-parsing -fexceptions -include-pch %t %s -emit-llvm -o - -DNO_ERRORS | FileCheck %s
>
> // CHECK: define weak_odr {{.*}}void @_ZN2S4IiE1mEv
> // CHECK: define linkonce_odr {{.*}}void @_ZN2S3IiE1mEv
>
> Modified: cfe/trunk/test/PCH/irgen-rdar13114142.mm
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/irgen-rdar13114142.mm?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/PCH/irgen-rdar13114142.mm (original)
> +++ cfe/trunk/test/PCH/irgen-rdar13114142.mm Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,5 @@
> -// RUN: %clang_cc1 %s -cxx-abi itanium -emit-pch -o %t.pch
> -// RUN: %clang_cc1 %s -cxx-abi itanium -emit-llvm -include-pch %t.pch -o - | FileCheck %s
> +// RUN: %clang_cc1 %s -triple %itanium_abi_triple -emit-pch -o %t.pch
> +// RUN: %clang_cc1 %s -triple %itanium_abi_triple -emit-llvm -include-pch %t.pch -o - | FileCheck %s
>
> #ifndef HEADER
> #define HEADER
>
> Modified: cfe/trunk/test/PCH/objc_literals.mm
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/objc_literals.mm?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/PCH/objc_literals.mm (original)
> +++ cfe/trunk/test/PCH/objc_literals.mm Tue Jan 14 13:35:09 2014
> @@ -1,7 +1,7 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-pch -x objective-c++ -std=c++0x -o %t %s
> -// RUN: %clang_cc1 -cxx-abi itanium -include-pch %t -x objective-c++ -std=c++0x -verify %s
> -// RUN: %clang_cc1 -cxx-abi itanium -include-pch %t -x objective-c++ -std=c++0x -ast-print %s | FileCheck -check-prefix=CHECK-PRINT %s
> -// RUN: %clang_cc1 -cxx-abi itanium -include-pch %t -x objective-c++ -std=c++0x -emit-llvm -o - %s | FileCheck -check-prefix=CHECK-IR %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-pch -x objective-c++ -std=c++0x -o %t %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -include-pch %t -x objective-c++ -std=c++0x -verify %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -include-pch %t -x objective-c++ -std=c++0x -ast-print %s | FileCheck -check-prefix=CHECK-PRINT %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -include-pch %t -x objective-c++ -std=c++0x -emit-llvm -o - %s | FileCheck -check-prefix=CHECK-IR %s
>
> // expected-no-diagnostics
>
>
> Modified: cfe/trunk/test/PCH/objcxx-ivar-class.mm
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/objcxx-ivar-class.mm?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/PCH/objcxx-ivar-class.mm (original)
> +++ cfe/trunk/test/PCH/objcxx-ivar-class.mm Tue Jan 14 13:35:09 2014
> @@ -1,9 +1,9 @@
> // Test this without pch.
> -// RUN: %clang_cc1 -include %S/objcxx-ivar-class.h -cxx-abi itanium %s -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 -include %S/objcxx-ivar-class.h -triple %itanium_abi_triple %s -emit-llvm -o - | FileCheck %s
>
> // Test with pch.
> -// RUN: %clang_cc1 -x objective-c++-header -cxx-abi itanium -emit-pch -o %t %S/objcxx-ivar-class.h
> -// RUN: %clang_cc1 -include-pch %t -cxx-abi itanium %s -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 -x objective-c++-header -triple %itanium_abi_triple -emit-pch -o %t %S/objcxx-ivar-class.h
> +// RUN: %clang_cc1 -include-pch %t -triple %itanium_abi_triple %s -emit-llvm -o - | FileCheck %s
>
> // CHECK: [C position]
> // CHECK: call {{.*}} @_ZN1SC1ERKS_
>
> Modified: cfe/trunk/test/Sema/empty1.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/empty1.c?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/Sema/empty1.c (original)
> +++ cfe/trunk/test/Sema/empty1.c Tue Jan 14 13:35:09 2014
> @@ -1,7 +1,6 @@
> -// RUN: %clang_cc1 %s -cxx-abi itanium -fsyntax-only -verify -Wc++-compat
> +// RUN: %clang_cc1 %s -triple %itanium_abi_triple -fsyntax-only -verify -Wc++-compat
>
> -// FIXME: Empty C structs are 4 bytes in MSVC, but the -cxx-abi flag probably
> -// shouldn't affect this since it's not C++. PR18263.
> +// Note: Empty C structs are 4 bytes in the Microsoft ABI.
>
> struct emp_1 { // expected-warning {{empty struct has size 0 in C, size 1 in C++}}
> };
>
> Modified: cfe/trunk/test/Sema/ms_bitfield_layout.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/ms_bitfield_layout.c?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/Sema/ms_bitfield_layout.c (original)
> +++ cfe/trunk/test/Sema/ms_bitfield_layout.c Tue Jan 14 13:35:09 2014
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -cxx-abi microsoft -fdump-record-layouts %s 2>/dev/null \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts %s 2>/dev/null \
> // RUN: | FileCheck %s
> -// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -cxx-abi microsoft -fdump-record-layouts %s 2>/dev/null \
> +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts %s 2>/dev/null \
> // RUN: | FileCheck %s
>
> typedef struct A {
>
> Modified: cfe/trunk/test/Sema/ms_class_layout.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/ms_class_layout.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/Sema/ms_class_layout.cpp (original)
> +++ cfe/trunk/test/Sema/ms_class_layout.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -cxx-abi microsoft %s 2>&1 \
> +// RUN: %clang_cc1 -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts %s 2>&1 \
> // RUN: | FileCheck %s
>
> #pragma pack(push, 8)
>
> Modified: cfe/trunk/test/SemaCXX/calling-conv-compat.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/calling-conv-compat.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaCXX/calling-conv-compat.cpp (original)
> +++ cfe/trunk/test/SemaCXX/calling-conv-compat.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -fsyntax-only -std=c++11 -fms-extensions -cxx-abi microsoft -verify -triple i686-pc-win32 %s
> +// RUN: %clang_cc1 -fsyntax-only -std=c++11 -fms-extensions -verify -triple i686-pc-win32 %s
>
> // Pointers to free functions
> void free_func_default();
>
> Modified: cfe/trunk/test/SemaCXX/decl-microsoft-call-conv.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/decl-microsoft-call-conv.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaCXX/decl-microsoft-call-conv.cpp (original)
> +++ cfe/trunk/test/SemaCXX/decl-microsoft-call-conv.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -triple i686-pc-win32 -cxx-abi microsoft -fms-extensions -verify %s
> +// RUN: %clang_cc1 -triple i686-pc-win32 -fms-extensions -verify %s
>
> typedef void void_fun_t();
> typedef void __cdecl cdecl_fun_t();
>
> Modified: cfe/trunk/test/SemaCXX/destructor.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/destructor.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaCXX/destructor.cpp (original)
> +++ cfe/trunk/test/SemaCXX/destructor.cpp Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,5 @@
> -// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -fsyntax-only -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -verify %s
> -// RUN: %clang_cc1 -std=c++11 -cxx-abi microsoft -DMSABI -fsyntax-only -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -verify %s
> +// RUN: %clang_cc1 -std=c++11 -triple %itanium_abi_triple -fsyntax-only -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -verify %s
> +// RUN: %clang_cc1 -std=c++11 -triple %ms_abi_triple -DMSABI -fsyntax-only -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -verify %s
> class A {
> public:
> ~A();
>
> Modified: cfe/trunk/test/SemaCXX/implicit-virtual-member-functions.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/implicit-virtual-member-functions.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaCXX/implicit-virtual-member-functions.cpp (original)
> +++ cfe/trunk/test/SemaCXX/implicit-virtual-member-functions.cpp Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,5 @@
> -// RUN: %clang_cc1 -fsyntax-only -cxx-abi itanium -verify %s
> -// RUN: %clang_cc1 -fsyntax-only -cxx-abi microsoft -DMSABI -verify %s
> +// RUN: %clang_cc1 -fsyntax-only -triple %itanium_abi_triple -verify %s
> +// RUN: %clang_cc1 -fsyntax-only -triple %ms_abi_triple -DMSABI -verify %s
> struct A {
> virtual ~A();
> };
>
> Modified: cfe/trunk/test/SemaCXX/member-pointer-ms.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/member-pointer-ms.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaCXX/member-pointer-ms.cpp (original)
> +++ cfe/trunk/test/SemaCXX/member-pointer-ms.cpp Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,5 @@
> -// RUN: %clang_cc1 -std=c++11 -cxx-abi microsoft -fms-compatibility -fsyntax-only -triple=i386-pc-win32 -verify %s
> -// RUN: %clang_cc1 -std=c++11 -cxx-abi microsoft -fms-compatibility -fsyntax-only -triple=x86_64-pc-win32 -verify %s
> +// RUN: %clang_cc1 -std=c++11 -fms-compatibility -fsyntax-only -triple=i386-pc-win32 -verify %s
> +// RUN: %clang_cc1 -std=c++11 -fms-compatibility -fsyntax-only -triple=x86_64-pc-win32 -verify %s
> //
> // This file should also give no diagnostics when run through cl.exe from MSVS
> // 2012, which supports C++11 and static_assert. It should pass for both 64-bit
>
> Modified: cfe/trunk/test/SemaCXX/microsoft-dtor-lookup-cxx11.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/microsoft-dtor-lookup-cxx11.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaCXX/microsoft-dtor-lookup-cxx11.cpp (original)
> +++ cfe/trunk/test/SemaCXX/microsoft-dtor-lookup-cxx11.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -triple i686-pc-win32 -cxx-abi microsoft -std=c++11 -verify %s
> +// RUN: %clang_cc1 -triple i686-pc-win32 -std=c++11 -verify %s
>
> struct S {
> virtual ~S() = delete; // expected-note {{'~S' has been explicitly marked deleted here}}
>
> Modified: cfe/trunk/test/SemaCXX/microsoft-dtor-lookup.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/microsoft-dtor-lookup.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaCXX/microsoft-dtor-lookup.cpp (original)
> +++ cfe/trunk/test/SemaCXX/microsoft-dtor-lookup.cpp Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,5 @@
> -// RUN: %clang_cc1 -triple i686-pc-win32 -cxx-abi itanium -fsyntax-only %s
> -// RUN: %clang_cc1 -triple i686-pc-win32 -cxx-abi microsoft -verify -DMSVC_ABI %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -fsyntax-only %s
> +// RUN: %clang_cc1 -triple %ms_abi_triple -verify -DMSVC_ABI %s
>
> namespace Test1 {
>
>
> Modified: cfe/trunk/test/SemaCXX/primary-base.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/primary-base.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaCXX/primary-base.cpp (original)
> +++ cfe/trunk/test/SemaCXX/primary-base.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -fsyntax-only -verify %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -fsyntax-only -verify %s
> // expected-no-diagnostics
> class A { virtual void f(); };
> class B : virtual A { };
>
> Modified: cfe/trunk/test/SemaCXX/typeid-ref.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/typeid-ref.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaCXX/typeid-ref.cpp (original)
> +++ cfe/trunk/test/SemaCXX/typeid-ref.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm -o - %s | FileCheck %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm -o - %s | FileCheck %s
> namespace std {
> class type_info;
> }
>
> Modified: cfe/trunk/test/SemaCXX/undefined-internal.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/undefined-internal.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaCXX/undefined-internal.cpp (original)
> +++ cfe/trunk/test/SemaCXX/undefined-internal.cpp Tue Jan 14 13:35:09 2014
> @@ -1,9 +1,9 @@
> // RUN: %clang_cc1 -fsyntax-only -verify %s
>
> // Make sure we don't produce invalid IR.
> -// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm-only %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm-only %s
>
> -// FIXME: -cxx-abi itanium shouldn't be necessary; the test should pass
> +// FIXME: Itanium shouldn't be necessary; the test should pass
> // in MS mode too.
>
> namespace test1 {
>
> Modified: cfe/trunk/test/SemaCXX/virtual-base-used.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/virtual-base-used.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaCXX/virtual-base-used.cpp (original)
> +++ cfe/trunk/test/SemaCXX/virtual-base-used.cpp Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,5 @@
> -// RUN: %clang_cc1 -fsyntax-only -cxx-abi itanium -verify %s
> -// RUN: %clang_cc1 -fsyntax-only -cxx-abi microsoft -DMSABI -verify %s
> +// RUN: %clang_cc1 -fsyntax-only -triple %itanium_abi_triple -verify %s
> +// RUN: %clang_cc1 -fsyntax-only -triple %ms_abi_triple -DMSABI -verify %s
> // PR7800
>
> // The Microsoft ABI doesn't have the concept of key functions, so we have different
>
> Modified: cfe/trunk/test/SemaCXX/virtual-override-x86.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/virtual-override-x86.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaCXX/virtual-override-x86.cpp (original)
> +++ cfe/trunk/test/SemaCXX/virtual-override-x86.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -triple=i686-pc-unknown -fsyntax-only -verify %s -std=c++11 -cxx-abi microsoft
> +// RUN: %clang_cc1 -triple=i686-pc-win32 -fsyntax-only -verify %s -std=c++11
>
> namespace PR14339 {
> class A {
>
> Modified: cfe/trunk/test/SemaCXX/virtual-override.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/virtual-override.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaCXX/virtual-override.cpp (original)
> +++ cfe/trunk/test/SemaCXX/virtual-override.cpp Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,5 @@
> -// RUN: %clang_cc1 -fsyntax-only -cxx-abi itanium -verify %s -std=c++11
> -// RUN: %clang_cc1 -fsyntax-only -cxx-abi microsoft -verify %s -std=c++11
> +// RUN: %clang_cc1 -fsyntax-only -triple %itanium_abi_triple -verify %s -std=c++11
> +// RUN: %clang_cc1 -fsyntax-only -triple %ms_abi_triple -verify %s -std=c++11
> namespace T1 {
>
> class A {
>
> Modified: cfe/trunk/test/SemaCXX/warn-reinterpret-base-class.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/warn-reinterpret-base-class.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaCXX/warn-reinterpret-base-class.cpp (original)
> +++ cfe/trunk/test/SemaCXX/warn-reinterpret-base-class.cpp Tue Jan 14 13:35:09 2014
> @@ -1,8 +1,8 @@
> -// RUN: %clang_cc1 -std=c++11 -fsyntax-only -cxx-abi itanium -verify -Wreinterpret-base-class -Wno-unused-volatile-lvalue %s
> -// RUN: %clang_cc1 -std=c++11 -fsyntax-only -cxx-abi microsoft -DMSABI -verify -Wreinterpret-base-class -Wno-unused-volatile-lvalue %s
> +// RUN: %clang_cc1 -std=c++11 -fsyntax-only -triple %itanium_abi_triple -verify -Wreinterpret-base-class -Wno-unused-volatile-lvalue %s
> +// RUN: %clang_cc1 -std=c++11 -fsyntax-only -triple %ms_abi_triple -DMSABI -verify -Wreinterpret-base-class -Wno-unused-volatile-lvalue %s
>
> -// RUN: not %clang_cc1 -std=c++11 -fsyntax-only -cxx-abi itanium -fdiagnostics-parseable-fixits -Wreinterpret-base-class -Wno-unused-volatile-lvalue %s 2>&1 | FileCheck %s
> -// RUN: not %clang_cc1 -std=c++11 -fsyntax-only -cxx-abi microsoft -fdiagnostics-parseable-fixits -Wreinterpret-base-class -Wno-unused-volatile-lvalue %s 2>&1 | FileCheck %s
> +// RUN: not %clang_cc1 -std=c++11 -fsyntax-only -triple %itanium_abi_triple -fdiagnostics-parseable-fixits -Wreinterpret-base-class -Wno-unused-volatile-lvalue %s 2>&1 | FileCheck %s
> +// RUN: not %clang_cc1 -std=c++11 -fsyntax-only -triple %ms_abi_triple -fdiagnostics-parseable-fixits -Wreinterpret-base-class -Wno-unused-volatile-lvalue %s 2>&1 | FileCheck %s
>
> // PR 13824
> class A {
>
> Modified: cfe/trunk/test/SemaCXX/warn-weak-vtables.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/warn-weak-vtables.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaCXX/warn-weak-vtables.cpp (original)
> +++ cfe/trunk/test/SemaCXX/warn-weak-vtables.cpp Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,5 @@
> -// RUN: %clang_cc1 %s -fsyntax-only -verify -cxx-abi itanium -Wweak-vtables -Wweak-template-vtables
> -// RUN: %clang_cc1 %s -fsyntax-only -cxx-abi microsoft -Werror -Wno-weak-vtables -Wno-weak-template-vtables
> +// RUN: %clang_cc1 %s -fsyntax-only -verify -triple %itanium_abi_triple -Wweak-vtables -Wweak-template-vtables
> +// RUN: %clang_cc1 %s -fsyntax-only -triple %ms_abi_triple -Werror -Wno-weak-vtables -Wno-weak-template-vtables
>
> struct A { // expected-warning {{'A' has no out-of-line virtual method definitions; its vtable will be emitted in every translation unit}}
> virtual void f() { }
>
> Modified: cfe/trunk/test/SemaObjCXX/microsoft-abi-byval.mm
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjCXX/microsoft-abi-byval.mm?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaObjCXX/microsoft-abi-byval.mm (original)
> +++ cfe/trunk/test/SemaObjCXX/microsoft-abi-byval.mm Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -fsyntax-only -verify -cxx-abi microsoft -Wno-objc-root-class %s
> +// RUN: %clang_cc1 -fsyntax-only -verify -triple %ms_abi_triple -Wno-objc-root-class %s
> // expected-no-diagnostics
>
> class Foo {
>
> Modified: cfe/trunk/test/SemaTemplate/inject-templated-friend-post.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/inject-templated-friend-post.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaTemplate/inject-templated-friend-post.cpp (original)
> +++ cfe/trunk/test/SemaTemplate/inject-templated-friend-post.cpp Tue Jan 14 13:35:09 2014
> @@ -1,7 +1,7 @@
> -// RUN: %clang_cc1 %s -std=c++98 -cxx-abi itanium -emit-llvm -o - | FileCheck %s
> -// RUN: %clang_cc1 %s -std=c++98 -cxx-abi itanium -emit-llvm -o - -DPROTOTYPE | FileCheck --check-prefix=CHECK-PROTOTYPE %s
> -// RUN: %clang_cc1 %s -std=c++98 -cxx-abi itanium -emit-llvm -o - -DINSTANTIATE | FileCheck --check-prefix=CHECK-INSTANTIATE %s
> -// RUN: %clang_cc1 %s -std=c++98 -cxx-abi itanium -emit-llvm -o - -DPROTOTYPE -DINSTANTIATE | FileCheck --check-prefix=CHECK-PROTOTYPE-INSTANTIATE %s
> +// RUN: %clang_cc1 %s -std=c++98 -triple %itanium_abi_triple -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 %s -std=c++98 -triple %itanium_abi_triple -emit-llvm -o - -DPROTOTYPE | FileCheck --check-prefix=CHECK-PROTOTYPE %s
> +// RUN: %clang_cc1 %s -std=c++98 -triple %itanium_abi_triple -emit-llvm -o - -DINSTANTIATE | FileCheck --check-prefix=CHECK-INSTANTIATE %s
> +// RUN: %clang_cc1 %s -std=c++98 -triple %itanium_abi_triple -emit-llvm -o - -DPROTOTYPE -DINSTANTIATE | FileCheck --check-prefix=CHECK-PROTOTYPE-INSTANTIATE %s
> // RUN: %clang_cc1 %s -DREDEFINE -verify
> // RUN: %clang_cc1 %s -DPROTOTYPE -DREDEFINE -verify
> // PR8007: friend function not instantiated, reordered version.
>
> Modified: cfe/trunk/test/SemaTemplate/inject-templated-friend.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/inject-templated-friend.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaTemplate/inject-templated-friend.cpp (original)
> +++ cfe/trunk/test/SemaTemplate/inject-templated-friend.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 %s -emit-llvm -cxx-abi itanium -o - | FileCheck %s
> +// RUN: %clang_cc1 %s -emit-llvm -triple %itanium_abi_triple -o - | FileCheck %s
> // RUN: %clang_cc1 %s -DREDEFINE -verify
> // PR8007: friend function not instantiated.
>
>
> Modified: cfe/trunk/test/SemaTemplate/instantiate-complete.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/instantiate-complete.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaTemplate/instantiate-complete.cpp (original)
> +++ cfe/trunk/test/SemaTemplate/instantiate-complete.cpp Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,5 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -fsyntax-only -verify %s
> -// RUN: %clang_cc1 -cxx-abi microsoft -DMSABI -fsyntax-only -verify %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -fsyntax-only -verify %s
> +// RUN: %clang_cc1 -triple %ms_abi_triple -DMSABI -fsyntax-only -verify %s
>
> // Tests various places where requiring a complete type involves
> // instantiation of that type.
>
> Modified: cfe/trunk/test/SemaTemplate/instantiate-exception-spec-cxx11.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/instantiate-exception-spec-cxx11.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaTemplate/instantiate-exception-spec-cxx11.cpp (original)
> +++ cfe/trunk/test/SemaTemplate/instantiate-exception-spec-cxx11.cpp Tue Jan 14 13:35:09 2014
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -fsyntax-only -verify -cxx-abi itanium -std=c++11 -ftemplate-depth 16 -fcxx-exceptions -fexceptions %s
> +// RUN: %clang_cc1 -fsyntax-only -verify -triple %itanium_abi_triple -std=c++11 -ftemplate-depth 16 -fcxx-exceptions -fexceptions %s
>
> // DR1330: an exception specification for a function template is only
> // instantiated when it is needed.
>
> Modified: cfe/trunk/test/SemaTemplate/virtual-member-functions.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/virtual-member-functions.cpp?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaTemplate/virtual-member-functions.cpp (original)
> +++ cfe/trunk/test/SemaTemplate/virtual-member-functions.cpp Tue Jan 14 13:35:09 2014
> @@ -1,5 +1,5 @@
> -// RUN: %clang_cc1 -cxx-abi itanium -fsyntax-only -verify %s
> -// RUN: %clang_cc1 -cxx-abi microsoft -DMSABI -fsyntax-only -verify %s
> +// RUN: %clang_cc1 -triple %itanium_abi_triple -fsyntax-only -verify %s
> +// RUN: %clang_cc1 -triple %ms_abi_triple -DMSABI -fsyntax-only -verify %s
>
> namespace PR5557 {
> template <class T> struct A {
>
> Modified: cfe/trunk/test/lit.cfg
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/lit.cfg?rev=199250&r1=199249&r2=199250&view=diff
> ==============================================================================
> --- cfe/trunk/test/lit.cfg (original)
> +++ cfe/trunk/test/lit.cfg Tue Jan 14 13:35:09 2014
> @@ -228,6 +228,25 @@ def getClangBuiltinIncludeDir(clang):
> # Ensure the result is an ascii string, across Python2.5+ - Python3.
> return str(dir.decode('ascii'))
>
> +def makeItaniumABITriple(triple):
> + m = re.match(r'(\w+)-(\w+)-(\w+)', triple)
> + if not m:
> + lit_config.fatal("Could not turn '%s' into Itanium ABI triple" % triple)
> + if m.group(3).lower() != 'win32':
> + # All non-win32 triples use the Itanium ABI.
> + return triple
> + return m.group(1) + '-' + m.group(2) + '-mingw32'
> +
> +def makeMSABITriple(triple):
> + m = re.match(r'(\w+)-(\w+)-(\w+)', triple)
> + if not m:
> + lit_config.fatal("Could not turn '%s' into MS ABI triple" % triple)
> + if m.group(3).lower() == 'win32':
> + # If the OS is win32, we're done.
> + return triple
> + # Otherwise, replace the OS part with Win32.
> + return m.group(1) + '-' + m.group(2) + '-win32'
> +
> config.substitutions.append( ('%clang_cc1', '%s -cc1 -internal-isystem %s'
> % (config.clang,
> getClangBuiltinIncludeDir(config.clang))) )
> @@ -239,6 +258,8 @@ config.substitutions.append( ('%clangxx'
> ' --driver-mode=g++ '))
> config.substitutions.append( ('%clang', ' ' + config.clang + ' ') )
> config.substitutions.append( ('%test_debuginfo', ' ' + config.llvm_src_root + '/utils/test_debuginfo.pl ') )
> +config.substitutions.append( ('%itanium_abi_triple', makeItaniumABITriple(config.target_triple)) )
> +config.substitutions.append( ('%ms_abi_triple', makeMSABITriple(config.target_triple)) )
>
> # FIXME: Find nicer way to prohibit this.
> config.substitutions.append(
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
More information about the cfe-commits
mailing list