commit f38dd880c98464f33f214e3614fc5d4eb4fd6af8
author Tim Murray <timmurray@google.com> Fri May 02 18:30:12 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 02 18:30:12 2014 +0000
tree 584e5d330eefcedacdd59210a2e28c18be7ea763
parent 4056798282fad8cef53c158104e8c12ded06f1ca
parent 09e044ea813cc23b1d3b5ed99b20dea9ec7c5328

am 09e044ea: am 6ac74e6d: am d720c5a2: Merge "Add -no-integrated-as for ARM64."

* commit '09e044ea813cc23b1d3b5ed99b20dea9ec7c5328':
  Add -no-integrated-as for ARM64.

core/clang/arm64.mk

diff --git a/core/clang/arm64.mk b/core/clang/arm64.mk
index e8342bd..9fb3670 100644
--- a/core/clang/arm64.mk
+++ b/core/clang/arm64.mk
@@ -1,8 +1,10 @@
 # Clang flags for arm64 arch, target or host.
 
-CLANG_CONFIG_arm64_EXTRA_ASFLAGS :=
+CLANG_CONFIG_arm64_EXTRA_ASFLAGS := \
+  -no-integrated-as
 
 CLANG_CONFIG_arm64_EXTRA_CFLAGS := \
+  -no-integrated-as
 
 CLANG_CONFIG_arm64_EXTRA_LDFLAGS :=