From c6b70de24660673648a37be4d18638274d7f5741 Mon Sep 17 00:00:00 2001 From: Melissa Mears Date: Tue, 12 Nov 2019 19:24:35 -0800 Subject: config-win32: cpu-machine-OS for Windows on ARM Define the OS macro properly for Windows on ARM builds. Also, we might as well add the GCC-style IA-64 macro. Closes #4590 --- lib/config-win32.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/config-win32.h b/lib/config-win32.h index 90c105476..1dcce0db4 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -735,8 +735,12 @@ Vista #define OS "i386-pc-win32" #elif defined(_M_X64) || defined(__x86_64__) /* x86_64 (MSVC >=2005 or gcc) */ #define OS "x86_64-pc-win32" -#elif defined(_M_IA64) /* Itanium */ +#elif defined(_M_IA64) || defined(__ia64__) /* Itanium */ #define OS "ia64-pc-win32" +#elif defined(_M_ARM_NT) || defined(__arm__) /* ARMv7-Thumb2 (Windows RT) */ +#define OS "thumbv7a-pc-win32" +#elif defined(_M_ARM64) || defined(__aarch64__) /* ARM64 (Windows 10) */ +#define OS "aarch64-pc-win32" #else #define OS "unknown-pc-win32" #endif -- cgit v1.2.3