fix: Detection of HW caps and Num Cpus for FreeBSD(R) and OpenBSD(R)

Signed-off-by: Martin Filla <freebsd@sysctl.cz>

Author: Martinfx

src/common/cpuinfo/CpuInfo.cpp

@@ -57,16 +57,20 @@
     !defined(__QNX__) && (defined(__arm__) || defined(__aarch64__))
 #include <asm/hwcap.h> /* Get HWCAP bits from asm/hwcap.h */
 #include <sys/auxv.h>
-#elif (defined(__APPLE__)) && defined(__aarch64__)
+#elif (defined(__APPLE__)) && \
+    defined(                  \
+        __aarch64__) /* #if !defined(BARE_METAL) && !defined(__APPLE__) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && \
+    !defined(__QNX__) && (defined(__arm__) || defined(__aarch64__)) */
 #include <sys/sysctl.h>
 #include <sys/types.h>
-#elif (defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__aarch64__)
+#elif (defined(__OpenBSD__) || defined(__FreeBSD__)) && \
+    defined(__aarch64__) /* #elif (defined(__APPLE__)) && defined(__aarch64__) */
 #include <sys/auxv.h>
 #include <sys/sysctl.h>
 #include <sys/types.h>
 #include <unistd.h>
 #endif /* #elif (defined(OpenBSD) || defined(FreeBSD)) && defined(aarch64) */
-#endif /* #elif (defined(__APPLE__)) && defined(__aarch64__) */
+#endif /* !defined(_WIN64) */
 
 #define ARM_COMPUTE_CPU_FEATURE_HWCAP_CPUID    (1 << 11)
 #define ARM_COMPUTE_GET_FEATURE_REG(var, freg) __asm __volatile("MRS %0, " #freg : "=r"(var))
@@ -400,7 +404,10 @@ CpuInfo CpuInfo::build()
 
     CpuInfo info(isa, cpus_model);
     return info;
-#elif defined(__arm__) && (defined(__OpenBSD__) || defined(__FreeBSD__)) /* if !defined(_WIN64) && !defined(BARE_METAL) && !defined(__APPLE__) && !defined(__OpenBSD__) &&
+#elif defined(__arm__) &&    \
+    (defined(__OpenBSD__) || \
+     defined(                \
+         __FreeBSD__)) /* if !defined(_WIN64) && !defined(BARE_METAL) && !defined(__APPLE__) && !defined(__OpenBSD__) &&
     !defined(__FreeBSD__) && !defined(__QNX__) && (defined(__arm__) || defined(__aarch64__)) */
     int    mib[2] = {0, 0};
     int    ncpu   = {1};
@@ -418,8 +425,7 @@ CpuInfo CpuInfo::build()
     CpuInfo info(isainfo, cpus_model);
     return info;
 #elif (BARE_METAL) && \
-    defined(          \
-        __aarch64__) /* #elif defined(__arm__) && (defined(__OpenBSD__) || defined(__FreeBSD__)) */
+    defined(__aarch64__) /* #elif defined(__arm__) && (defined(__OpenBSD__) || defined(__FreeBSD__)) */
 
     // Assume single CPU in bare metal mode.  Just read the ID register and feature bits directly.
     uint64_t isar0 = 0, isar1 = 0, pfr0 = 0, pfr1 = 0, svefr0 = 0, smefr0 = 0, midr = 0;
@@ -466,7 +472,8 @@ CpuInfo CpuInfo::build()
     CpuInfo info(isainfo, cpus_model);
     return info;
 
-#elif defined(__aarch64__) && defined(__APPLE__) /* #elif defined(__aarch64__) && (defined(__OpenBSD__) || defined(__FreeBSD__)) */
+#elif defined(__aarch64__) && \
+    defined(__APPLE__) /* #elif defined(__aarch64__) && (defined(__OpenBSD__) || defined(__FreeBSD__)) */
     int                   ncpus = get_hw_capability("hw.perflevel0.logicalcpu");
     CpuIsaInfo            isainfo;
     std::vector<CpuModel> cpus_model(ncpus);