From: Sebastian Pop <s.pop@samsung.com>
Date: Wed, 2 Jan 2019 21:12:57 +0000 (-0600)
Subject: remove -DX86
X-Git-Tag: 1.9.9-b1~544
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d9edaf67e844303052940efa0fe9cb98cf3b50e;p=thirdparty%2Fzlib-ng.git

remove -DX86
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 59d8185c..67b1dc5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -493,7 +493,7 @@ elseif("${ARCH}" MATCHES "aarch64")
     add_definitions(-DUNALIGNED_OK)
 elseif("${ARCH}" MATCHES "i[3-6]86")
     set(ARCHDIR "arch/x86")
-    add_definitions(-DX86 -DUNALIGNED_OK)
+    add_definitions(-DUNALIGNED_OK)
     add_feature_info(SSE2 1 "Support the SSE2 instruction set, using \"${SSE2FLAG}\"")
 else()
     message(STATUS "No optimized architecture: using ${ARCHDIR}")
diff --git a/arch/x86/deflate_quick.c b/arch/x86/deflate_quick.c
index 31118a46..3f88736e 100644
--- a/arch/x86/deflate_quick.c
+++ b/arch/x86/deflate_quick.c
@@ -92,11 +92,11 @@ static inline long compare258(const unsigned char *const src0, const unsigned ch
         "cmp        $256 + 16, %[ax]\n\t"
         "jb         1b\n\t"
 
-#ifdef X86
+# if !defined(__x86_64)
         "movzwl     -16(%[src0], %[ax]), %[dx]\n\t"
-#else
+# else
         "movzwq     -16(%[src0], %[ax]), %[dx]\n\t"
-#endif
+# endif
         "xorw       -16(%[src1], %[ax]), %%dx\n\t"
         "jnz        3f\n\t"
 
diff --git a/configure b/configure
index 880bd1c2..24cfa987 100755
--- a/configure
+++ b/configure
@@ -950,8 +950,8 @@ case "${ARCH}" in
     i386 | i486 | i586 | i686)
         ARCHDIR=arch/x86
 
-        CFLAGS="${CFLAGS} -DX86 -DUNALIGNED_OK"
-        SFLAGS="${SFLAGS} -DX86 -DUNALIGNED_OK"
+        CFLAGS="${CFLAGS} -DUNALIGNED_OK"
+        SFLAGS="${SFLAGS} -DUNALIGNED_OK"
 
         # Enable arch-specific optimizations?
         if test $without_optimizations -eq 0; then