oasis

commit: f948d62370e0180d7db4a2e78eb62c97b42d239d
parent 9a9f25b61bf9b8bd5c416c5aa7c9740358dba308
Author: Michael Forney <mforney@mforney.org>
Date:   Sat, 15 Jun 2019 20:34:21 -0700

zstd: Only use __asm__ on GNU-compatible compilers

Diffstat:
M
.gitmodules
1
+
A
pkg/zstd/patch/0001-Only-use-__asm__-on-GNU-compatible-compilers.patch
25
+++++++++++++++++++++++++
M
pkg/zstd/ver
2
+-

3 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/.gitmodules b/.gitmodules
@@ -267,3 +267,4 @@
 [submodule "pkg/zstd/src"]
 	path = pkg/zstd/src
 	url = https://github.com/facebook/zstd
+	ignore = all
diff --git a/pkg/zstd/patch/0001-Only-use-__asm__-on-GNU-compatible-compilers.patch b/pkg/zstd/patch/0001-Only-use-__asm__-on-GNU-compatible-compilers.patch
@@ -0,0 +1,25 @@
+From 6900865fb61bba4d91472d845118e0ffac4f7e39 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Mon, 10 Jun 2019 01:47:01 -0700
+Subject: [PATCH] Only use __asm__ on GNU-compatible compilers
+
+---
+ lib/common/cpu.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/common/cpu.h b/lib/common/cpu.h
+index 5f0923fc..76267fc3 100644
+--- a/lib/common/cpu.h
++++ b/lib/common/cpu.h
+@@ -84,7 +84,7 @@ MEM_STATIC ZSTD_cpuid_t ZSTD_cpuid(void) {
+           : "a"(7), "c"(0)
+           : "edx");
+     }
+-#elif defined(__x86_64__) || defined(_M_X64) || defined(__i386__)
++#elif (defined(__x86_64__) || defined(_M_X64) || defined(__i386__)) && defined(__GNUC__)
+     U32 n;
+     __asm__("cpuid" : "=a"(n) : "a"(0) : "ebx", "ecx", "edx");
+     if (n >= 1) {
+-- 
+2.20.1
+
diff --git a/pkg/zstd/ver b/pkg/zstd/ver
@@ -1 +1 @@
-1.4.0 r0
+1.4.0 r1