Musl: fix "selected processor does not support pmull"

bblanchon · Jul 24, 2024 · ffcfbab · ffcfbab
1 parent 5fe9041
commit ffcfbab
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/patches/musl/zlib.patch 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 <arm_acle.h>
+ #include <arm_neon.h>
+-#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
@@ -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"
     ;;