diff options
| author | Ashkan Aliabadi <ashkan.aliabadi@gmail.com> | 2020-06-01 18:23:11 -0700 |
|---|---|---|
| committer | Ashkan Aliabadi <ashkan.aliabadi@gmail.com> | 2020-06-01 18:23:11 -0700 |
| commit | 7e4c0099cc84b744d3844c9811f2470c50d6dcbf (patch) | |
| tree | da7192694f1b9b98b599b7e385a55bfd72d50e8e /include | |
| parent | 5cefcd6293e6881754c2c53f99e95b159d2d8aa5 (diff) | |
| download | cpuinfo-7e4c0099cc84b744d3844c9811f2470c50d6dcbf.tar.gz | |
Upstream cpuinfo updates as of XNNPACK:5d67652eb23c2e94ffeeafd3e82a41745eb3ce41
Diffstat (limited to 'include')
| -rw-r--r-- | include/cpuinfo.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/include/cpuinfo.h b/include/cpuinfo.h index e89a4c1..6c67c34 100644 --- a/include/cpuinfo.h +++ b/include/cpuinfo.h @@ -46,14 +46,6 @@ #endif #endif -#if CPUINFO_ARCH_X86 && defined(_MSC_VER) - #define CPUINFO_ABI __cdecl -#elif CPUINFO_ARCH_X86 && defined(__GNUC__) - #define CPUINFO_ABI __attribute__((__cdecl__)) -#else - #define CPUINFO_ABI -#endif - /* Define other architecture-specific macros as 0 */ #ifndef CPUINFO_ARCH_X86 @@ -88,6 +80,14 @@ #define CPUINFO_ARCH_WASMSIMD 0 #endif +#if CPUINFO_ARCH_X86 && defined(_MSC_VER) + #define CPUINFO_ABI __cdecl +#elif CPUINFO_ARCH_X86 && defined(__GNUC__) + #define CPUINFO_ABI __attribute__((__cdecl__)) +#else + #define CPUINFO_ABI +#endif + #define CPUINFO_CACHE_UNIFIED 0x00000001 #define CPUINFO_CACHE_INCLUSIVE 0x00000002 #define CPUINFO_CACHE_COMPLEX_INDEXING 0x00000004 @@ -415,8 +415,6 @@ enum cpuinfo_uarch { cpuinfo_uarch_cortex_a75 = 0x00300375, /** ARM Cortex-A76. */ cpuinfo_uarch_cortex_a76 = 0x00300376, - /** ARM Cortex-A76AE. */ - cpuinfo_uarch_cortex_a76ae = 0x00300378, /** ARM Cortex-A77. */ cpuinfo_uarch_cortex_a77 = 0x00300377, @@ -454,7 +452,9 @@ enum cpuinfo_uarch { /** Samsung Exynos M5 (Exynos 9830 big cores). */ cpuinfo_uarch_exynos_m5 = 0x00600104, - /* Old names for Exynos. */ + /* Deprecated synonym for Cortex-A76 */ + cpuinfo_uarch_cortex_a76ae = 0x00300376, + /* Deprecated names for Exynos. */ cpuinfo_uarch_mongoose_m1 = 0x00600100, cpuinfo_uarch_mongoose_m2 = 0x00600101, cpuinfo_uarch_meerkat_m3 = 0x00600102, |