From: Daniel Axtens <dja@axtens.net>
Date: Fri, 1 May 2015 05:56:21 +0000 (+1000)
Subject: x86: Do not try X86_QUICK_STRATEGY without HAVE_SSE2_INTRIN
X-Git-Tag: 1.9.9-b1~868^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39847e646c6e7c36412bcf69e46d55bc6e30544e;p=thirdparty%2Fzlib-ng.git

x86: Do not try X86_QUICK_STRATEGY without HAVE_SSE2_INTRIN

QUICK depends on fill_window_sse, and fails to link without it.
Therefore, disable QUICK_STRATEGY if we lack SSE2 support.

This could easily be worked around by making the QUICK code
fall back to regular fill_window, but it's probably not important:
if you care about speed you probably have SSE2.

Signed-off-by: Daniel Axtens <dja@axtens.net>
---

diff --git a/configure b/configure
index 88479be12..53187203f 100755
--- a/configure
+++ b/configure
@@ -630,7 +630,8 @@ case "${ARCH}" in
             fi
 
 	    # Enable deflate_quick at level 1?
-            if test $without_new_strategies -eq 0; then
+	    # requires SSE2: code uses fill_window_sse
+            if test ${HAVE_SSE2_INTRIN} -eq 1 && test $without_new_strategies -eq 0; then
                 CFLAGS="${CFLAGS} -DX86_QUICK_STRATEGY"
                 SFLAGS="${SFLAGS} -DX86_QUICK_STRATEGY"