From d884d1a6540ec0f60768c30df47f0228a37ea61c Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 14 Apr 2017 10:41:51 -0700 Subject: [PATCH] vc4: Only build the NEON code on arm32. NEON is sufficiently different on arm64 that we can't just reuse this code. Disable it on arm64 for now. v2: Use PIPE_ARCH_ARM instead, as __ARM_ARCH may be 8 for a 32-bit build for a v8 CPU. Signed-off-by: Eric Anholt Cc: --- src/gallium/drivers/vc4/vc4_tiling_lt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/vc4/vc4_tiling_lt.c b/src/gallium/drivers/vc4/vc4_tiling_lt.c index c9cbc65e2db..f37a92e9390 100644 --- a/src/gallium/drivers/vc4/vc4_tiling_lt.c +++ b/src/gallium/drivers/vc4/vc4_tiling_lt.c @@ -61,7 +61,7 @@ static void vc4_load_utile(void *cpu, void *gpu, uint32_t cpu_stride, uint32_t cpp) { uint32_t gpu_stride = vc4_utile_stride(cpp); -#if defined(VC4_BUILD_NEON) && defined(__ARM_ARCH) +#if defined(VC4_BUILD_NEON) && defined(PIPE_ARCH_ARM) if (gpu_stride == 8) { __asm__ volatile ( /* Load from the GPU in one shot, no interleave, to @@ -118,7 +118,7 @@ vc4_store_utile(void *gpu, void *cpu, uint32_t cpu_stride, uint32_t cpp) { uint32_t gpu_stride = vc4_utile_stride(cpp); -#if defined(VC4_BUILD_NEON) && defined(__ARM_ARCH) +#if defined(VC4_BUILD_NEON) && defined(PIPE_ARCH_ARM) if (gpu_stride == 8) { __asm__ volatile ( /* Load each 8-byte line from cpu-side source, -- 2.30.2