aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Sarett <msarett@google.com>2015-12-16 14:33:21 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-12-16 14:33:21 +0000
commit7fc25f697c2b575edd700a620ec630a9bc814812 (patch)
treeed7881a2bfbab0b3de2c5f700515db41cf96ec4d
parentd6d1b51c5f134ff25669fda54cf7777664242b3f (diff)
parent8df5de5a3123883f36efb997edf2d7d68bbb476e (diff)
downloadlibjpeg-turbo-7fc25f697c2b575edd700a620ec630a9bc814812.tar.gz
Merge "Use the clang integrated assembler for Arm64 assembly code"
-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