aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Sarett <msarett@google.com>2015-12-15 09:34:56 -0500
committerMatt Sarett <msarett@google.com>2015-12-15 09:38:37 -0500
commit8df5de5a3123883f36efb997edf2d7d68bbb476e (patch)
tree2094987060e3aa8e21c7ab5fe1971f6a8a87829c
parent64d08ccd3958755f82c34faedf3ed5de4179f481 (diff)
downloadlibjpeg-turbo-8df5de5a3123883f36efb997edf2d7d68bbb476e.tar.gz
Use the clang integrated assembler for Arm64 assembly code
We have cherry-picked a fix from upstream so that the assembly is now clang compatible. BUG:25564571 Change-Id: Ic4a676b8648e5bc83e3a1da1f346ec2f5cc953ac
-rw-r--r--Android.mk8
1 files changed, 0 insertions, 8 deletions
diff --git a/Android.mk b/Android.mk
index 6d501282..a6c0e48b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -30,14 +30,6 @@ ifeq ($(strip $(TARGET_ARCH)),arm)
endif
endif
-# BUG:25564571
-# The clang assembler fails to recognize a directive in the ARM v8 NEON
-# assembly. This is a temporary fix.
-LOCAL_ASFLAGS_arm64 := -fno-integrated-as
-# The above flag is not recognized by gcc, so make sure we always build
-# with clang.
-LOCAL_CLANG := true
-
# ARM v8 64-bit NEON
LOCAL_SRC_FILES_arm64 += simd/jsimd_arm64_neon.S simd/jsimd_arm64.c