diff options
Diffstat (limited to 'meta/recipes-graphics/mesa/files/without-neon.patch')
| -rw-r--r-- | meta/recipes-graphics/mesa/files/without-neon.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/files/without-neon.patch b/meta/recipes-graphics/mesa/files/without-neon.patch new file mode 100644 index 0000000000..56e4aa7769 --- /dev/null +++ b/meta/recipes-graphics/mesa/files/without-neon.patch @@ -0,0 +1,53 @@ +Since 80923e8d ("util/format: Add some NEON intrinsics-based u_format_unpack.") +upstream the build fails on Arm platforms which use the soft-float ABI, such as +qemuarmv5: + + arm_neon.h:31:2: error: #error "NEON intrinsics not available with the + soft-float ABI. Please use -mfloat-abi=softfp or -mfloat-abi=hard" + +Take a patch from upstream to check the ABI being used before trying to +use NEON instructions. + +Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12569] +Signed-off-by: Ross Burton <ross.burton@arm.com> + +From 5dcce985a6dd3b7856d65e21db753e2c7a0f5dd5 Mon Sep 17 00:00:00 2001 +From: Adrian Bunk <bunk@debian.org> +Date: Thu, 26 Aug 2021 22:35:49 +0300 +Subject: [PATCH] util/format: NEON is not available with the soft-float ABI + +Fixes: 80923e8d58cc ("util/format: Add some NEON intrinsics-based u_format_unpack.") +--- + 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 c49b3788c82..31f1f240efc 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 ++#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined(NO_FORMAT_ASM) && !defined(__SOFTFP__) + 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 7456d7aaa88..a4a5cb1f723 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 ++#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined(NO_FORMAT_ASM) && !defined(__SOFTFP__) + + /* armhf builds default to vfp, not neon, and refuses to compile neon intrinsics + * unless you tell it "no really". +-- +GitLab + |