Mesa (master): vc4: fix arm64 build with Neon

[Eric Anholt]

Module: Mesa
Branch: master
Commit: 83107acb7b893ae8cf1aa2158c621e20f9c61a88
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=83107acb7b893ae8cf1aa2158c621e20f9c61a88

Author: Rob Herring <robh at kernel.org>
Date:   Mon Jan 30 16:54:52 2017 -0600

vc4: fix arm64 build with Neon

The addition of Neon assembly breaks on arm64 builds because the assembly
syntax is different. For now, restrict Neon to ARMv7 builds.

Signed-off-by: Rob Herring <robh at kernel.org>
Reviewed-by: Eric Anholt <eric at anholt.net>

---

 src/gallium/drivers/vc4/vc4_tiling.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/vc4/vc4_tiling.h b/src/gallium/drivers/vc4/vc4_tiling.h
index 218130b..ba1ad6f 100644
--- a/src/gallium/drivers/vc4/vc4_tiling.h
+++ b/src/gallium/drivers/vc4/vc4_tiling.h
@@ -87,7 +87,7 @@ void vc4_store_tiled_image(void *dst, uint32_t dst_stride,
  * should extend this to have some runtime detection of being built for ARMv6
  * on a Pi 2+.
  */
-#if defined(__ARM_ARCH) && __ARM_ARCH >= 7
+#if defined(__ARM_ARCH) && __ARM_ARCH == 7
 #define NEON_SUFFIX(x) x ## _neon
 #else
 #define NEON_SUFFIX(x) x ## _base