summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2014-05-02 18:26:14 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-02 18:26:14 +0000
commit09e044ea813cc23b1d3b5ed99b20dea9ec7c5328 (patch)
tree6117b9f5358f781aa582230e37064cb615c08202
parent372df5a49ebae4ce04df4633be195afb224c5d86 (diff)
parent6ac74e6d81744654b6ca36b5df369975a1fcc655 (diff)
downloadbuild-09e044ea813cc23b1d3b5ed99b20dea9ec7c5328.zip
build-09e044ea813cc23b1d3b5ed99b20dea9ec7c5328.tar.gz
build-09e044ea813cc23b1d3b5ed99b20dea9ec7c5328.tar.bz2
am 6ac74e6d: am d720c5a2: Merge "Add -no-integrated-as for ARM64."
* commit '6ac74e6d81744654b6ca36b5df369975a1fcc655': Add -no-integrated-as for ARM64.
-rw-r--r--core/clang/arm64.mk4
1 files changed, 3 insertions, 1 deletions
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 :=