Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / mesa
Commits: ed556f6d by Adrian Bunk at 2021-08-26T22:44:52+03:00 Fix armel FTBFS - - - - - 2 changed files: - + debian/patches/0001-util-format-NEON-is-not-available-with-the-soft-floa.patch - debian/patches/series Changes: ===================================== debian/patches/0001-util-format-NEON-is-not-available-with-the-soft-floa.patch ===================================== @@ -0,0 +1,40 @@ +From 5dcce985a6dd3b7856d65e21db753e2c7a0f5dd5 Mon Sep 17 00:00:00 2001 +From: Adrian Bunk <[email protected]> +Date: Thu, 26 Aug 2021 22:35:49 +0300 +Subject: 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". +-- +2.20.1 + ===================================== debian/patches/series ===================================== @@ -2,3 +2,4 @@ fix-python-shebang.diff path_max.diff src_glx_dri_common.h.diff +0001-util-format-NEON-is-not-available-with-the-soft-floa.patch View it on GitLab: https://salsa.debian.org/xorg-team/lib/mesa/-/commit/ed556f6d5e205aa39883888ec7760e66026f9654 -- View it on GitLab: https://salsa.debian.org/xorg-team/lib/mesa/-/commit/ed556f6d5e205aa39883888ec7760e66026f9654 You're receiving this email because of your account on salsa.debian.org.
