From d4310fdd177bd10fb78ba9e1f71081f2593a0605 Mon Sep 17 00:00:00 2001
From: Utz-Uwe Haus <uhaus@hpe.com>
Date: Wed, 14 Dec 2022 13:57:56 +0100
Subject: [PATCH] Disable apple-specific CPUID code
That code only works on x86 based macos systems; we'll need to implement
a separate solution based on
syctlbyname https://developer.apple.com/documentation/kernel/1387446-sysctlbyname
---
maestro/i_maestro_numa.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/maestro/i_maestro_numa.h b/maestro/i_maestro_numa.h
index da1f7702..2b844848 100644
--- a/maestro/i_maestro_numa.h
+++ b/maestro/i_maestro_numa.h
@@ -50,7 +50,7 @@
#include <numaif.h>
#endif
-#ifdef __APPLE__
+#ifdef __APPLE__ && (!defined(__arm64__))
#include <cpuid.h>
#endif
@@ -106,7 +106,7 @@ int
mstro_numa_get_cpu(void) {
#if defined(__linux) || defined(__linux__)
return sched_getcpu();
- #elif __APPLE__
+ #elif __APPLE__ && (!defined(__arm64__))
#define CPUID(INFO, LEAF, SUBLEAF) __cpuid_count(LEAF, SUBLEAF, INFO[0], INFO[1], INFO[2], INFO[3])
uint32_t CPUInfo[4];
CPUID(CPUInfo, 1, 0);
--
GitLab