From 7155676618754acf9ae5350ca2e7da494662cabb Mon Sep 17 00:00:00 2001 From: Adrian Bunk 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.") Reviewed-by: Emma Anholt Tested-by: Ross Burton Part-of: --- 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 c49b378..31f1f24 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 7456d7a..a4a5cb1 100644 --- a/src/util/format/u_format_unpack_neon.c +++ b/src/util/format/u_format_unpack_neon.c @@ -23,7 +23,7 @@ #include -#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.7.4