diff options
| author | daMaex <damaex@live.de> | 2020-02-23 22:37:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-23 22:37:02 +0100 |
| commit | cbe765df7a75f61941583ab95ecaa153e198d3de (patch) | |
| tree | 6624f576afb9cf5beb1d57d5f9fcb8ebb8a31b00 /dep/g3dlite/source/System.cpp | |
| parent | 7a57029d8fd46c0966eb32b17019291785e61f37 (diff) | |
Core: Build on ARM64 - Raspberry Pi (preferable 4) (#23885)
* build again on aarch64
* include mm_malloc header instead of defining self
Diffstat (limited to 'dep/g3dlite/source/System.cpp')
| -rw-r--r-- | dep/g3dlite/source/System.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/dep/g3dlite/source/System.cpp b/dep/g3dlite/source/System.cpp index b841e23c497..4a75d320b8d 100644 --- a/dep/g3dlite/source/System.cpp +++ b/dep/g3dlite/source/System.cpp @@ -79,8 +79,9 @@ #endif // SIMM include +#if !defined(__aarch64__) #include <xmmintrin.h> - +#endif namespace G3D { @@ -1697,6 +1698,16 @@ void System::cpuid(CPUIDFunction func, uint32& eax, uint32& ebx, uint32& ecx, ui edx = regs[3]; } +#elif defined(__aarch64__) || defined(G3D_OSX) && ! defined(G3D_OSX_INTEL) + +// non-x86 CPU; no CPUID +void System::cpuid(CPUIDFunction func, uint32& eax, uint32& ebx, uint32& ecx, uint32& edx) { + eax = 0; + ebx = 0; + ecx = 0; + edx = 0; +} + #else // See http://sam.zoy.org/blog/2007-04-13-shlib-with-non-pic-code-have-inline-assembly-and-pic-mix-well |