5 files changed, 7 insertions, 12 deletions
diff --git a/include/clang-c/Index.h b/include/clang-c/Index.h
index 12a8381ce1..c382fb17c1 100644
--- a/include/clang-c/Index.h
+++ b/include/clang-c/Index.h
@@ -2674,7 +2674,6 @@ enum CXCallingConv {
   CXCallingConv_AAPCS_VFP = 7,
   CXCallingConv_PnaclCall = 8,
   CXCallingConv_IntelOclBicc = 9,
-  CXCallingConv_Cold = 10,
 
   CXCallingConv_Invalid = 100,
   CXCallingConv_Unexposed = 200
diff --git a/include/clang/AST/Type.h b/include/clang/AST/Type.h
index 2284300032..df285101e3 100644
--- a/include/clang/AST/Type.h
+++ b/include/clang/AST/Type.h
@@ -3323,7 +3323,6 @@ public:
     // No operand.
     attr_noreturn,
     attr_cdecl,
-    attr_coldcc,
     attr_fastcall,
     attr_stdcall,
     attr_thiscall,
diff --git a/include/clang/Basic/Attr.td b/include/clang/Basic/Attr.td
index c3a44948b7..70217d2beb 100644
--- a/include/clang/Basic/Attr.td
+++ b/include/clang/Basic/Attr.td
@@ -277,10 +277,6 @@ def Cold : InheritableAttr {
   let Spellings = [GNU<"cold">, CXX11<"gnu", "cold">];
 }
 
-def ColdCC : InheritableAttr {
-  let Spellings = [GNU<"coldcc">, CXX11<"clang", "coldcc">];
-}
-
 def Common : InheritableAttr {
   let Spellings = [GNU<"common">, CXX11<"gnu", "common">];
 }
diff --git a/include/clang/Basic/Specifiers.h b/include/clang/Basic/Specifiers.h
index 3f640b5261..8706179a17 100644
--- a/include/clang/Basic/Specifiers.h
+++ b/include/clang/Basic/Specifiers.h
@@ -188,7 +188,6 @@ namespace clang {
   enum CallingConv {
     CC_Default,
     CC_C,           // __attribute__((cdecl))
-    CC_Cold,        // __attribute__((coldcc))
     CC_X86StdCall,  // __attribute__((stdcall))
     CC_X86FastCall, // __attribute__((fastcall))
     CC_X86ThisCall, // __attribute__((thiscall))
@@ -199,10 +198,6 @@ namespace clang {
     CC_IntelOclBicc // __attribute__((intel_ocl_bicc))
   };
 
-  inline bool isTargetSpecific(CallingConv CC) {
-    return CC >= CC_X86StdCall;
-  }
-
 } // end namespace clang
 
 #endif // LLVM_CLANG_BASIC_SPECIFIERS_H
diff --git a/include/clang/Basic/TargetInfo.h b/include/clang/Basic/TargetInfo.h
index 9a8689af85..deaa3eeb77 100644
--- a/include/clang/Basic/TargetInfo.h
+++ b/include/clang/Basic/TargetInfo.h
@@ -754,7 +754,13 @@ public:
   /// and be substituted with the default calling convention, or (someday)
   /// produce an error (such as using thiscall on a non-instance function).
   virtual CallingConvCheckResult checkCallingConvention(CallingConv CC) const {
-    return CCCR_Warning;
+    switch (CC) {
+      default:
+        return CCCR_Warning;
+      case CC_C:
+      case CC_Default:
+        return CCCR_OK;
+    }
   }
 
 protected: