]> git.ipfire.org Git - thirdparty/zlib-ng.git/commitdiff
x86: Do not try X86_QUICK_STRATEGY without HAVE_SSE2_INTRIN
authorDaniel Axtens <dja@axtens.net>
Fri, 1 May 2015 05:56:21 +0000 (15:56 +1000)
committerDaniel Axtens <dja@axtens.net>
Fri, 1 May 2015 05:56:24 +0000 (15:56 +1000)
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>
configure

index 88479be123abc767df1dcd04055e62f50634c136..53187203f52e727d3a717347da2ffc9186da61bd 100755 (executable)
--- 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"