[llvm-branch-commits] [llvm-gcc-branch] r93367 - /llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/llvm-convert.cpp

[Jim Grosbach]

Author: grosbach
Date: Wed Jan 13 16:40:16 2010
New Revision: 93367

URL: http://llvm.org/viewvc/llvm-project?rev=93367&view=rev
Log:
merge 93366

Modified:
    llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/llvm-convert.cpp

Modified: llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/llvm-convert.cpp?rev=93367&r1=93366&r2=93367&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/llvm-convert.cpp Wed Jan 13 16:40:16 2010
@@ -5276,6 +5276,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;
   }