diff options
| author | Reid Kleckner <rnk@google.com> | 2017-05-31 15:50:35 +0000 |
|---|---|---|
| committer | Reid Kleckner <rnk@google.com> | 2017-05-31 15:50:35 +0000 |
| commit | 6344f10fa9d88b30e936a8839553d0d6286b676c (patch) | |
| tree | 30a9157ee3d367abf541d1de7868e6cbe8feb7d3 | |
| parent | ff25b6d8f602ae01d9c0c2fd5c76b9b6ad4d97ba (diff) | |
| download | bcm5719-llvm-6344f10fa9d88b30e936a8839553d0d6286b676c.tar.gz bcm5719-llvm-6344f10fa9d88b30e936a8839553d0d6286b676c.zip | |
Fix incorrect spelling of calling conv flag and add -Wno-msvc-not-found to test
llvm-svn: 304308
| -rw-r--r-- | clang/lib/Driver/ToolChains/Clang.cpp | 8 | ||||
| -rw-r--r-- | clang/test/Driver/cl-cc-flags.c | 20 |
2 files changed, 14 insertions, 14 deletions
diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index ce6d26131cb..719355eaeca 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -4791,19 +4791,19 @@ void Clang::AddClangCLArgs(const ArgList &Args, types::ID InputType, llvm::Triple::ArchType Arch = getToolChain().getArch(); switch (DCCOptId) { case options::OPT__SLASH_Gd: - DCCFlag = "-fdefault-calling-convention=cdecl"; + DCCFlag = "-fdefault-calling-conv=cdecl"; break; case options::OPT__SLASH_Gr: ArchSupported = Arch == llvm::Triple::x86; - DCCFlag = "-fdefault-calling-convention=fastcall"; + DCCFlag = "-fdefault-calling-conv=fastcall"; break; case options::OPT__SLASH_Gz: ArchSupported = Arch == llvm::Triple::x86; - DCCFlag = "-fdefault-calling-convention=stdcall"; + DCCFlag = "-fdefault-calling-conv=stdcall"; break; case options::OPT__SLASH_Gv: ArchSupported = Arch == llvm::Triple::x86 || Arch == llvm::Triple::x86_64; - DCCFlag = "-fdefault-calling-convention=vectorcall"; + DCCFlag = "-fdefault-calling-conv=vectorcall"; break; } diff --git a/clang/test/Driver/cl-cc-flags.c b/clang/test/Driver/cl-cc-flags.c index 64ff1cb5e8c..76f116e199e 100644 --- a/clang/test/Driver/cl-cc-flags.c +++ b/clang/test/Driver/cl-cc-flags.c @@ -2,32 +2,32 @@ // command-line option, e.g. on Mac where %s is commonly under /Users. // RUN: %clang_cl --target=i686-windows-msvc /Gd -### -- %s 2>&1 | FileCheck --check-prefix=CDECL %s -// CDECL: -fdefault-calling-convention=cdecl +// CDECL: -fdefault-calling-conv=cdecl // RUN: %clang_cl --target=i686-windows-msvc /Gr -### -- %s 2>&1 | FileCheck --check-prefix=FASTCALL %s -// FASTCALL: -fdefault-calling-convention=fastcall +// FASTCALL: -fdefault-calling-conv=fastcall // RUN: %clang_cl --target=i686-windows-msvc /Gz -### -- %s 2>&1 | FileCheck --check-prefix=STDCALL %s -// STDCALL: -fdefault-calling-convention=stdcall +// STDCALL: -fdefault-calling-conv=stdcall // RUN: %clang_cl --target=i686-windows-msvc /Gv -### -- %s 2>&1 | FileCheck --check-prefix=VECTORCALL %s -// VECTORCALL: -fdefault-calling-convention=vectorcall +// VECTORCALL: -fdefault-calling-conv=vectorcall // Last one should win: // RUN: %clang_cl --target=i686-windows-msvc /Gd /Gv -### -- %s 2>&1 | FileCheck --check-prefix=LASTWINS_VECTOR %s -// LASTWINS_VECTOR: -fdefault-calling-convention=vectorcall +// LASTWINS_VECTOR: -fdefault-calling-conv=vectorcall // RUN: %clang_cl --target=i686-windows-msvc /Gv /Gd -### -- %s 2>&1 | FileCheck --check-prefix=LASTWINS_CDECL %s -// LASTWINS_CDECL: -fdefault-calling-convention=cdecl +// LASTWINS_CDECL: -fdefault-calling-conv=cdecl // No fastcall or stdcall on x86_64: -// RUN: %clang_cl --target=x86_64-windows-msvc /Gr -### -- %s 2>&1 | FileCheck --check-prefix=UNSUPPORTED %s -// RUN: %clang_cl --target=x86_64-windows-msvc /Gz -### -- %s 2>&1 | FileCheck --check-prefix=UNSUPPORTED %s -// RUN: %clang_cl --target=thumbv7-windows-msvc /Gv -### -- %s 2>&1 | FileCheck --check-prefix=UNSUPPORTED %s +// RUN: %clang_cl -Wno-msvc-not-found --target=x86_64-windows-msvc /Gr -### -- %s 2>&1 | FileCheck --check-prefix=UNSUPPORTED %s +// RUN: %clang_cl -Wno-msvc-not-found --target=x86_64-windows-msvc /Gz -### -- %s 2>&1 | FileCheck --check-prefix=UNSUPPORTED %s +// RUN: %clang_cl -Wno-msvc-not-found --target=thumbv7-windows-msvc /Gv -### -- %s 2>&1 | FileCheck --check-prefix=UNSUPPORTED %s // UNSUPPORTED-NOT: error: // UNSUPPORTED-NOT: warning: -// UNSUPPORTED-NOT: -fdefault-calling-convention= +// UNSUPPORTED-NOT: -fdefault-calling-conv= |
