From: Mika Lindqvist <postmaster@raasu.org>
Date: Fri, 23 Mar 2018 11:01:07 +0000 (+0200)
Subject: [ARM] Disable ACLE support if uname returns "eabi".
X-Git-Tag: 1.9.9-b1~632
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db67b7c2bdb55cd8e442a74276b4a031c48f4d6d;p=thirdparty%2Fzlib-ng.git

[ARM] Disable ACLE support if uname returns "eabi".
* Warn if current processor doesn't support ACLE or NEON.
---

diff --git a/configure b/configure
index 8d64be516..9de84b975 100755
--- a/configure
+++ b/configure
@@ -266,7 +266,12 @@ if test "$gcc" -eq 1 && ($cc $CFLAGS -c $test.c) >> configure.log 2>&1; then
       fi ;;
     arm)
       if test "${uname}" = "eabi"; then
+        # No ACLE support
         uname=arm
+        if test $buildacle -eq 1; then
+          echo ACLE support not available
+          buildacle=0
+        fi
       fi
       if test $buildacle -eq 1; then
         if test $native -eq 0; then
@@ -867,16 +872,37 @@ case "${ARCH}" in
         esac
 
         case "${ARCH}" in
+            armv[345]*)
+                if test $buildacle -eq 1; then
+                    echo ACLE support not available
+                fi
+
+                if test $buildneon -eq 1; then
+                    echo NEON support not available
+                fi
+            ;;
             armv6l | armv6hl)
                 # Tests done on Raspberry pi (armv6hl) indicate that UNALIGNED_OK and UNROLL_LESS both
                 # provide performance improvements, totaling about 1.5% for the two.
                 CFLAGS="${CFLAGS} -DUNALIGNED_OK -DUNROLL_LESS"
                 SFLAGS="${SFLAGS} -DUNALIGNED_OK -DUNROLL_LESS"
+
+                if test $buildacle -eq 1; then
+                    echo ACLE support not available
+                fi
+
+                if test $buildneon -eq 1; then
+                    echo NEON support not available
+                fi
             ;;
             arm | armv7*)
                 CFLAGS="${CFLAGS} -DUNALIGNED_OK -DUNROLL_LESS"
                 SFLAGS="${SFLAGS} -DUNALIGNED_OK -DUNROLL_LESS"
 
+                if test $buildacle -eq 1; then
+                    echo ACLE support not available
+                fi
+
                 if test $buildneon -eq 1; then
                     CFLAGS="${CFLAGS} ${floatabi} -mfpu=neon -DARM_NEON_ADLER32"
                     SFLAGS="${SFLAGS} ${floatabi} -mfpu=neon -DARM_NEON_ADLER32"
@@ -889,6 +915,10 @@ case "${ARCH}" in
                 CFLAGS="${CFLAGS} -DUNALIGNED_OK -DUNROLL_LESS"
                 SFLAGS="${SFLAGS} -DUNALIGNED_OK -DUNROLL_LESS"
 
+                if test $buildacle -eq 1; then
+                    echo ACLE support not available
+                fi
+
                 if test $buildneon -eq 1; then
                     CFLAGS="${CFLAGS} ${floatabi} -DARM_NEON_ADLER32"
                     SFLAGS="${SFLAGS} ${floatabi} -DARM_NEON_ADLER32"