git: b619a7f161df - stable/13 - rtld: remove dup __crt_malloc prototypes
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 02 Aug 2023 00:37:15 UTC
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=b619a7f161dfdaf9775fd52b6e3c9569f9155c54
commit b619a7f161dfdaf9775fd52b6e3c9569f9155c54
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2023-07-22 04:37:50 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-08-02 00:36:39 +0000
rtld: remove dup __crt_malloc prototypes
(cherry picked from commit cf6dbdd135072fc2b74e0a10c22474b0282ca122)
---
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 ca43b289566f..adf5202b444b 100644
--- a/libexec/rtld-elf/rtld.h
+++ b/libexec/rtld-elf/rtld.h
@@ -425,9 +425,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