git: 7b47621aac4d - stable/12 - loader: add knob to build with user malloc

The branch stable/12 has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=7b47621aac4db952d9ec239114d3eec2fe53c5c8

commit 7b47621aac4db952d9ec239114d3eec2fe53c5c8
Author:     Toomas Soome <tsoome@FreeBSD.org>
AuthorDate: 2020-03-28 21:47:44 +0000
Commit:     Kyle Evans <kevans@FreeBSD.org>
CommitDate: 2021-10-08 02:42:20 +0000

    loader: add knob to build with user malloc
    
    This option is intended to aid development, to allow building with user
    malloc. The use case would be to build userboot & test with libc (or
    other) malloc and use extra malloc debug features.
    
    (cherry picked from commit c907ec9e16745e3dacd15982f71dea21a06de53c)
---
 stand/libsa/stand.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/stand/libsa/stand.h b/stand/libsa/stand.h
index 14e1703326a4..086e1d298a49 100644
--- a/stand/libsa/stand.h
+++ b/stand/libsa/stand.h
@@ -437,7 +437,14 @@ extern void	mallocstats(void);
 
 const char *x86_hypervisor(void);
 
-#ifdef DEBUG_MALLOC
+#ifdef USER_MALLOC
+extern void *malloc(size_t);
+extern void *memalign(size_t, size_t);
+extern void *calloc(size_t, size_t);
+extern void free(void *);
+extern void *realloc(void *, size_t);
+extern void *reallocf(void *, size_t);
+#elif DEBUG_MALLOC
 #define malloc(x)	Malloc(x, __FILE__, __LINE__)
 #define memalign(x, y)	Memalign(x, y, __FILE__, __LINE__)
 #define calloc(x, y)	Calloc(x, y, __FILE__, __LINE__)