commit 7728cddd7866fadd07f1191eee40985e3cdbc6bf
author Peter Collingbourne <peter@pcc.me.uk> Sat Feb 23 00:06:18 2013 +0000
committer Peter Collingbourne <peter@pcc.me.uk> Sat Feb 23 00:06:18 2013 +0000
tree f2172ec2dc07d771505b6693c88dc6f0b0cd67fd
parent ff971d7973aaa00c286b788d30f6919c7b1f4de2

Revert r175912, "Add support for coldcc to clang" at John's request.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@175936 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Basic/Targets.cpp

diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index bd80409..eaf2e7d 100644
--- a/lib/Basic/Targets.cpp
+++ b/lib/Basic/Targets.cpp
@@ -1933,7 +1933,8 @@
     // We accept all non-ARM calling conventions
     return (CC == CC_X86ThisCall ||
             CC == CC_X86FastCall ||
-            CC == CC_X86StdCall ||
+            CC == CC_X86StdCall || 
+            CC == CC_C || 
             CC == CC_X86Pascal ||
             CC == CC_IntelOclBicc) ? CCCR_OK : CCCR_Warning;
   }
@@ -3026,7 +3027,9 @@
   }
 
   virtual CallingConvCheckResult checkCallingConvention(CallingConv CC) const {
-    return CC == CC_IntelOclBicc ? CCCR_OK : CCCR_Warning;
+    return (CC == CC_Default ||
+            CC == CC_C || 
+            CC == CC_IntelOclBicc) ? CCCR_OK : CCCR_Warning;
   }
 
   virtual CallingConv getDefaultCallingConv(CallingConvMethodType MT) const {