From 3e853546cfdc57a6fb1c14ad3c3194e3107d4af0 Mon Sep 17 00:00:00 2001
From: Eric Biggers <ebiggers3@gmail.com>
Date: Sun, 17 Mar 2024 20:48:12 -0700
Subject: [PATCH] lib/arm/cpu_features: simplify ifdefs for runtime detection

Eliminate a redundant preprocessor symbol, as was done in lib/x86/.
---
 lib/arm/cpu_features.c |  5 +++--
 lib/arm/cpu_features.h | 24 +++++++++---------------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/lib/arm/cpu_features.c b/lib/arm/cpu_features.c
index 3c1b85cb..8a26a7c5 100644
--- a/lib/arm/cpu_features.c
+++ b/lib/arm/cpu_features.c
@@ -39,7 +39,8 @@
 #include "../cpu_features_common.h" /* must be included first */
 #include "cpu_features.h"
 
-#if HAVE_DYNAMIC_ARM_CPU_FEATURES
+#ifdef ARM_CPU_FEATURES_KNOWN
+/* Runtime ARM CPU feature detection is supported. */
 
 #ifdef __linux__
 /*
@@ -220,4 +221,4 @@ void libdeflate_init_arm_cpu_features(void)
 	libdeflate_arm_cpu_features = features | ARM_CPU_FEATURES_KNOWN;
 }
 
-#endif /* HAVE_DYNAMIC_ARM_CPU_FEATURES */
+#endif /* ARM_CPU_FEATURES_KNOWN */
diff --git a/lib/arm/cpu_features.h b/lib/arm/cpu_features.h
index 9ff85d5a..259e7587 100644
--- a/lib/arm/cpu_features.h
+++ b/lib/arm/cpu_features.h
@@ -30,19 +30,8 @@
 
 #include "../lib_common.h"
 
-#define HAVE_DYNAMIC_ARM_CPU_FEATURES	0
-
 #if defined(ARCH_ARM32) || defined(ARCH_ARM64)
 
-#if !defined(FREESTANDING) && \
-    (defined(__GNUC__) || defined(__clang__) || defined(_MSC_VER)) && \
-    (defined(__linux__) || \
-     (defined(__APPLE__) && defined(ARCH_ARM64)) || \
-     (defined(_WIN32) && defined(ARCH_ARM64)))
-#  undef HAVE_DYNAMIC_ARM_CPU_FEATURES
-#  define HAVE_DYNAMIC_ARM_CPU_FEATURES	1
-#endif
-
 #define ARM_CPU_FEATURE_NEON		(1 << 0)
 #define ARM_CPU_FEATURE_PMULL		(1 << 1)
 /*
@@ -55,8 +44,13 @@
 #define ARM_CPU_FEATURE_SHA3		(1 << 4)
 #define ARM_CPU_FEATURE_DOTPROD		(1 << 5)
 
-#if HAVE_DYNAMIC_ARM_CPU_FEATURES
-#define ARM_CPU_FEATURES_KNOWN		(1U << 31)
+#if !defined(FREESTANDING) && \
+    (defined(__GNUC__) || defined(__clang__) || defined(_MSC_VER)) && \
+    (defined(__linux__) || \
+     (defined(__APPLE__) && defined(ARCH_ARM64)) || \
+     (defined(_WIN32) && defined(ARCH_ARM64)))
+/* Runtime ARM CPU feature detection is supported. */
+#  define ARM_CPU_FEATURES_KNOWN	(1U << 31)
 extern volatile u32 libdeflate_arm_cpu_features;
 
 void libdeflate_init_arm_cpu_features(void);
@@ -67,9 +61,9 @@ static inline u32 get_arm_cpu_features(void)
 		libdeflate_init_arm_cpu_features();
 	return libdeflate_arm_cpu_features;
 }
-#else /* HAVE_DYNAMIC_ARM_CPU_FEATURES */
+#else
 static inline u32 get_arm_cpu_features(void) { return 0; }
-#endif /* !HAVE_DYNAMIC_ARM_CPU_FEATURES */
+#endif
 
 /* NEON */
 #if defined(__ARM_NEON) || (defined(_MSC_VER) && defined(ARCH_ARM64))