mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
e526b8b11d
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 <Jean-Francois.Guillaume@univ-nantes.fr> Reported-by: Christopher Howard <christopher@librehacker.com> Change-Id: Id0023e17367a80a0d1abd4a80b7d8e3a0c3cc5bc
18 lines
604 B
Diff
18 lines
604 B
Diff
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;
|