civodul pushed a commit to branch master
in repository guix.
commit e526b8b11debb184929abd013b7d589c9db245fa
Author: Ludovic Courtès <[email protected]>
AuthorDate: Mon Nov 18 09:58:23 2024 +0100
gnu: u-boot-tools: Fix segfault while running tests.
Fixes <https://issues.guix.gnu.org/74270>.
* gnu/packages/patches/u-boot-calloc-visibility.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/bootloaders.scm (u-boot): Use it.
Reported-by: Jean-Francois GUILLAUME
<[email protected]>
Reported-by: Christopher Howard <[email protected]>
Change-Id: Id0023e17367a80a0d1abd4a80b7d8e3a0c3cc5bc
---
gnu/local.mk | 1 +
gnu/packages/bootloaders.scm | 3 ++-
gnu/packages/patches/u-boot-calloc-visibility.patch | 18 ++++++++++++++++++
3 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 60fc8c9d94..ff6c6be5f0 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2255,6 +2255,7 @@ dist_patch_DATA =
\
%D%/packages/patches/twinkle-bcg729.patch \
%D%/packages/patches/u-boot-allow-disabling-openssl.patch \
%D%/packages/patches/u-boot-build-without-libcrypto.patch \
+ %D%/packages/patches/u-boot-calloc-visibility.patch \
%D%/packages/patches/u-boot-nintendo-nes-serial.patch \
%D%/packages/patches/u-boot-rockchip-inno-usb.patch \
%D%/packages/patches/ucx-tcp-iface-ioctl.patch \
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 52a077ecea..da5abaca55 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -758,7 +758,8 @@ tree binary files. These are board description files used
by Linux and BSD.")
(patches
(list %u-boot-rockchip-inno-usb-patch
%u-boot-build-without-libcrypto-patch
- %u-boot-allow-disabling-openssl-patch))
+ %u-boot-allow-disabling-openssl-patch
+ (search-patch "u-boot-calloc-visibility.patch")))
(method url-fetch)
(uri (string-append
"https://ftp.denx.de/pub/u-boot/";
diff --git a/gnu/packages/patches/u-boot-calloc-visibility.patch
b/gnu/packages/patches/u-boot-calloc-visibility.patch
new file mode 100644
index 0000000000..93c52ff709
--- /dev/null
+++ b/gnu/packages/patches/u-boot-calloc-visibility.patch
@@ -0,0 +1,18 @@
+Arrange so that LLVM's shared object doesn't end up using 'calloc' from
+U-Boot's 'malloc_simple.c' when it's initialized.
+
+ https://issues.guix.gnu.org/74270
+
+diff --git a/common/malloc_simple.c b/common/malloc_simple.c
+index 5a8ec538f8..4f5e350a3c 100644
+--- a/common/malloc_simple.c
++++ b/common/malloc_simple.c
+@@ -64,6 +64,8 @@ void *memalign_simple(size_t align, size_t bytes)
+ }
+
+ #if CONFIG_IS_ENABLED(SYS_MALLOC_SIMPLE)
++void *calloc(size_t nmemb, size_t elem_size)
++ __attribute__ ((visibility ("hidden")));
+ void *calloc(size_t nmemb, size_t elem_size)
+ {
+ size_t size = nmemb * elem_size;
