From: Sebastian Pop <s.pop@samsung.com>
Date: Fri, 1 Mar 2019 14:48:38 +0000 (-0600)
Subject: rename X86_SSE2_FILL_WINDOW to X86_SSE2
X-Git-Tag: 1.9.9-b1~519
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7657d2a546db9b8e812262281776eb864eb5be8;p=thirdparty%2Fzlib-ng.git

rename X86_SSE2_FILL_WINDOW to X86_SSE2
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 02d923f9d..4b2c26220 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -576,7 +576,7 @@ if(WITH_OPTIM)
             endif()
         endif()
         if(HAVE_SSE2_INTRIN)
-            add_definitions(-DX86_SSE2_FILL_WINDOW)
+            add_definitions(-DX86_SSE2)
             set(ZLIB_ARCH_SRCS ${ZLIB_ARCH_SRCS} ${ARCHDIR}/fill_window_sse.c)
             if(NOT ${ARCH} MATCHES "x86_64")
                 add_intrinsics_option("${SSE2FLAG}")
diff --git a/arch/x86/fill_window_sse.c b/arch/x86/fill_window_sse.c
index 745ecebff..1c0f863bd 100644
--- a/arch/x86/fill_window_sse.c
+++ b/arch/x86/fill_window_sse.c
@@ -8,7 +8,7 @@
  *
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
-#ifdef X86_SSE2_FILL_WINDOW
+#ifdef X86_SSE2
 
 #include "zbuild.h"
 #include <immintrin.h>
diff --git a/configure b/configure
index 5b3c83636..13942343c 100755
--- a/configure
+++ b/configure
@@ -968,8 +968,8 @@ case "${ARCH}" in
             ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} x86.lo"
 
             if test ${HAVE_SSE2_INTRIN} -eq 1; then
-                CFLAGS="${CFLAGS} -DX86_SSE2_FILL_WINDOW"
-                SFLAGS="${SFLAGS} -DX86_SSE2_FILL_WINDOW"
+                CFLAGS="${CFLAGS} -DX86_SSE2"
+                SFLAGS="${SFLAGS} -DX86_SSE2"
                 ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} fill_window_sse.o"
                 ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} fill_window_sse.lo"
 
@@ -1013,8 +1013,8 @@ case "${ARCH}" in
 
         # Enable arch-specific optimizations?
         if test $without_optimizations -eq 0; then
-            CFLAGS="${CFLAGS} -DX86_CPUID -DX86_SSE2_FILL_WINDOW -DX86_SSE4_2_CRC_HASH"
-            SFLAGS="${SFLAGS} -DX86_CPUID -DX86_SSE2_FILL_WINDOW -DX86_SSE4_2_CRC_HASH"
+            CFLAGS="${CFLAGS} -DX86_CPUID -DX86_SSE2 -DX86_SSE4_2_CRC_HASH"
+            SFLAGS="${SFLAGS} -DX86_CPUID -DX86_SSE2 -DX86_SSE4_2_CRC_HASH"
 
             ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} x86.o fill_window_sse.o insert_string_sse.o"
             ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} x86.lo fill_window_sse.lo insert_string_sse.lo"
diff --git a/functable.c b/functable.c
index 91a2a2061..e5dfad84d 100644
--- a/functable.c
+++ b/functable.c
@@ -18,7 +18,7 @@ extern Pos insert_string_acle(deflate_state *const s, const Pos str, unsigned in
 #endif
 
 /* fill_window */
-#ifdef X86_SSE2_FILL_WINDOW
+#ifdef X86_SSE2
 extern void fill_window_sse(deflate_state *s);
 #elif defined(__arm__) || defined(__aarch64__) || defined(_M_ARM)
 extern void fill_window_arm(deflate_state *s);
@@ -72,7 +72,7 @@ ZLIB_INTERNAL void fill_window_stub(deflate_state *s) {
     // Initialize default
     functable.fill_window=&fill_window_c;
 
-    #ifdef X86_SSE2_FILL_WINDOW
+    #ifdef X86_SSE2
     # ifndef X86_NOCHECK_SSE2
     if (x86_cpu_has_sse2)
     # endif
diff --git a/win32/Makefile.msc b/win32/Makefile.msc
index 83b20445e..0c84a14ad 100644
--- a/win32/Makefile.msc
+++ b/win32/Makefile.msc
@@ -23,7 +23,7 @@ AR = lib
 RC = rc
 CP = copy /y
 CFLAGS  = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC)
-WFLAGS  = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DX86_PCLMULQDQ_CRC -DX86_SSE2_FILL_WINDOW -DX86_CPUID -DX86_SSE4_2_CRC_HASH -DUNALIGNED_OK -DX86_QUICK_STRATEGY
+WFLAGS  = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DX86_PCLMULQDQ_CRC -DX86_SSE2 -DX86_CPUID -DX86_SSE4_2_CRC_HASH -DUNALIGNED_OK -DX86_QUICK_STRATEGY
 LDFLAGS = -nologo -debug -incremental:no -opt:ref -manifest
 ARFLAGS = -nologo
 RCFLAGS = /dWIN32 /r