summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWayne Davison <wayne@opencoder.net>2020-06-18 16:27:05 -0700
committerWayne Davison <wayne@opencoder.net>2020-06-18 16:28:28 -0700
commit7fd24bef0fb5d3f7e07af433cfbdea0f00becdbc (patch)
treec15cb4bd607aa75005eb109f276a149bc0af34e9
parent1a9a184145b93614389f227657e63c9e899e4dde (diff)
downloadrsync-7fd24bef0fb5d3f7e07af433cfbdea0f00becdbc.tar.gz
Make SIMD enabled by default again (for x86_64)
-rw-r--r--.github/workflows/ccpp.yml2
-rw-r--r--NEWS.md4
-rw-r--r--configure.ac10
3 files changed, 8 insertions, 8 deletions
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index f42b09dd..0fca1602 100644
--- 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 --enable-simd
+ run: ./configure --with-included-popt --with-included-zlib
- name: make
run: make
- name: version-summary
diff --git a/NEWS.md b/NEWS.md
index f308460b..b4d7d13e 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -170,8 +170,8 @@ Protocol: 31 (unchanged)
algorithms, extra checksum algorithms, and allow use of openssl's crypto
lib for (potentially) faster MD4/MD5 checksums.
- - Add _build_ dependency for g++ on x86_64 systems **if** you want to enable
- the SIMD checksum optimizations (via `configure --enable-simd`).
+ - Add _build_ dependency for g++ or clang++ on x86_64 systems to enable the
+ SIMD checksum optimizations.
- Add _build_ dependency for _either_ python3-cmarkcfm or python3-commonmark
to allow for patching of man pages or building a git release. This is not
diff --git a/configure.ac b/configure.ac
index a01dd701..3330eb90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -198,9 +198,9 @@ SIMD=
AC_MSG_CHECKING([whether to enable SIMD optimizations])
AC_ARG_ENABLE(simd,
- AS_HELP_STRING([--enable-simd],[enable SIMD optimizations (requires c++)]))
+ AS_HELP_STRING([--disable-simd],[disable SIMD optimizations (requires c++)]))
-if test x"$enable_simd" = x"yes"; then
+if test x"$enable_simd" != x"no"; then
# For x86-64 SIMD, g++ >=5 or clang++ >=7 is required
if test x"$build_cpu" = x"x86_64"; then
if test x"$CXX" != x""; then
@@ -228,13 +228,13 @@ if test x"$enable_simd" = x"yes"; then
else
AC_MSG_RESULT(error)
AC_MSG_ERROR([Failed to find g++ >=5 or clang++ >=7 for SIMD optimizations.
-Omit --enable-simd to continue without it. ($CXX, $CXX_VERSION)])
+Specify --disable-simd to continue without it. ($CXX, $CXX_VERSION)])
fi
fi
- else
+ elif test x"$enable_simd" = x"yes"; then
AC_MSG_RESULT(unavailable)
AC_MSG_ERROR(The SIMD optimizations are currently x86_64 only.
-Omit --enable-simd to continue.)
+Omit --enable-simd to continue without it.)
fi
fi