|
|
1
|
+From 5dcce985a6dd3b7856d65e21db753e2c7a0f5dd5 Mon Sep 17 00:00:00 2001
|
|
|
2
|
+From: Adrian Bunk <bunk@debian.org>
|
|
|
3
|
+Date: Thu, 26 Aug 2021 22:35:49 +0300
|
|
|
4
|
+Subject: util/format: NEON is not available with the soft-float ABI
|
|
|
5
|
+
|
|
|
6
|
+Fixes: 80923e8d58cc ("util/format: Add some NEON intrinsics-based u_format_unpack.")
|
|
|
7
|
+---
|
|
|
8
|
+ src/util/format/u_format.c | 2 +-
|
|
|
9
|
+ src/util/format/u_format_unpack_neon.c | 2 +-
|
|
|
10
|
+ 2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
11
|
+
|
|
|
12
|
+diff --git a/src/util/format/u_format.c b/src/util/format/u_format.c
|
|
|
13
|
+index c49b3788c82..31f1f240efc 100644
|
|
|
14
|
+--- a/src/util/format/u_format.c
|
|
|
15
|
++++ b/src/util/format/u_format.c
|
|
|
16
|
+@@ -1138,7 +1138,7 @@ static void
|
|
|
17
|
+ util_format_unpack_table_init(void)
|
|
|
18
|
+ {
|
|
|
19
|
+ for (enum pipe_format format = PIPE_FORMAT_NONE; format < PIPE_FORMAT_COUNT; format++) {
|
|
|
20
|
+-#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined NO_FORMAT_ASM
|
|
|
21
|
++#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined(NO_FORMAT_ASM) && !defined(__SOFTFP__)
|
|
|
22
|
+ const struct util_format_unpack_description *unpack = util_format_unpack_description_neon(format);
|
|
|
23
|
+ if (unpack) {
|
|
|
24
|
+ util_format_unpack_table[format] = unpack;
|
|
|
25
|
+diff --git a/src/util/format/u_format_unpack_neon.c b/src/util/format/u_format_unpack_neon.c
|
|
|
26
|
+index 7456d7aaa88..a4a5cb1f723 100644
|
|
|
27
|
+--- a/src/util/format/u_format_unpack_neon.c
|
|
|
28
|
++++ b/src/util/format/u_format_unpack_neon.c
|
|
|
29
|
+@@ -23,7 +23,7 @@
|
|
|
30
|
+
|
|
|
31
|
+ #include <u_format.h>
|
|
|
32
|
+
|
|
|
33
|
+-#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined NO_FORMAT_ASM
|
|
|
34
|
++#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined(NO_FORMAT_ASM) && !defined(__SOFTFP__)
|
|
|
35
|
+
|
|
|
36
|
+ /* armhf builds default to vfp, not neon, and refuses to compile neon intrinsics
|
|
|
37
|
+ * unless you tell it "no really".
|
|
|
38
|
+--
|
|
|
39
|
+2.20.1
|
|
|
40
|
+
|