mirror of
https://git.yoctoproject.org/poky
synced 2026-09-13 00:49:33 +02:00
mesa: Fix build on ARM systems without Neon
See [1] [1] https://github.com/YoeDistro/yoe-distro/issues/626 (From OE-Core rev: 48c898ae4e885d9f3af894d77946e5eb3a498112) Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -0,0 +1,49 @@
|
|||||||
|
From 4febda271c6bb0dc69ebf573446c6922a1ec35fb 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 36c5e52008e..f0a00971691 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 a4a5cb1f723..1e4f794a295 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".
|
||||||
|
--
|
||||||
|
2.34.1
|
||||||
|
|
||||||
@@ -19,6 +19,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
|
|||||||
file://0002-meson.build-make-TLS-ELF-optional.patch \
|
file://0002-meson.build-make-TLS-ELF-optional.patch \
|
||||||
file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
|
file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
|
||||||
file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \
|
file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \
|
||||||
|
file://0001-util-format-Check-for-NEON-before-using-it.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[sha256sum] = "a2753c09deef0ba14d35ae8a2ceff3fe5cd13698928c7bb62c2ec8736eb09ce1"
|
SRC_URI[sha256sum] = "a2753c09deef0ba14d35ae8a2ceff3fe5cd13698928c7bb62c2ec8736eb09ce1"
|
||||||
|
|||||||
Reference in New Issue
Block a user