Skip to content

build: normalise amd64 optimization object names #1092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
steadytao merged 1 commit into from
Sep 16, 2026
Merged

build: normalise amd64 optimization object names #1092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/freebsd-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ jobs:
pkg install -y bash autotools m4 devel/xxhash zstd liblz4 python3 archivers/liblz4 git
run: |
freebsd-version
./configure --with-rrsync -disable-zstd --disable-md2man --disable-xxhash --disable-lz4 --disable-idn
./configure --with-rrsync \
-disable-zstd --disable-md2man --disable-xxhash --disable-lz4 --disable-idn \
--enable-roll-simd --enable-roll-asm --enable-md5-asm
make
./rsync --version
make check
Expand Down
13 changes: 10 additions & 3 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,13 @@ AC_DEFINE_UNQUOTED(NOBODY_GROUP, "$NOBODY_GROUP", [unprivileged group for unpriv
# rolling-checksum SIMD optimizations
ROLL_SIMD=

# Autoconf reports x86-64 as amd64 on FreeBSD, while the object-variable
# suffixes in Makefile.in use x86_64 on every platform.
asm_cpu="$host_cpu"
if test x"$asm_cpu" = x"amd64"; then
asm_cpu=x86_64
fi

AC_MSG_CHECKING([whether to enable rolling-checksum SIMD optimizations])
AC_ARG_ENABLE(roll-simd,
AS_HELP_STRING([--enable-roll-simd],[enable/disable to control rolling-checksum SIMD optimizations (requires c++)]))
Expand Down Expand Up @@ -315,7 +322,7 @@ if test x"$enable_roll_simd" != x"no"; then
AC_LANG(C)
if test x"$CXX_OK" = x"yes"; then
# AC_MSG_RESULT() is called below.
ROLL_SIMD="$host_cpu"
ROLL_SIMD="$asm_cpu"
elif test x"$enable_roll_simd" = x"yes"; then
AC_MSG_RESULT(error)
AC_MSG_ERROR(The rolling-checksum SIMD compilation test failed.
Expand Down Expand Up @@ -525,7 +532,7 @@ fi

if test x"$enable_md5_asm" != x"no"; then
if test x"$host_cpu" = x"x86_64" || test x"$host_cpu" = x"amd64"; then
MD5_ASM="$host_cpu"
MD5_ASM="$asm_cpu"
elif test x"$enable_md5_asm" = x"yes"; then
AC_MSG_RESULT(unavailable)
AC_MSG_ERROR(The ASM optimizations are currently x86_64|amd64 only.
Expand Down Expand Up @@ -554,7 +561,7 @@ if test x"$ROLL_SIMD" = x""; then
fi

if test x"$enable_roll_asm" = x"yes"; then
ROLL_ASM="$host_cpu"
ROLL_ASM="$asm_cpu"
AC_MSG_RESULT([yes ($ROLL_ASM)])
AC_DEFINE(USE_ROLL_ASM, 1, [Define to 1 to enable rolling-checksum ASM optimizations (requires --enable-roll-simd)])
ROLL_ASM='$(ROLL_ASM_'"$ROLL_ASM)"
Expand Down
Loading