The branch, master has been updated via 643b9d01 Change SIMD back to disabled unless requested. via 2c681b87 Some fixes after compiling on cygwin. from e44e79ce Update config.guess & config.sub.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 643b9d0183d240735de14a06d682018977634b0e Author: Wayne Davison <wa...@opencoder.net> Date: Tue Jun 16 22:59:54 2020 -0700 Change SIMD back to disabled unless requested. commit 2c681b874e181bac740d208daf158fd76d9023b6 Author: Wayne Davison <wa...@opencoder.net> Date: Tue Jun 16 22:40:55 2020 -0700 Some fixes after compiling on cygwin. ----------------------------------------------------------------------- Summary of changes: .github/workflows/ccpp.yml | 2 +- Makefile.in | 1 - clientname.c | 2 +- configure.ac | 13 ++++--------- options.c | 7 ++++--- rsync.c | 12 ++++++------ 6 files changed, 16 insertions(+), 21 deletions(-) Changeset truncated at 500 lines: diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 0fca1602..f42b09dd 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 + 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 f2173322..d2329cef 100644 --- 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/clientname.c b/clientname.c index 05f14ed7..1e85c84e 100644 --- a/clientname.c +++ b/clientname.c @@ -388,7 +388,7 @@ static int compare_addrinfo_sockaddr(const struct addrinfo *ai, const struct soc sin1 = (const struct sockaddr_in6 *) ss; sin2 = (const struct sockaddr_in6 *) ai->ai_addr; - if (ai->ai_addrlen < sizeof (struct sockaddr_in6)) { + if (ai->ai_addrlen < (int)sizeof (struct sockaddr_in6)) { rprintf(FLOG, "%s: too short sockaddr_in6; length=%d\n", fn, (int)ai->ai_addrlen); return 1; diff --git a/configure.ac b/configure.ac index d8f44d6b..f1f075df 100644 --- 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 diff --git a/options.c b/options.c index 787222a1..2e8731ab 100644 --- a/options.c +++ b/options.c @@ -200,8 +200,11 @@ int list_only = 0; char *batch_name = NULL; int need_unsorted_flist = 0; +char *iconv_opt = #ifdef ICONV_OPTION -char *iconv_opt = ICONV_OPTION; + ICONV_OPTION; +#else + NULL; #endif struct chmod_mode_struct *chmod_modes = NULL; @@ -308,9 +311,7 @@ static int refused_partial, refused_progress, refused_delete_before; static int refused_delete_during; static int refused_inplace, refused_no_iconv; static BOOL usermap_via_chown, groupmap_via_chown; -#ifdef HAVE_SETVBUF static char *outbuf_mode; -#endif static char *bwlimit_arg, *max_size_arg, *min_size_arg; static char tmp_partialdir[] = ".~tmp~"; diff --git a/rsync.c b/rsync.c index 2a8f39cc..e091cbef 100644 --- a/rsync.c +++ b/rsync.c @@ -57,12 +57,6 @@ extern struct chmod_mode_struct *daemon_chmod_modes; extern char *iconv_opt; #endif -#ifdef ICONV_CONST -iconv_t ic_chck = (iconv_t)-1; -# ifdef ICONV_OPTION -iconv_t ic_send = (iconv_t)-1, ic_recv = (iconv_t)-1; -# endif - #define UPDATED_OWNER (1<<0) #define UPDATED_GROUP (1<<1) #define UPDATED_MTIME (1<<2) @@ -72,6 +66,12 @@ iconv_t ic_send = (iconv_t)-1, ic_recv = (iconv_t)-1; #define UPDATED_TIMES (UPDATED_MTIME|UPDATED_ATIME) +#ifdef ICONV_CONST +iconv_t ic_chck = (iconv_t)-1; +# ifdef ICONV_OPTION +iconv_t ic_send = (iconv_t)-1, ic_recv = (iconv_t)-1; +# endif + static const char *default_charset(void) { # if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET -- The rsync repository. _______________________________________________ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs