diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-13 11:04:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-13 11:04:28 +0200 |
| commit | afb486e7c95c06b9611bab0d5df669acd81b6da4 (patch) | |
| tree | 57a266f64c4b8da8ca7055513bc6b72a48305d90 /thirdparty | |
| parent | 3d0638b8e97a56e7c2bc74501781f21f35d43552 (diff) | |
| parent | fb6fe5405859e5169174729dfe79aad66084288e (diff) | |
Merge pull request #22015 from vnen/uwp-arm-zstd
Patch zstd to build for UWP ARM
Diffstat (limited to 'thirdparty')
| -rw-r--r-- | thirdparty/README.md | 2 | ||||
| -rw-r--r-- | thirdparty/zstd/1314.diff | 13 | ||||
| -rw-r--r-- | thirdparty/zstd/common/cpu.h | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/thirdparty/README.md b/thirdparty/README.md index 2334cbfe96..55f6a71179 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -525,3 +525,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 0000000000..c9f4efadbf --- /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 4eb48e39e1..a109520a33 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); { |