From 91d6a569317684f01737ecd1f24ef1a663430146 Mon Sep 17 00:00:00 2001
From: Andrew <16061801+brada4@users.noreply.github.com>
Date: Tue, 11 Dec 2018 22:33:36 +0100
Subject: [PATCH] reduce scope of avx512 cflags

---
 Makefile.x86_64 | 28 ++++++++++++++--------------
 getarch.c       |  9 +++++++++
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/Makefile.x86_64 b/Makefile.x86_64
index f2647fb7d..c44eb0e95 100644
--- a/Makefile.x86_64
+++ b/Makefile.x86_64
@@ -8,20 +8,20 @@ endif
 endif
 endif
 
-ifeq ($(CORE), SKYLAKEX)
-ifndef NO_AVX512
-CCOMMON_OPT += -march=skylake-avx512
-FCOMMON_OPT += -march=skylake-avx512
-ifeq ($(OSNAME), CYGWIN_NT)
-CCOMMON_OPT += -fno-asynchronous-unwind-tables
-endif
-ifeq ($(OSNAME), WINNT)
-ifeq ($(C_COMPILER), GCC)
-CCOMMON_OPT += -fno-asynchronous-unwind-tables
-endif
-endif
-endif
-endif
+# ifeq ($(CORE), SKYLAKEX)
+# ifndef NO_AVX512
+# CCOMMON_OPT += -march=skylake-avx512
+# FCOMMON_OPT += -march=skylake-avx512
+# ifeq ($(OSNAME), CYGWIN_NT)
+# CCOMMON_OPT += -fno-asynchronous-unwind-tables
+# endif
+# ifeq ($(OSNAME), WINNT)
+# ifeq ($(C_COMPILER), GCC)
+# CCOMMON_OPT += -fno-asynchronous-unwind-tables
+# endif
+# endif
+# endif
+# endif
 
 ifeq ($(OSNAME), Interix)
 ARFLAGS		= -m x64
diff --git a/getarch.c b/getarch.c
index 146f1f36f..909d22005 100644
--- a/getarch.c
+++ b/getarch.c
@@ -331,12 +331,21 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define FORCE_INTEL
 #define ARCHITECTURE    "X86"
 #define SUBARCHITECTURE "SKYLAKEX"
+#ifndef WINNT
 #define ARCHCONFIG   "-DSKYLAKEX " \
 		     "-DL1_DATA_SIZE=32768 -DL1_DATA_LINESIZE=64 " \
 		     "-DL2_SIZE=262144 -DL2_LINESIZE=64 " \
 		     "-DDTB_DEFAULT_ENTRIES=64 -DDTB_SIZE=4096 " \
 		     "-DHAVE_CMOV -DHAVE_MMX -DHAVE_SSE -DHAVE_SSE2 -DHAVE_SSE3 -DHAVE_SSSE3 -DHAVE_SSE4_1 -DHAVE_SSE4_2 -DHAVE_AVX " \
                      "-DFMA3 -DHAVE_AVX512VL -march=skylake-avx512"
+#else
+#define ARCHCONFIG   "-DSKYLAKEX " \
+                     "-DL1_DATA_SIZE=32768 -DL1_DATA_LINESIZE=64 " \
+                     "-DL2_SIZE=262144 -DL2_LINESIZE=64 " \
+                     "-DDTB_DEFAULT_ENTRIES=64 -DDTB_SIZE=4096 " \
+                     "-DHAVE_CMOV -DHAVE_MMX -DHAVE_SSE -DHAVE_SSE2 -DHAVE_SSE3 -DHAVE_SSSE3 -DHAVE_SSE4_1 -DHAVE_SSE4_2 -DHAVE_AVX " \
+                     "-DFMA3 -DHAVE_AVX512VL -march=skylake-avx512 -fno-asynchronous-unwind-tables"
+#endif
 #define LIBNAME   "skylakex"
 #define CORENAME  "SKYLAKEX"
 #endif