From 911b1ec1d4e77bc9f63cde4310b15c422e84dfb6 Mon Sep 17 00:00:00 2001 From: hristov Date: Mon, 8 Mar 2021 21:10:09 +0100 Subject: [PATCH] Protect cpuid.h, it cannot be used on Mac M1 --- Framework/Core/src/runDataProcessing.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Framework/Core/src/runDataProcessing.cxx b/Framework/Core/src/runDataProcessing.cxx index c02e59ca6669b..f222603b0a758 100644 --- a/Framework/Core/src/runDataProcessing.cxx +++ b/Framework/Core/src/runDataProcessing.cxx @@ -109,7 +109,7 @@ #include #elif __has_include() #include -#elif __has_include() +#elif __has_include() && (__x86_64__ || __i386__) #include #define CPUID(INFO, LEAF, SUBLEAF) __cpuid_count(LEAF, SUBLEAF, INFO[0], INFO[1], INFO[2], INFO[3]) #define GETCPU(CPU) \ @@ -1462,7 +1462,7 @@ int runStateMachine(DataProcessorSpecs const& workflow, parentCPU = sched_getcpu(); #elif __has_include() getcpu(&parentCPU, &parentNode, nullptr); -#elif __has_include() +#elif __has_include() && (__x86_64__ || __i386__) // FIXME: this is a last resort as it is apparently buggy // on some Intel CPUs. GETCPU(parentCPU);