diff options
| author | Matt Sarett <msarett@google.com> | 2015-11-20 18:19:38 -0500 |
|---|---|---|
| committer | Matt Sarett <msarett@google.com> | 2015-11-20 23:22:38 +0000 |
| commit | 8d4a62f3c0164f134fb366907ae05dc1b67ccfc7 (patch) | |
| tree | 0c67f5104e1803b7c3f9186161f1c2e5504bb123 | |
| parent | 7d38cc98d55969bf9982e2b8f6ddb3e676036585 (diff) | |
| download | libjpeg-turbo-8d4a62f3c0164f134fb366907ae05dc1b67ccfc7.tar.gz | |
Build using clang
We still need to disable the clang assembler for ARM v8 devices.
BUG:25564571
Change-Id: I8bf3b3a6a9efd1f761811b5829680746a095c151
| -rw-r--r-- | Android.mk | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -9,11 +9,6 @@ include $(CLEAR_VARS) # preferred to thumb mode for libjpeg-turbo. LOCAL_ARM_MODE := arm -# BUG:25564571 -# Clang fails to compile the ARM v8 NEON asembly, and libjpeg-turbo may perform -# better when compiled with gcc. -LOCAL_CLANG := false - LOCAL_SRC_FILES := \ jcapimin.c jcapistd.c jccoefct.c jccolor.c jcdctmgr.c jchuff.c \ jcinit.c jcmainct.c jcmarker.c jcmaster.c jcomapi.c jcparam.c \ @@ -35,6 +30,11 @@ 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 + # ARM v8 64-bit NEON LOCAL_SRC_FILES_arm64 += simd/jsimd_arm64_neon.S simd/jsimd_arm64.c |