From 7a46d7efde74b145f63e40b47ea8bd4d5be22097 Mon Sep 17 00:00:00 2001 From: Vincent Rabaud Date: Wed, 8 Jun 2022 16:29:47 +0200 Subject: [PATCH] Fix compilation on some ARM architecture. This condition is the same as the line above. --- modules/core/src/system.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp index 9bade08177..adb957908d 100644 --- 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;