diff options
Diffstat (limited to 'poky/meta/recipes-graphics/mesa/files')
-rw-r--r-- | poky/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch | 12 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/mesa/files/without-neon.patch | 53 |
2 files changed, 59 insertions, 6 deletions
diff --git a/poky/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch b/poky/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch index eac6d4df8..35ab8d5a7 100644 --- a/poky/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch +++ b/poky/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch @@ -1,4 +1,4 @@ -From d434b9e5d29d614b57c09e164e1d084094bf2150 Mon Sep 17 00:00:00 2001 +From 8f2f48b41aa17eec3c4d63685e3296f28e60b980 Mon Sep 17 00:00:00 2001 From: Alistair Francis <alistair@alistair23.me> Date: Thu, 14 Nov 2019 13:08:31 -0800 Subject: [PATCH] meson.build: make TLS ELF optional @@ -30,10 +30,10 @@ Signed-off-by: Alistair Francis <alistair@alistair23.me> 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 42f448e..02f6e33 100644 +index 23618c1..c8cc5e3 100644 --- a/meson.build +++ b/meson.build -@@ -449,7 +449,7 @@ endif +@@ -476,7 +476,7 @@ endif use_elf_tls = false if (not ['freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) and @@ -41,12 +41,12 @@ index 42f448e..02f6e33 100644 + (not with_platform_windows or not with_shared_glapi) and get_option('elf-tls')) pre_args += '-DUSE_ELF_TLS' use_elf_tls = true - endif + diff --git a/meson_options.txt b/meson_options.txt -index a7030ab..635ec20 100644 +index 29c402c..f70d9b2 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -421,6 +421,12 @@ option( +@@ -455,6 +455,12 @@ option( value : true, description : 'Enable direct rendering in GLX and EGL for DRI', ) diff --git a/poky/meta/recipes-graphics/mesa/files/without-neon.patch b/poky/meta/recipes-graphics/mesa/files/without-neon.patch new file mode 100644 index 000000000..56e4aa776 --- /dev/null +++ b/poky/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 + |