commit 6ac74e6d81744654b6ca36b5df369975a1fcc655
author Tim Murray <timmurray@google.com> Fri May 02 18:24:20 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 02 18:24:20 2014 +0000
tree 25ac404c14e987b48bdcf6ad8d2678d4f22e7480
parent 887a52d02251a1a94f8e17ecbfe26ba15ece6af5
parent d720c5a2a6cb44e76c20f96d33b0ac8a96060d91

am d720c5a2: Merge "Add -no-integrated-as for ARM64."

* commit 'd720c5a2a6cb44e76c20f96d33b0ac8a96060d91':
  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 :=