configure: Run AVX test only with 64 bit compiler

The current implementation for AVX uses 64 bit code, so run the AVX test only when the compiler is a 64 bit compiler. This fixes the broken implementation for 32 bit hosts which provide AVX but call the stub of DotProductAVX. Simplify also the conditional code for AVX_OPT and SSE41_OPT. Signed-off-by: Stefan Weil <[email protected]>
tesseract-ocr · Feb 2, 2017 · b7ef3e0 · b7ef3e0
1 parent bd45b3a
commit b7ef3e0
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/configure.ac b/configure.ac
@@ -118,12 +118,18 @@ esac
 ## Checks for supported compiler options.
 AM_CONDITIONAL([AVX_OPT], false)
 AM_CONDITIONAL([SSE41_OPT], false)
-AX_CHECK_COMPILE_FLAG([-mavx], [avx=1], [avx=0])
-AX_CHECK_COMPILE_FLAG([-msse4.1], [sse41=1], [sse41=0])
-if test x$avx = x1; then
-    AM_CONDITIONAL([AVX_OPT], true)
+
+# The current implementation for AVX uses 64 bit code.
+AC_CHECK_SIZEOF([void *])
+if test "$ac_cv_sizeof_void_p" = "8"; then
+    AX_CHECK_COMPILE_FLAG([-mavx], [avx=true], [avx=false])
+    if $avx; then
+        AM_CONDITIONAL([AVX_OPT], true)
+    fi
 fi
-if test x$sse41 = x1; then
+
+AX_CHECK_COMPILE_FLAG([-msse4.1], [sse41=true], [sse41=false])
+if $sse41; then
     AM_CONDITIONAL([SSE41_OPT], true)
 fi