Merge pull request #64 from steinwurf/neon-macos

Made Neon detection work on MacOS.
steinwurf · Oct 24, 2024 · 95642f5 · 95642f5
2 parents 050c4c4 + 6a37c03
commit 95642f5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/NEWS.rst b/NEWS.rst
@@ -6,7 +6,7 @@ every change, see the Git log.
 
 Latest
 ------
-* tbd
+* Patch: Made Neon detection work on MacOS.
 
 9.0.0
 -----

diff --git a/src/cpuid/cpuinfo.cpp b/src/cpuid/cpuinfo.cpp
@@ -14,8 +14,9 @@
 #include "detail/init_msvc_x86.hpp"
 #elif defined(PLATFORM_MSVC_ARM)
 #include "detail/init_msvc_arm.hpp"
-#elif defined(PLATFORM_CLANG_ARM) && defined(PLATFORM_IOS)
-#include "detail/init_ios_clang_arm.hpp"
+#elif defined(PLATFORM_CLANG_ARM) && \
+    (defined(PLATFORM_IOS) || defined(PLATFORM_MAC))
+#include "detail/init_apple_gcc_arm.hpp"
 #elif defined(PLATFORM_GCC_COMPATIBLE_ARM) && defined(PLATFORM_LINUX)
 #include "detail/init_linux_gcc_arm.hpp"
 #else

diff --git a/src/cpuid/detail/init_ios_clang_arm.hpp → src/cpuid/detail/init_apple_gcc_arm.hpp b/src/cpuid/detail/init_ios_clang_arm.hpp → src/cpuid/detail/init_apple_gcc_arm.hpp
@@ -11,11 +11,10 @@ namespace cpuid
 {
 inline namespace STEINWURF_CPUID_VERSION
 {
-/// @todo docs
 void init_cpuinfo(cpuinfo::impl& info)
 {
     // The __ARM_NEON__ macro will be defined by the Apple Clang compiler
-    // when targeting ARMv7 processors that have NEON.
+    // when targeting ARMv7/8 processors that have NEON.
     // The compiler guarantees this capability, so there is no benefit
     // in doing a runtime check. More info in this SO answer:
     // http://stackoverflow.com/a/1601234