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

[Jim Grosbach]

Author: grosbach
Date: Mon Dec 14 19:36:28 2009
New Revision: 91388

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

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=91388&r1=91387&r2=91388&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 Mon Dec 14 19:36:28 2009
@@ -5259,8 +5259,7 @@
   }
   case BUILT_IN_FETCH_AND_ADD_8:
 #if defined(TARGET_ARM)
-    if (TARGET_THUMB1 || !arm_arch6)
-      return false;
+    return false;
 #endif
 #if defined(TARGET_POWERPC)
     if (!TARGET_64BIT)
@@ -5544,6 +5543,9 @@
     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;