The branch, master has been updated via dfa34b47 Some more docs/news changes. via e9e9fd0c Use an ssse3 target instead of an inline declaration. via 7e95ba87 Add -fno-slp-vectorize to clang++. via 66fd34ed Mention atimes & protected-args in capabilities. via f8c6f9f4 Tweak the NEWS. from e6cfebb5 We only need one capability marked with a "*".
https://git.samba.org/?p=rsync.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit dfa34b479270de6a7db2737d1f232344199292f6 Author: Wayne Davison <wa...@opencoder.net> Date: Sun Jun 21 08:40:23 2020 -0700 Some more docs/news changes. - Mention the -VV behavior. - Mention how the protect-args default is presented in -V list. commit e9e9fd0ccafd113fa0d3c956669a50e95e5424bf Author: Wayne Davison <wa...@opencoder.net> Date: Sun Jun 21 08:28:49 2020 -0700 Use an ssse3 target instead of an inline declaration. commit 7e95ba87878dc053355ef3829aa20a24060cd4f6 Author: Wayne Davison <wa...@opencoder.net> Date: Sun Jun 21 08:05:19 2020 -0700 Add -fno-slp-vectorize to clang++. commit 66fd34ed848b5cc4a14cd2bdd52037789f1411a5 Author: Wayne Davison <wa...@opencoder.net> Date: Sat Jun 20 23:24:59 2020 -0700 Mention atimes & protected-args in capabilities. commit f8c6f9f4f3d9e7b5cfb72e9fafeb823c1b5bb624 Author: Wayne Davison <wa...@opencoder.net> Date: Sat Jun 20 23:15:22 2020 -0700 Tweak the NEWS. ----------------------------------------------------------------------- Summary of changes: NEWS.md | 16 +++++++++++++--- configure.ac | 5 ++++- options.c | 9 +++++++++ rsync.1.md | 6 ++++++ 4 files changed, 32 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/NEWS.md b/NEWS.md index 705c47b4..0e4ad855 100644 --- a/NEWS.md +++ b/NEWS.md @@ -7,7 +7,9 @@ Protocol: 31 (unchanged) ### BUG FIXES: - Fixed a build issue with the MD5 assembly-language code by removing some - advanced direcives and using the preprocessor to ensure that if the code is + advanced direcives. + + - Use the preprocessor with the asm file to ensure that if the code is unneeded, it doesn't get built. - Make sure that the asm code doesn't make the stack get set to executable. @@ -15,10 +17,18 @@ Protocol: 31 (unchanged) - Avoid some build issues with the SIMD code, including avoiding a clang++ core dump when `-g` is combined with `-O2`. - - Fix an issue with the md2man code when building is an external dir. + - Fix an issue with the md2man code when building in an external dir. ### ENHANCEMENTS: - - None. + - Added "atimes" to the capabilities list that `--version` outputs. + + - Mention either "default protect-args" or "optional protect-args" in the + `--version` capabilities depending on how rsync was configured. + + - Some info on optimizations was elided from the `--version` capabilities + since they aren't really user-facing capabilities. You can get the info + back (plus the status of a couple extra optimizations) by repeating the + `--version` option (e.g. `-VV`). ------------------------------------------------------------------------------ diff --git a/configure.ac b/configure.ac index cc6769ab..5e58c7d7 100644 --- a/configure.ac +++ b/configure.ac @@ -217,7 +217,7 @@ __attribute__ ((target("sse2"))) int test_sse2(int x) { return x; } __attribute__ ((target("avx2"))) int test_avx2(int x) { return x; } typedef long long __m128i_u __attribute__((__vector_size__(16), __may_alias__, __aligned__(1))); typedef long long __m256i_u __attribute__((__vector_size__(32), __may_alias__, __aligned__(1))); -inline void more_testing(char* buf, int len) +__attribute__ ((target("ssse3"))) void more_testing(char* buf, int len) { int i; for (i = 0; i < (len-32); i+=32) { @@ -249,6 +249,9 @@ if test x"$SIMD" != x""; then SIMD='$(SIMD_'"$SIMD)" # We only use c++ for its target attribute dispatching, disable unneeded bulky features CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-rtti" + case "$CXX" in + *clang*) CXXFLAGS="$CXXFLAGS -fno-slp-vectorize" ;; # avoid a performance hit + esac else AC_MSG_RESULT(no) fi diff --git a/options.c b/options.c index bb0e8638..6c99dd4b 100644 --- a/options.c +++ b/options.c @@ -603,6 +603,8 @@ static void print_capabilities(enum logcode f) #endif "IPv6", + "atimes", + "batchfiles", #ifndef HAVE_FTRUNCATE @@ -625,6 +627,13 @@ static void print_capabilities(enum logcode f) #endif "xattrs", +#ifdef RSYNC_USE_PROTECTED_ARGS + "default " +#else + "optional " +#endif + "protect-args", + #ifndef ICONV_OPTION "no " #endif diff --git a/rsync.1.md b/rsync.1.md index 57f750af..137c25a5 100644 --- a/rsync.1.md +++ b/rsync.1.md @@ -518,6 +518,9 @@ your home directory (remove the '=' for that). list of compression algorithms, a list of compiled-in capabilities, a link to the rsync web site, and some license/copyright info. + Repeat the option (`-VV`) to include some optimization info at the end of + the capabilities list. + 0. `--verbose`, `-v` This option increases the amount of information you are given during the @@ -2068,6 +2071,9 @@ your home directory (remove the '=' for that). Rsync can also be configured (at build time) to have this option enabled by default (with is overridden by both the environment and the command-line). + Run `rsync -V` to check if this is the case, as it will display "default + protect-args" or "optional protect-args" depending on how it was compiled. + This option will eventually become a new default setting at some as-yet-undetermined point in the future. -- The rsync repository. _______________________________________________ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs