Change SIMD back to disabled unless requested.

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 0fca160213d3352c4a0513c3657b403b23a3127b..f42b09dd068c876ee5a5f9ab7a49f055bb6627b7 100644 (file)
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -18,7 +18,7 @@ jobs:
     - name: prepare-source
       run: ./prepare-source
     - name: configure
-      run: ./configure --with-included-popt --with-included-zlib
+      run: ./configure --with-included-popt --with-included-zlib --enable-simd
     - name: make
       run: make
     - name: version-summary

diff --git a/Makefile.in b/Makefile.in
index f217332203987f69e18ab8db68bc20ba2a5eba95..d2329cef34fe6034a680a9ebe568f4b06e3a6f90 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -125,7 +125,6 @@ rounding.h: rounding.c rsync.h proto.h
        @rm -f rounding.out
 
 simd-checksum-x86_64.o: simd-checksum-x86_64.cpp
-       @echo "If this fails to compile and you can't fix it, re-run configure with --disable-simd."
        $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $(srcdir)/simd-checksum-x86_64.cpp
 
 lib/md5-asm-x86_64.o: lib/md5-asm-x86_64.s

diff --git a/configure.ac b/configure.ac
index d8f44d6b381514ed1a64669988f067243acd2573..f1f075df03d5df9a5f1144efd955ebf83c37d98f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -197,9 +197,9 @@ SIMD=
 
 AC_MSG_CHECKING([whether to enable SIMD optimizations])
 AC_ARG_ENABLE(simd,
-    AS_HELP_STRING([--disable-simd],[disable SIMD optimizations (requires g++)]))
+    AS_HELP_STRING([--enable-simd],[enable SIMD optimizations (requires g++)]))
 
-if test x"$enable_simd" != x"no"; then
+if test x"$enable_simd" = x"yes"; then
     # For x86-64 SIMD, g++ is also required
     if test x"$build_cpu" = x"x86_64"; then
        if test x"$CXX" = x"g++"; then
@@ -207,13 +207,8 @@ if test x"$enable_simd" != x"no"; then
            SIMD="$SIMD x86_64"
        else
            AC_MSG_RESULT(no)
-           case "$host_os" in
-           *linux*)
-               AC_MSG_ERROR(Failed to find g++ for SIMD speedups. Use --disable-simd to continue without it.)
-               ;;
-           *)
-               ;;
-           esac
+           AC_MSG_ERROR(Failed to find g++ for SIMD speedups.
+Omit --enable-simd to continue without it.)
        fi
     fi
 fi