talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

ocamlPackages.ocaml_intrinsics: fix ARM CRC32 intrinsics

Browse Source 
This patch is needed because of an issue with the aarch64 CRC32 intrinsics that was introduced with ocaml_intrinsics v0.17. It should be removed as soon as https://github.com/janestreet/ocaml_intrinsics/pull/11 is merged.
This commit is contained in:
alyaeanyx 2025-05-18 16:09:22 +02:00
parent 4b7dfb442f
commit 4eb57ebe92
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/ocaml-modules/janestreet/0.17.nix
View File

@ -937,6 +937,13 @@ with self;
dune-configurator
ocaml_intrinsics_kernel
];
patches = [
# This patch is needed because of an issue with the aarch64 CRC32
# intrinsics that was introduced with ocaml_intrinsics v0.17. It should
# be removed as soon as
# https://github.com/janestreet/ocaml_intrinsics/pull/11 is merged.
./ocaml_intrinsics-fix-aarch64-crc32-intrinsics.patch
];
};
ocaml_openapi_generator = janePackage {

28
pkgs/development/ocaml-modules/janestreet/ocaml_intrinsics-fix-aarch64-crc32-intrinsics.patch Normal file
View File

@ -0,0 +1,28 @@
From fa7d611d326eaec5b34d8686975aaf2238a85996 Mon Sep 17 00:00:00 2001
From: alyaeanyx <alyaeanyx@mailbox.org>
Date: Sun, 18 May 2025 15:46:31 +0200
Subject: [PATCH] Fix aarch64 CRC32 intrinsics configure test program
The test program was checking for the nonexistent __crc32ud and __crc32uw instead of
__crc32cd __crc32cw (as used in src/crc_stubs.c).
Signed-off-by: alyaeanyx <alyaeanyx@mailbox.org>
---
src/discover/discover.ml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/discover/discover.ml b/src/discover/discover.ml
index d2b4039..8fe89a4 100644
--- a/src/discover/discover.ml
+++ b/src/discover/discover.ml
@@ -12,8 +12,8 @@ let prog_aarch64 =
int main() {
int64_t i64, d64;
int32_t i32, d32;
- __crc32ud(i64, d64);
- __crc32uw(i32, d32);
+ __crc32cd(i64, d64);
+ __crc32cw(i32, d32);
return 0;
}|}
;;