Ver código fonte

Patch zstd to build for UWP ARM

Patch comes from upstream and can be removed when it makes to stable
release.
George Marques 7 anos atrás
pai
commit
fb6fe54058
3 arquivos alterados com 16 adições e 1 exclusões
  1. 2 0
      thirdparty/README.md
  2. 13 0
      thirdparty/zstd/1314.diff
  3. 1 1
      thirdparty/zstd/common/cpu.h

+ 2 - 0
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.

+ 13 - 0
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);
+     {

+ 1 - 1
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);
     {