From ffcfbabef63069dfb1b423db88adeb6ded2d60b2 Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Wed, 24 Jul 2024 16:00:44 +0000 Subject: [PATCH] Musl: fix "selected processor does not support `pmull`" --- patches/musl/zlib.patch | 13 +++++++++++++ steps/03-patch.sh | 1 + 2 files changed, 14 insertions(+) create mode 100644 patches/musl/zlib.patch diff --git a/patches/musl/zlib.patch b/patches/musl/zlib.patch new file mode 100644 index 00000000..95f0a9c0 --- /dev/null +++ b/patches/musl/zlib.patch @@ -0,0 +1,13 @@ +diff --git a/crc32_simd.c b/crc32_simd.c +index cbe9739..4d01b1b 100644 +--- a/crc32_simd.c ++++ b/crc32_simd.c +@@ -398,7 +398,7 @@ uint32_t ZLIB_INTERNAL crc32_sse42_simd_( /* SSE4.2+PCLMUL */ + */ + #include + #include +-#define TARGET_ARMV8_WITH_CRC __attribute__((target("arch=armv8-a+crc"))) ++#define TARGET_ARMV8_WITH_CRC + #else // !defined(__GNUC__) && !defined(_aarch64__) + #error ARM CRC32 SIMD extensions only supported for Clang and GCC + #endif diff --git a/steps/03-patch.sh b/steps/03-patch.sh index c8f29351..d3edc8e3 100755 --- a/steps/03-patch.sh +++ b/steps/03-patch.sh @@ -45,6 +45,7 @@ esac case "$TARGET_LIBC" in musl) git -C build apply -v "$PATCHES/musl/build.patch" + git -C third_party/zlib apply -v "$PATCHES/musl/zlib.patch" mkdir -p "build/toolchain/linux/musl" cp "$PATCHES/musl/toolchain.gn" "build/toolchain/linux/musl/BUILD.gn" ;;