diff options
| author | Haru <haru@dotalux.com> | 2020-06-28 16:44:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-28 16:44:57 +0200 |
| commit | 44e53924b3db97b515f9a2e032580be0d5ed433c (patch) | |
| tree | 75457e95ce923ea8a39250dcb79885b1de58eba9 /src/common/cbasetypes.h | |
| parent | 8fdc97b3d38d938a610795b8477c2d49deea0f5c (diff) | |
| parent | e3e1acb092a5ba8ddc4dcb116ec4bcf7686e140d (diff) | |
| download | hercules-44e53924b3db97b515f9a2e032580be0d5ed433c.tar.gz hercules-44e53924b3db97b515f9a2e032580be0d5ed433c.tar.bz2 hercules-44e53924b3db97b515f9a2e032580be0d5ed433c.tar.xz hercules-44e53924b3db97b515f9a2e032580be0d5ed433c.zip | |
Merge pull request #2778 from 4144/extendci
Extend ci with more checks and add different fixes
Diffstat (limited to 'src/common/cbasetypes.h')
| -rw-r--r-- | src/common/cbasetypes.h | 10 |
1 files changed, 9 insertions, 1 deletions
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__ |