From cf6dbdd135072fc2b74e0a10c22474b0282ca122 Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Sat, 22 Jul 2023 07:37:50 +0300 Subject: [PATCH] rtld: remove dup __crt_malloc prototypes Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41150 --- libexec/rtld-elf/rtld.h | 5 ----- libexec/rtld-elf/rtld_malloc.c | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h index b8b0d67bd05d..1cebc0f95451 100644 --- a/libexec/rtld-elf/rtld.h +++ b/libexec/rtld-elf/rtld.h @@ -419,9 +419,4 @@ void ifunc_init(Elf_Auxinfo[__min_size(AT_COUNT)]); void init_pltgot(Obj_Entry *); void allocate_initial_tls(Obj_Entry *); -void *__crt_calloc(size_t num, size_t size); -void __crt_free(void *cp); -void *__crt_malloc(size_t nbytes); -void *__crt_realloc(void *cp, size_t nbytes); - #endif /* } */ diff --git a/libexec/rtld-elf/rtld_malloc.c b/libexec/rtld-elf/rtld_malloc.c index 0eec68f35402..6660610b11ce 100644 --- a/libexec/rtld-elf/rtld_malloc.c +++ b/libexec/rtld-elf/rtld_malloc.c @@ -56,6 +56,7 @@ static char *rcsid = "$FreeBSD$"; #include "rtld.h" #include "rtld_printf.h" #include "rtld_paths.h" +#include "rtld_malloc.h" /* * Pre-allocate mmap'ed pages