aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMelissa Mears <myriachan@gmail.com>2019-11-12 19:24:35 -0800
committerDaniel Stenberg <daniel@haxx.se>2019-11-14 23:27:06 +0100
commitc6b70de24660673648a37be4d18638274d7f5741 (patch)
tree1ecfa87841c571e9314034f141ce8a447bdf6c71
parentea19dbe66237749ed8cdf6726a377a43be1c9e59 (diff)
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
-rw-r--r--lib/config-win32.h6
1 files changed, 5 insertions, 1 deletions
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