Revert "gnu: u-boot-tools: Fix segfault while running tests."

This reverts commit e526b8b11d.

Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
This commit is contained in:
Herman Rimm 2024-12-13 20:58:29 +01:00 committed by Vagrant Cascadian
parent 6f7778e5da
commit 8a016fa056
No known key found for this signature in database
GPG key ID: DC518FC87F9716AA
3 changed files with 1 additions and 21 deletions

View file

@ -2275,7 +2275,6 @@ 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 \

View file

@ -767,8 +767,7 @@ (define u-boot
(patches
(list %u-boot-rockchip-inno-usb-patch
%u-boot-build-without-libcrypto-patch
%u-boot-allow-disabling-openssl-patch
(search-patch "u-boot-calloc-visibility.patch")))
%u-boot-allow-disabling-openssl-patch))
(method url-fetch)
(uri (string-append
"https://ftp.denx.de/pub/u-boot/"

View file

@ -1,18 +0,0 @@
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;