From 48f83820fb8c57d6a64579ad3efb9566a185f425 Mon Sep 17 00:00:00 2001 From: BtbN Date: Fri, 27 May 2022 20:49:17 +0200 Subject: [PATCH] Fix unaligned stack access by highway in libjxl --- scripts.d/50-libjxl/50-libjxl.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh index 87062de..67b5fcb 100755 --- a/scripts.d/50-libjxl/50-libjxl.sh +++ b/scripts.d/50-libjxl/50-libjxl.sh @@ -19,11 +19,12 @@ ffbuild_dockerbuild() { if [[ $TARGET == linux* ]]; then # our glibc is too old(<2.25), and their detection fails for some reason export CXXFLAGS="$CXXFLAGS -DVQSORT_GETRANDOM=0 -DVQSORT_SECURE_SEED=0" + elif [[ $TARGET == win* ]]; then + # Fix AVX2 related crash due to unaligned stack memory + export CXXFLAGS="$CXXFLAGS -Wa,-muse-unaligned-vector-move" + export CFLAGS="$CFLAGS -Wa,-muse-unaligned-vector-move" fi - export CXXFLAGS="$CXXFLAGS -DHWY_COMPILE_ONLY_SCALAR" - export CFLAGS="$CFLAGS -DHWY_COMPILE_ONLY_SCALAR" - cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ -DBUILD_SHARED_LIBS=OFF -DJPEGXL_STATIC=OFF -DJPEGXL_ENABLE_TOOLS=OFF -DJPEGXL_ENABLE_VIEWERS=OFF -DJPEGXL_EMSCRIPTEN=OFF -DJPEGXL_ENABLE_DOXYGEN=OFF \ -DBUILD_TESTING=OFF -DJPEGXL_ENABLE_EXAMPLES=OFF -DJPEGXL_ENABLE_MANPAGES=OFF -DJPEGXL_ENABLE_JNI=OFF -DJPEGXL_ENABLE_PLUGINS=OFF \