ardour/livetrax
13
0
Fork 0
Code

Fix non-intel arch builds (cpuid.h header)

Browse Source
This commit is contained in:
Robin Gareus 2023-02-09 20:54:46 +01:00
parent 907b0bbfa0
commit eeaf0bdadc
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libs/pbd/fpu.cc
View File

@ -33,12 +33,15 @@
#include <asm/hwcap.h> #include <asm/hwcap.h>
#endif #endif
#ifdef PLATFORM_WINDOWS /* x86 CPU - need __cpuid to query flags */
#include <intrin.h> #if (defined __x86_64__) || (defined __i386__) || (defined _M_X64) || (defined _M_IX86)
#elif defined(__GNUC__) || defined(__clang__) # ifdef PLATFORM_WINDOWS
#include <cpuid.h> # include <intrin.h>
#else # elif defined(__GNUC__) || defined(__clang__)
#error "Unsupported compiler: need __cpuid and __cpuidex for CPU detection" # include <cpuid.h>
# else
# error "Unsupported compiler: need __cpuid and __cpuidex for CPU detection"
# endif
#endif #endif
#include "pbd/compose.h" #include "pbd/compose.h"
@ -52,8 +55,7 @@ using namespace std;
FPU* FPU::_instance (0); FPU* FPU::_instance (0);
#if ( (defined __x86_64__) || (defined __i386__) || (defined _M_X64) || (defined _M_IX86) ) // ARCH_X86 #if (defined __x86_64__) || (defined __i386__) || (defined _M_X64) || (defined _M_IX86)
#ifdef PLATFORM_WINDOWS #ifdef PLATFORM_WINDOWS
/* Use MSVC/mingw intrinsic to get CPUID */ /* Use MSVC/mingw intrinsic to get CPUID */
static void cpuid(int reg[4], int cpuid_leaf) static void cpuid(int reg[4], int cpuid_leaf)