Author: rnk
Date: Wed May 31 10:50:35 2017
New Revision: 304308
URL: http://llvm.org/viewvc/llvm-project?rev=304308&view=rev
Log:
Fix incorrect spelling of calling conv flag and add -Wno-msvc-not-found to test
Modified:
cfe/trunk/lib/Driver/ToolChains/Clang.cpp
cfe/trunk/test/Driver/cl-cc-flags.c
Modified: cfe/trunk/lib/Driver/ToolChains/Clang.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Clang.cpp?rev=304308&r1=304307&r2=304308&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains/Clang.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains/Clang.cpp Wed May 31 10:50:35 2017
@@ -4791,19 +4791,19 @@ void Clang::AddClangCLArgs(const ArgList
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;
}
Modified: cfe/trunk/test/Driver/cl-cc-flags.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/cl-cc-flags.c?rev=304308&r1=304307&r2=304308&view=diff
==============================================================================
--- cfe/trunk/test/Driver/cl-cc-flags.c (original)
+++ cfe/trunk/test/Driver/cl-cc-flags.c Wed May 31 10:50:35 2017
@@ -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=
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
