[cfe-commits] r172052 - in /cfe/trunk: include/clang/Basic/TargetInfo.h lib/Basic/Targets.cpp test/CodeGen/intel_ocl_bicc.c

[Guy Benyei]

Author: gbenyei
Date: Thu Jan 10 04:41:05 2013
New Revision: 172052

URL: http://llvm.org/viewvc/llvm-project?rev=172052&view=rev
Log:
Enable intel_ocl_bicc for x86_64 target only. Remove fix from 171969 that enabled this extension for multiple targets.

Modified:
    cfe/trunk/include/clang/Basic/TargetInfo.h
    cfe/trunk/lib/Basic/Targets.cpp
    cfe/trunk/test/CodeGen/intel_ocl_bicc.c

Modified: cfe/trunk/include/clang/Basic/TargetInfo.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/TargetInfo.h?rev=172052&r1=172051&r2=172052&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/TargetInfo.h (original)
+++ cfe/trunk/include/clang/Basic/TargetInfo.h Thu Jan 10 04:41:05 2013
@@ -775,7 +775,6 @@
         return CCCR_Warning;
       case CC_C:
       case CC_Default:
-      case CC_IntelOclBicc:
         return CCCR_OK;
     }
   }

Modified: cfe/trunk/lib/Basic/Targets.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets.cpp?rev=172052&r1=172051&r2=172052&view=diff
==============================================================================
--- cfe/trunk/lib/Basic/Targets.cpp (original)
+++ cfe/trunk/lib/Basic/Targets.cpp Thu Jan 10 04:41:05 2013
@@ -2895,7 +2895,9 @@
   }
 
   virtual CallingConvCheckResult checkCallingConvention(CallingConv CC) const {
-    return TargetInfo::checkCallingConvention(CC);
+    return (CC == CC_Default ||
+            CC == CC_C || 
+            CC == CC_IntelOclBicc) ? CCCR_OK : CCCR_Warning;
   }
 
   virtual CallingConv getDefaultCallingConv(CallingConvMethodType MT) const {

Modified: cfe/trunk/test/CodeGen/intel_ocl_bicc.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/intel_ocl_bicc.c?rev=172052&r1=172051&r2=172052&view=diff
==============================================================================
--- cfe/trunk/test/CodeGen/intel_ocl_bicc.c (original)
+++ cfe/trunk/test/CodeGen/intel_ocl_bicc.c Thu Jan 10 04:41:05 2013
@@ -1,4 +1,5 @@
 // RUN: %clang_cc1 -triple i386-unknown-unknown -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64-unknown-unknown -emit-llvm -o - %s | FileCheck %s
 
 void __attribute__((intel_ocl_bicc)) f1(void);