dsp/WEBP_USE_NEON: test for __aarch64__

__ARM_NEON__ is unset by current linux gcc/clang + android toolchains
for aarch64/arm64 builds.

Change-Id: Ib2ca172ea6fcf046e4ced19a431088674c99b7f6
This commit is contained in:
James Zern 2014-05-13 23:37:01 -07:00
parent 54bfffcabc
commit a577b23a0a
2 changed files with 3 additions and 3 deletions

View File

@ -55,7 +55,7 @@ static int x86CPUInfo(CPUFeature feature) {
return 0; return 0;
} }
VP8CPUInfo VP8GetCPUInfo = x86CPUInfo; VP8CPUInfo VP8GetCPUInfo = x86CPUInfo;
#elif defined(WEBP_ANDROID_NEON) #elif defined(WEBP_ANDROID_NEON) // NB: needs to be before generic NEON test.
static int AndroidCPUInfo(CPUFeature feature) { static int AndroidCPUInfo(CPUFeature feature) {
const AndroidCpuFamily cpu_family = android_getCpuFamily(); const AndroidCpuFamily cpu_family = android_getCpuFamily();
const uint64_t cpu_features = android_getCpuFeatures(); const uint64_t cpu_features = android_getCpuFeatures();
@ -66,7 +66,7 @@ static int AndroidCPUInfo(CPUFeature feature) {
return 0; return 0;
} }
VP8CPUInfo VP8GetCPUInfo = AndroidCPUInfo; VP8CPUInfo VP8GetCPUInfo = AndroidCPUInfo;
#elif defined(__ARM_NEON__) #elif defined(WEBP_USE_NEON)
// define a dummy function to enable turning off NEON at runtime by setting // define a dummy function to enable turning off NEON at runtime by setting
// VP8DecGetCPUInfo = NULL // VP8DecGetCPUInfo = NULL
static int armCPUInfo(CPUFeature feature) { static int armCPUInfo(CPUFeature feature) {

View File

@ -44,7 +44,7 @@ extern "C" {
#define WEBP_ANDROID_NEON // Android targets that might support NEON #define WEBP_ANDROID_NEON // Android targets that might support NEON
#endif #endif
#if defined(__ARM_NEON__) || defined(WEBP_ANDROID_NEON) #if defined(__ARM_NEON__) || defined(WEBP_ANDROID_NEON) || defined(__aarch64__)
#define WEBP_USE_NEON #define WEBP_USE_NEON
#endif #endif