commit da3e2223091b6015749983fd01dc285e9c051371
author Chih-Hung Hsieh <chh@google.com> Thu Dec 18 17:49:46 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Dec 18 17:49:46 2014 +0000
tree 176e0a3fa284a1e043c12f4e9d15e62db730945f
parent 13ed4615caf78951535ebf8b7f4b633ba1c41b85
parent 443a75e4d97e02e2d29a86a391bd844c93e627fd

am 443a75e4: Merge "Disable clang assembler, to fix asm code later."

* commit '443a75e4d97e02e2d29a86a391bd844c93e627fd':
  Disable clang assembler, to fix asm code later.

Android.libv8.mk

diff --git a/Android.libv8.mk b/Android.libv8.mk
index d237f64..13bb088 100644
--- a/Android.libv8.mk
+++ b/Android.libv8.mk
@@ -103,6 +103,10 @@
 LOCAL_CFLAGS_arm += -DV8_TARGET_ARCH_ARM
 LOCAL_CFLAGS_arm64 += -DV8_TARGET_ARCH_ARM64
 
+# atomicops_internals_arm64_gcc.h:77:49: error:
+# expected compatible register, symbol or integer in range [0, 4095]
+LOCAL_CLANG_CFLAGS_arm64 += -no-integrated-as
+
 LOCAL_CFLAGS_mips += -DV8_TARGET_ARCH_MIPS \
 	-Umips \
 	-finline-limit=64 \