summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCosmin Truta <ctruta@gmail.com>2022-10-12 12:42:09 +0300
committerCosmin Truta <ctruta@gmail.com>2022-10-12 12:42:09 +0300
commitb8ca9108acddfb9fb5d886f5e8a072ebaf436dbb (patch)
treee59037e15ed3d6248768db27ad5fe737e43bcf89
parente56f79c0c6d94f5d727fc147d4487038e188cdf2 (diff)
downloadlibpng-b8ca9108acddfb9fb5d886f5e8a072ebaf436dbb.tar.gz
arm: Add a compile-time assertion about PNG_ARM_NEON_CHECK_SUPPORTED
Following up on the previous commit by Martin Storsjö: If the availability of ARM Neon is not only known at compile time, but also expected by the compiler's target architecture, there should be no further need for a run-time check. In fact, such a check would be counter-productive.
-rw-r--r--arm/arm_init.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arm/arm_init.c b/arm/arm_init.c
index ab22525b3..84d05556f 100644
--- a/arm/arm_init.c
+++ b/arm/arm_init.c
@@ -36,7 +36,10 @@
#ifndef PNG_ARM_NEON_FILE
# if defined(__aarch64__) || defined(_M_ARM64)
/* ARM Neon is expected to be unconditionally available on ARM64. */
-# error "PNG_ARM_NEON_CHECK_SUPPORTED must not be defined on this platform"
+# error "PNG_ARM_NEON_CHECK_SUPPORTED must not be defined on ARM64"
+# elif defined(__ARM_NEON__) || defined(__ARM_NEON)
+ /* ARM Neon is expected to be available on the target CPU architecture. */
+# error "PNG_ARM_NEON_CHECK_SUPPORTED must not be defined on this CPU arch"
# elif defined(__linux__)
# define PNG_ARM_NEON_FILE "contrib/arm-neon/linux.c"
# else