[llvm-commits] [llvm-gcc-4.2] r106363 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp

Jim Grosbach grosbach at apple.com
Fri Jun 18 17:13:44 PDT 2010


Author: grosbach
Date: Fri Jun 18 19:13:44 2010
New Revision: 106363

URL: http://llvm.org/viewvc/llvm-project?rev=106363&view=rev
Log:
Now that the ARM back end handles issuing libcalls for atomics when needed,
the ifdefs here are no longer necessary.

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=106363&r1=106362&r2=106363&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Fri Jun 18 19:13:44 2010
@@ -5593,10 +5593,6 @@
   }
 
   case BUILT_IN_SYNCHRONIZE: {
-#if defined(TARGET_ARM)
-    if (TARGET_THUMB1 || !arm_arch6)
-      return false;
-#endif
     // We assume like gcc appears to, that this only applies to cached memory.
     Value* C[5];
     C[0] = C[1] = C[2] = C[3] = ConstantInt::get(Type::getInt1Ty(Context), 1);
@@ -5619,33 +5615,18 @@
     // Note that Intrinsic::getDeclaration expects the type list in reversed
     // order, while CreateCall expects the parameter list in normal order.
   case BUILT_IN_BOOL_COMPARE_AND_SWAP_1: {
-#if defined(TARGET_ARM)
-    if (TARGET_THUMB1 || !arm_arch6)
-      return false;
-#endif
     Result = BuildCmpAndSwapAtomicBuiltin(exp, unsigned_char_type_node, true);
     return true;
   }
   case BUILT_IN_BOOL_COMPARE_AND_SWAP_2: {
-#if defined(TARGET_ARM)
-    if (TARGET_THUMB1 || !arm_arch6)
-      return false;
-#endif
     Result = BuildCmpAndSwapAtomicBuiltin(exp, short_unsigned_type_node, true);
     return true;
   }
   case BUILT_IN_BOOL_COMPARE_AND_SWAP_4: {
-#if defined(TARGET_ARM)
-    if (TARGET_THUMB1 || !arm_arch6)
-      return false;
-#endif
     Result = BuildCmpAndSwapAtomicBuiltin(exp, unsigned_type_node, true);
     return true;
   }
   case BUILT_IN_BOOL_COMPARE_AND_SWAP_8: {
-#if defined(TARGET_ARM)
-    return false;
-#endif
 #if defined(TARGET_POWERPC)
     if (!TARGET_64BIT)
       return false;
@@ -5656,9 +5637,6 @@
   }
 
   case BUILT_IN_VAL_COMPARE_AND_SWAP_8:
-#if defined(TARGET_ARM)
-    return false;
-#endif
 #if defined(TARGET_POWERPC)
     if (!TARGET_64BIT)
       return false;
@@ -5666,18 +5644,11 @@
   case BUILT_IN_VAL_COMPARE_AND_SWAP_1:
   case BUILT_IN_VAL_COMPARE_AND_SWAP_2:
   case BUILT_IN_VAL_COMPARE_AND_SWAP_4: {
-#if defined(TARGET_ARM)
-    if (TARGET_THUMB1 || !arm_arch6)
-      return false;
-#endif
     tree type = TREE_TYPE(exp);
     Result = BuildCmpAndSwapAtomicBuiltin(exp, type, false);
     return true;
   }
   case BUILT_IN_FETCH_AND_ADD_8:
-#if defined(TARGET_ARM)
-    return false;
-#endif
 #if defined(TARGET_POWERPC)
     if (!TARGET_64BIT)
       return false;
@@ -5685,17 +5656,10 @@
   case BUILT_IN_FETCH_AND_ADD_1:
   case BUILT_IN_FETCH_AND_ADD_2:
   case BUILT_IN_FETCH_AND_ADD_4: {
-#if defined(TARGET_ARM)
-    if (TARGET_THUMB1 || !arm_arch6)
-      return false;
-#endif
     Result = BuildBinaryAtomicBuiltin(exp, Intrinsic::atomic_load_add);
     return true;
   }
   case BUILT_IN_FETCH_AND_SUB_8:
-#if defined(TARGET_ARM)
-    return false;
-#endif
 #if defined(TARGET_POWERPC)
     if (!TARGET_64BIT)
       return false;
@@ -5703,17 +5667,10 @@
   case BUILT_IN_FETCH_AND_SUB_1:
   case BUILT_IN_FETCH_AND_SUB_2:
   case BUILT_IN_FETCH_AND_SUB_4: {
-#if defined(TARGET_ARM)
-    if (TARGET_THUMB1 || !arm_arch6)
-      return false;
-#endif
     Result = BuildBinaryAtomicBuiltin(exp, Intrinsic::atomic_load_sub);
     return true;
   }
   case BUILT_IN_FETCH_AND_OR_8:
-#if defined(TARGET_ARM)
-    return false;
-#endif
 #if defined(TARGET_POWERPC)
     if (!TARGET_64BIT)
       return false;
@@ -5721,17 +5678,10 @@
   case BUILT_IN_FETCH_AND_OR_1:
   case BUILT_IN_FETCH_AND_OR_2:
   case BUILT_IN_FETCH_AND_OR_4: {
-#if defined(TARGET_ARM)
-    if (TARGET_THUMB1 || !arm_arch6)
-      return false;
-#endif
     Result = BuildBinaryAtomicBuiltin(exp, Intrinsic::atomic_load_or);
     return true;
   }
   case BUILT_IN_FETCH_AND_AND_8:
-#if defined(TARGET_ARM)
-    return false;
-#endif
 #if defined(TARGET_POWERPC)
     if (!TARGET_64BIT)
       return false;
@@ -5739,17 +5689,10 @@
   case BUILT_IN_FETCH_AND_AND_1:
   case BUILT_IN_FETCH_AND_AND_2:
   case BUILT_IN_FETCH_AND_AND_4: {
-#if defined(TARGET_ARM)
-    if (TARGET_THUMB1 || !arm_arch6)
-      return false;
-#endif
     Result = BuildBinaryAtomicBuiltin(exp, Intrinsic::atomic_load_and);
     return true;
   }
   case BUILT_IN_FETCH_AND_XOR_8:
-#if defined(TARGET_ARM)
-    return false;
-#endif
 #if defined(TARGET_POWERPC)
     if (!TARGET_64BIT)
       return false;
@@ -5757,17 +5700,10 @@
   case BUILT_IN_FETCH_AND_XOR_1:
   case BUILT_IN_FETCH_AND_XOR_2:
   case BUILT_IN_FETCH_AND_XOR_4: {
-#if defined(TARGET_ARM)
-    if (TARGET_THUMB1 || !arm_arch6)
-      return false;
-#endif
     Result = BuildBinaryAtomicBuiltin(exp, Intrinsic::atomic_load_xor);
     return true;
   }
   case BUILT_IN_FETCH_AND_NAND_8:
-#if defined(TARGET_ARM)
-    return false;
-#endif
 #if defined(TARGET_POWERPC)
     if (!TARGET_64BIT)
       return false;
@@ -5775,17 +5711,10 @@
   case BUILT_IN_FETCH_AND_NAND_1:
   case BUILT_IN_FETCH_AND_NAND_2:
   case BUILT_IN_FETCH_AND_NAND_4: {
-#if defined(TARGET_ARM)
-    if (TARGET_THUMB1 || !arm_arch6)
-      return false;
-#endif
     Result = BuildBinaryAtomicBuiltin(exp, Intrinsic::atomic_load_nand);
     return true;
   }
   case BUILT_IN_LOCK_TEST_AND_SET_8:
-#if defined(TARGET_ARM)
-    return false;
-#endif
 #if defined(TARGET_POWERPC)
     if (!TARGET_64BIT)
       return false;
@@ -5793,18 +5722,11 @@
   case BUILT_IN_LOCK_TEST_AND_SET_1:
   case BUILT_IN_LOCK_TEST_AND_SET_2:
   case BUILT_IN_LOCK_TEST_AND_SET_4: {
-#if defined(TARGET_ARM)
-    if (TARGET_THUMB1 || !arm_arch6)
-      return false;
-#endif
     Result = BuildBinaryAtomicBuiltin(exp, Intrinsic::atomic_swap);
     return true;
   }
 
   case BUILT_IN_ADD_AND_FETCH_8:
-#if defined(TARGET_ARM)
-    return false;
-#endif
 #if defined(TARGET_POWERPC)
     if (!TARGET_64BIT)
       return false;
@@ -5812,10 +5734,6 @@
   case BUILT_IN_ADD_AND_FETCH_1:
   case BUILT_IN_ADD_AND_FETCH_2:
   case BUILT_IN_ADD_AND_FETCH_4: {
-#if defined(TARGET_ARM)
-    if (TARGET_THUMB1 || !arm_arch6)
-      return false;
-#endif
     const Type *ResultTy = ConvertType(TREE_TYPE(exp));
     tree arglist = TREE_OPERAND(exp, 1);
     Value* C[2] = {
@@ -5856,9 +5774,6 @@
     return true;
   }
   case BUILT_IN_SUB_AND_FETCH_8:
-#if defined(TARGET_ARM)
-    return false;
-#endif
 #if defined(TARGET_POWERPC)
     if (!TARGET_64BIT)
       return false;
@@ -5866,10 +5781,6 @@
   case BUILT_IN_SUB_AND_FETCH_1:
   case BUILT_IN_SUB_AND_FETCH_2:
   case BUILT_IN_SUB_AND_FETCH_4: {
-#if defined(TARGET_ARM)
-    if (TARGET_THUMB1 || !arm_arch6)
-      return false;
-#endif
     const Type *ResultTy = ConvertType(TREE_TYPE(exp));
     tree arglist = TREE_OPERAND(exp, 1);
     Value* C[2] = {
@@ -5910,9 +5821,6 @@
     return true;
   }
   case BUILT_IN_OR_AND_FETCH_8:
-#if defined(TARGET_ARM)
-    return false;
-#endif
 #if defined(TARGET_POWERPC)
     if (!TARGET_64BIT)
       return false;
@@ -5920,10 +5828,6 @@
   case BUILT_IN_OR_AND_FETCH_1:
   case BUILT_IN_OR_AND_FETCH_2:
   case BUILT_IN_OR_AND_FETCH_4: {
-#if defined(TARGET_ARM)
-    if (TARGET_THUMB1 || !arm_arch6)
-      return false;
-#endif
     const Type *ResultTy = ConvertType(TREE_TYPE(exp));
     tree arglist = TREE_OPERAND(exp, 1);
     Value* C[2] = {
@@ -5964,9 +5868,6 @@
     return true;
   }
   case BUILT_IN_AND_AND_FETCH_8:
-#if defined(TARGET_ARM)
-    return false;
-#endif
 #if defined(TARGET_POWERPC)
     if (!TARGET_64BIT)
       return false;
@@ -5974,10 +5875,6 @@
   case BUILT_IN_AND_AND_FETCH_1:
   case BUILT_IN_AND_AND_FETCH_2:
   case BUILT_IN_AND_AND_FETCH_4: {
-#if defined(TARGET_ARM)
-    if (TARGET_THUMB1 || !arm_arch6)
-      return false;
-#endif
     const Type *ResultTy = ConvertType(TREE_TYPE(exp));
     tree arglist = TREE_OPERAND(exp, 1);
     Value* C[2] = {
@@ -6018,9 +5915,6 @@
     return true;
   }
   case BUILT_IN_XOR_AND_FETCH_8:
-#if defined(TARGET_ARM)
-    return false;
-#endif
 #if defined(TARGET_POWERPC)
     if (!TARGET_64BIT)
       return false;
@@ -6028,10 +5922,6 @@
   case BUILT_IN_XOR_AND_FETCH_1:
   case BUILT_IN_XOR_AND_FETCH_2:
   case BUILT_IN_XOR_AND_FETCH_4: {
-#if defined(TARGET_ARM)
-    if (TARGET_THUMB1 || !arm_arch6)
-      return false;
-#endif
     const Type *ResultTy = ConvertType(TREE_TYPE(exp));
     tree arglist = TREE_OPERAND(exp, 1);
     Value* C[2] = {
@@ -6072,9 +5962,6 @@
     return true;
   }
   case BUILT_IN_NAND_AND_FETCH_8:
-#if defined(TARGET_ARM)
-    return false;
-#endif
 #if defined(TARGET_POWERPC)
     if (!TARGET_64BIT)
       return false;
@@ -6082,10 +5969,6 @@
   case BUILT_IN_NAND_AND_FETCH_1:
   case BUILT_IN_NAND_AND_FETCH_2:
   case BUILT_IN_NAND_AND_FETCH_4: {
-#if defined(TARGET_ARM)
-    if (TARGET_THUMB1 || !arm_arch6)
-      return false;
-#endif
     const Type *ResultTy = ConvertType(TREE_TYPE(exp));
     tree arglist = TREE_OPERAND(exp, 1);
     Value* C[2] = {





More information about the llvm-commits mailing list