| From fdb2face4eeac3c20eedcca7520f4e7014225fb4 Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Thu, 2 Dec 2021 19:57:42 -0800 |
| Subject: [PATCH] util/format: Check for NEON before using it |
| |
| This fixes build on rpi0-w and any other machine which does not have |
| neon unit and is not used as FPU unit |
| |
| Fixes errors e.g. |
| |
| In file included from ../mesa-21.3.0/src/util/format/u_format_unpack_neon.c:35: |
| /mnt/b/yoe/master/build/tmp/work/arm1176jzfshf-vfp-yoe-linux-gnueabi/mesa/2_21.3.0-r0/recipe-sysroot-native/usr/lib/clang/13.0.1/include/arm_neon.h:32:2: error: "NEON support not enabled" |
| |
| Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14032] |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| |
| --- |
| src/util/format/u_format.c | 2 +- |
| src/util/format/u_format_unpack_neon.c | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/src/util/format/u_format.c b/src/util/format/u_format.c |
| index 36c5e52..f0a0097 100644 |
| --- a/src/util/format/u_format.c |
| +++ b/src/util/format/u_format.c |
| @@ -1138,7 +1138,7 @@ static void |
| util_format_unpack_table_init(void) |
| { |
| for (enum pipe_format format = PIPE_FORMAT_NONE; format < PIPE_FORMAT_COUNT; format++) { |
| -#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined(NO_FORMAT_ASM) && !defined(__SOFTFP__) |
| +#if (defined(PIPE_ARCH_AARCH64) || (defined(__ARM_NEON) && defined(PIPE_ARCH_ARM))) && !defined(NO_FORMAT_ASM) |
| const struct util_format_unpack_description *unpack = util_format_unpack_description_neon(format); |
| if (unpack) { |
| util_format_unpack_table[format] = unpack; |
| diff --git a/src/util/format/u_format_unpack_neon.c b/src/util/format/u_format_unpack_neon.c |
| index a4a5cb1..1e4f794 100644 |
| --- a/src/util/format/u_format_unpack_neon.c |
| +++ b/src/util/format/u_format_unpack_neon.c |
| @@ -23,7 +23,7 @@ |
| |
| #include <u_format.h> |
| |
| -#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined(NO_FORMAT_ASM) && !defined(__SOFTFP__) |
| +#if (defined(PIPE_ARCH_AARCH64) || (defined(__ARM_NEON) && defined(PIPE_ARCH_ARM))) && !defined(NO_FORMAT_ASM) |
| |
| /* armhf builds default to vfp, not neon, and refuses to compile neon intrinsics |
| * unless you tell it "no really". |