diff options
author | Elliott Hughes <enh@google.com> | 2014-12-04 19:52:15 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-04 19:52:15 +0000 |
commit | 4c8e0b762644e9189b035c7f4a541ba8d0ed262c (patch) | |
tree | 94c27e4b5c4fe20378267bba3155953da88c2294 | |
parent | f6cba431efa5b921e650dcbf661d3313e96d214b (diff) | |
parent | 50906c2278f3dbd5bedf968deefe0697f5ef7aae (diff) | |
download | jpeg-4c8e0b762644e9189b035c7f4a541ba8d0ed262c.tar.gz |
am 50906c22: Merge "libjpeg should #define __ARM_HAVE_NEON."
* commit '50906c2278f3dbd5bedf968deefe0697f5ef7aae':
libjpeg should #define __ARM_HAVE_NEON.
-rw-r--r-- | Android.mk | 6 | ||||
-rw-r--r-- | armv6_idct.S | 8 | ||||
-rw-r--r-- | jddctmgr.c | 12 | ||||
-rw-r--r-- | jsimd_neon.c | 1 | ||||
-rw-r--r-- | jsimd_neon.h | 1 |
5 files changed, 4 insertions, 24 deletions
@@ -11,7 +11,9 @@ LOCAL_SRC_FILES := \ jdinput.c jdmainct.c jdmarker.c jdmaster.c jdmerge.c jdphuff.c \ jdpostct.c jdsample.c jdtrans.c jerror.c jfdctflt.c jfdctfst.c \ jfdctint.c jidctflt.c jidctfst.c jidctint.c jidctred.c jquant1.c \ - jquant2.c jutils.c jmemmgr.c armv6_idct.S + jquant2.c jutils.c jmemmgr.c + +LOCAL_SRC_FILES_arm += armv6_idct.S # jsimd_arm_neon.S does not compile with clang. LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as @@ -46,7 +48,7 @@ endif ifeq ($(strip $(TARGET_ARCH)),arm) ifeq ($(ARCH_ARM_HAVE_NEON),true) #use NEON accelerations - LOCAL_CFLAGS += -DNV_ARM_NEON + LOCAL_CFLAGS += -DNV_ARM_NEON -D__ARM_HAVE_NEON LOCAL_SRC_FILES += \ jsimd_arm_neon.S \ jsimd_neon.c diff --git a/armv6_idct.S b/armv6_idct.S index 18e4e8a..843c2dd 100644 --- a/armv6_idct.S +++ b/armv6_idct.S @@ -59,12 +59,6 @@ * this might be futher improved using a system profiler. */ -#ifdef __arm__ -#include <machine/cpu-features.h> -#endif - -#if __ARM_ARCH__ >= 6 - // void armv6_idct(short *coefs, int *quans, unsigned char *rows, int col) .arm .text @@ -362,5 +356,3 @@ pass2_tail: ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, r12, r14} bx lr .endfunc - -#endif @@ -20,18 +20,6 @@ #include "jpeglib.h" #include "jdct.h" /* Private declarations for DCT subsystem */ -#ifdef ANDROID_ARMV6_IDCT - #undef ANDROID_ARMV6_IDCT - #ifdef __arm__ - #include <machine/cpu-features.h> - #if __ARM_ARCH__ >= 6 - #define ANDROID_ARMV6_IDCT - #else - #warning "ANDROID_ARMV6_IDCT is disabled" - #endif - #endif -#endif - #ifdef NV_ARM_NEON #include "jsimd_neon.h" #endif diff --git a/jsimd_neon.c b/jsimd_neon.c index 6ad1bd3..3c23b82 100644 --- a/jsimd_neon.c +++ b/jsimd_neon.c @@ -29,7 +29,6 @@ #include "jinclude.h" #include "jpeglib.h" #include "jdct.h" -#include <machine/cpu-features.h> #if defined(NV_ARM_NEON) && defined(__ARM_HAVE_NEON) diff --git a/jsimd_neon.h b/jsimd_neon.h index 24320aa..f02bd68 100644 --- a/jsimd_neon.h +++ b/jsimd_neon.h @@ -29,7 +29,6 @@ #define __JSIMD_NEON_H__ #include "jinclude.h" #include "jpeglib.h" -#include <machine/cpu-features.h> #if defined(NV_ARM_NEON) && defined(__ARM_HAVE_NEON) |