[bug#70131] [PATCH v3 1/6] Revert "gnu: u-boot-tools: Fix segfault while running tests."

[Herman Rimm via Guix-patches via <guix-patches@gnu.org>]

This reverts commit e526b8b11debb184929abd013b7d589c9db245fa.
---
 gnu/local.mk                                   |  1 -
 gnu/packages/bootloaders.scm                   |  3 +--
 .../patches/u-boot-calloc-visibility.patch     | 18 ------------------
 3 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 gnu/packages/patches/u-boot-calloc-visibility.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 39b142af5a..14b8c6932e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -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		\
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 788c7dc9ef..db2cfd1131 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -766,8 +766,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/"
diff --git a/gnu/packages/patches/u-boot-calloc-visibility.patch b/gnu/packages/patches/u-boot-calloc-visibility.patch
deleted file mode 100644
index 93c52ff709..0000000000
--- a/gnu/packages/patches/u-boot-calloc-visibility.patch
+++ /dev/null
@@ -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;
-- 
2.45.2