Index: clang/lib/Basic/Targets/ARM.cpp
===================================================================
--- clang/lib/Basic/Targets/ARM.cpp
+++ clang/lib/Basic/Targets/ARM.cpp
@@ -1194,6 +1194,8 @@
   case CC_X86FastCall:
   case CC_X86VectorCall:
     return CCCR_Ignore;
+  case CC_AAPCS:
+  case CC_AAPCS_VFP:
   case CC_C:
   case CC_OpenCLKernel:
   case CC_PreserveMost:
Index: clang/test/Sema/callingconv-win-arm.c
===================================================================
--- /dev/null
+++ clang/test/Sema/callingconv-win-arm.c
@@ -0,0 +1,12 @@
+// RUN: %clang_cc1 %s -fsyntax-only -triple armv7-windows -verify
+
+// expected-no-diagnostics
+
+void __attribute__((fastcall)) foo(float *a);
+
+void __attribute__((stdcall)) bar(float *a);
+
+void __attribute__((cdecl)) ctest0();
+
+int __attribute__((pcs("aapcs"))) pcs5(void);
+int __attribute__((pcs("aapcs-vfp"))) pcs6(void);