Merge pull request #22080 from vrabaud:fix_arm

2 years ago · cac864192c
parent c103b63fe1 7a46d7efde
commit cac864192c
1 changed files with 8 additions and 1 deletions
--- a/modules/core/src/system.cpp
+++ b/modules/core/src/system.cpp
@ -598,13 +598,20 @@ struct HWFeatures
            close(cpufile);
        }
    #endif
-    #elif (defined __clang__ || defined __APPLE__)
+    #elif (defined __APPLE__)
    #if (defined __ARM_NEON__ || (defined __ARM_NEON && defined __aarch64__))
        have[CV_CPU_NEON] = true;
    #endif
    #if (defined __ARM_FP  && (((__ARM_FP & 0x2) != 0) && defined __ARM_NEON__))
        have[CV_CPU_FP16] = true;
    #endif
+    #elif (defined __clang__)
+    #if (defined __ARM_NEON__ || (defined __ARM_NEON && defined __aarch64__))
+        have[CV_CPU_NEON] = true;
+        #if (defined __ARM_FP  && ((__ARM_FP & 0x2) != 0))
+        have[CV_CPU_FP16] = true;
+        #endif
+    #endif
    #endif
    #if defined _ARM_ && (defined(_WIN32_WCE) && _WIN32_WCE >= 0x800)
        have[CV_CPU_NEON] = true;