diff options
| author | Haru <haru@dotalux.com> | 2020-06-28 01:26:45 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2020-06-28 12:34:52 +0200 |
| commit | e3e1acb092a5ba8ddc4dcb116ec4bcf7686e140d (patch) | |
| tree | 966aef53c8c6543bee3fc1ee3b7ac1a29f5389a5 | |
| parent | 373d9e0d6395cd9fff55c55e1cff4ee09e241fa8 (diff) | |
| download | hercules-e3e1acb092a5ba8ddc4dcb116ec4bcf7686e140d.tar.gz hercules-e3e1acb092a5ba8ddc4dcb116ec4bcf7686e140d.tar.bz2 hercules-e3e1acb092a5ba8ddc4dcb116ec4bcf7686e140d.tar.xz hercules-e3e1acb092a5ba8ddc4dcb116ec4bcf7686e140d.zip | |
Add detection of ARMv8 and improve detection of ARMv7
Signed-off-by: Haru <haru@dotalux.com>
| -rw-r--r-- | src/common/atomic.h | 3 | ||||
| -rw-r--r-- | src/common/cbasetypes.h | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/common/atomic.h b/src/common/atomic.h index 0d15d50d7..b9157373f 100644 --- a/src/common/atomic.h +++ b/src/common/atomic.h @@ -103,8 +103,9 @@ forceinline volatile int64 InterlockedExchange64(volatile int64 *target, int64 v // The __sync functions are available on x86 or ARMv6+ #if !defined(__x86_64__) && !defined(__i386__) \ + && !defined(__ppc64__) && ! defined(__powerpc64__) \ && ( !defined(__ARM_ARCH_VERSION__) || __ARM_ARCH_VERSION__ < 6 ) -//#error Your Target Platfrom is not supported +#error Target platform currently not supported #endif static forceinline int64 InterlockedExchangeAdd64(volatile int64 *addend, int64 increment){ diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h index 31d89d66b..06333a7b2 100644 --- a/src/common/cbasetypes.h +++ b/src/common/cbasetypes.h @@ -62,16 +62,24 @@ #endif // Standardize the ARM platform version, if available (the only values we're interested in right now are >= ARMv6) +#ifdef __ARM_ARCH +#define __ARM_ARCH_VERSION__ __ARM_ARCH +#else #if defined(__ARMV6__) || defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) \ || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) // gcc ARMv6 #define __ARM_ARCH_VERSION__ 6 -#elif defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7S__) // gcc ARMv7 +#elif defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7S__) // gcc ARMv7 #define __ARM_ARCH_VERSION__ 7 +#elif defined(__ARM_ARCH_8__) || defined(__ARM_ARCH_8A__) +#define __ARM_ARCH_VERSION__ 8 #elif defined(_M_ARM) // MSVC #define __ARM_ARCH_VERSION__ _M_ARM +#elif defined(__TARGET_ARCH_ARM) // RVCT +#define __ARM_ARCH_VERSION__ __TARGET_ARCH_ARM #else #define __ARM_ARCH_VERSION__ 0 #endif +#endif // Necessary for __NetBSD_Version__ (defined as VVRR00PP00) on NetBSD #ifdef __NETBSD__ |