From 02ab16e6dfb07cea1e2be1b2b7fe29853f4e2b7d Mon Sep 17 00:00:00 2001 From: Melissa Mears Date: Tue, 12 Nov 2019 19:24:35 -0800 Subject: [PATCH 1/2] 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. --- 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 90c10547657527..ff86e02419ba5b 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, Windows 10 IoT) */ +#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 From 417d111a81d1a263fcf7ac40b9b03d4b2529c2bc Mon Sep 17 00:00:00 2001 From: Jeff Mears Date: Wed, 13 Nov 2019 14:11:15 -0800 Subject: [PATCH 2/2] Shortened line to comply with coding style --- lib/config-win32.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/config-win32.h b/lib/config-win32.h index ff86e02419ba5b..1dcce0db41a81c 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -737,7 +737,7 @@ Vista #define OS "x86_64-pc-win32" #elif defined(_M_IA64) || defined(__ia64__) /* Itanium */ #define OS "ia64-pc-win32" -#elif defined(_M_ARM_NT) || defined(__arm__) /* ARMv7-Thumb2 (Windows RT, Windows 10 IoT) */ +#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"