From fb6fe5405859e5169174729dfe79aad66084288e Mon Sep 17 00:00:00 2001
From: George Marques <george@gmarqu.es>
Date: Wed, 12 Sep 2018 22:02:48 -0300
Subject: [PATCH] Patch zstd to build for UWP ARM

Patch comes from upstream and can be removed when it makes to stable
release.
---
 thirdparty/README.md         |  2 ++
 thirdparty/zstd/1314.diff    | 13 +++++++++++++
 thirdparty/zstd/common/cpu.h |  2 +-
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 thirdparty/zstd/1314.diff

diff --git a/thirdparty/README.md b/thirdparty/README.md
index 82b7748194d..4ae6218d3eb 100644
--- a/thirdparty/README.md
+++ b/thirdparty/README.md
@@ -523,3 +523,5 @@ Files extracted from upstream source:
 
 - lib/{common/,compress/,decompress/,zstd.h}
 - LICENSE
+
+- Applied the patch in `thirdparty/zstd/1314.diff` (PR 1314 upstream, already merged). Needed to build on UWP ARM. Can be removed when a new version is released with the patch.
diff --git a/thirdparty/zstd/1314.diff b/thirdparty/zstd/1314.diff
new file mode 100644
index 00000000000..c9f4efadbfc
--- /dev/null
+++ b/thirdparty/zstd/1314.diff
@@ -0,0 +1,13 @@
+diff --git a/common/cpu.h b/common/cpu.h
+index 88e0ebf44..eeb428ad5 100644
+--- a/common/cpu.h
++++ b/common/cpu.h
+@@ -36,7 +36,7 @@ MEM_STATIC ZSTD_cpuid_t ZSTD_cpuid(void) {
+     U32 f1d = 0;
+     U32 f7b = 0;
+     U32 f7c = 0;
+-#ifdef _MSC_VER
++#if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86))
+     int reg[4];
+     __cpuid((int*)reg, 0);
+     {
diff --git a/thirdparty/zstd/common/cpu.h b/thirdparty/zstd/common/cpu.h
index 4eb48e39e10..a109520a333 100644
--- a/thirdparty/zstd/common/cpu.h
+++ b/thirdparty/zstd/common/cpu.h
@@ -36,7 +36,7 @@ MEM_STATIC ZSTD_cpuid_t ZSTD_cpuid(void) {
     U32 f1d = 0;
     U32 f7b = 0;
     U32 f7c = 0;
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86))
     int reg[4];
     __cpuid((int*)reg, 0);
     {