Index: hidden/stdlib.h =================================================================== RCS file: /cvs/src/lib/libc/hidden/stdlib.h,v diff -u -p -r1.20 stdlib.h --- hidden/stdlib.h 1 Mar 2024 21:30:40 -0000 1.20 +++ hidden/stdlib.h 16 Jun 2024 23:50:14 -0000 @@ -58,7 +58,7 @@ PROTO_STD_DEPRECATED(_Exit); PROTO_DEPRECATED(a64l); PROTO_NORMAL(abort); PROTO_NORMAL(abs); -PROTO_NORMAL(aligned_alloc); +//PROTO_NORMAL(aligned_alloc); PROTO_NORMAL(arc4random); PROTO_NORMAL(arc4random_buf); PROTO_NORMAL(arc4random_uniform); @@ -68,8 +68,8 @@ PROTO_NORMAL(atoi); PROTO_STD_DEPRECATED(atol); PROTO_STD_DEPRECATED(atoll); PROTO_STD_DEPRECATED(bsearch); -PROTO_NORMAL(calloc); -PROTO_NORMAL(calloc_conceal); +//PROTO_NORMAL(calloc); +//PROTO_NORMAL(calloc_conceal); PROTO_NORMAL(cgetcap); PROTO_NORMAL(cgetclose); PROTO_NORMAL(cgetent); @@ -89,8 +89,8 @@ PROTO_DEPRECATED(ecvt); PROTO_NORMAL(erand48); PROTO_NORMAL(exit); PROTO_DEPRECATED(fcvt); -PROTO_NORMAL(free); -PROTO_NORMAL(freezero); +//PROTO_NORMAL(free); +//PROTO_NORMAL(freezero); PROTO_DEPRECATED(gcvt); PROTO_DEPRECATED(getbsize); PROTO_NORMAL(getenv); @@ -109,8 +109,8 @@ PROTO_DEPRECATED(ldiv); PROTO_STD_DEPRECATED(llabs); PROTO_STD_DEPRECATED(lldiv); PROTO_DEPRECATED(lrand48); -PROTO_NORMAL(malloc); -PROTO_NORMAL(malloc_conceal); +//PROTO_NORMAL(malloc); +//PROTO_NORMAL(malloc_conceal); PROTO_STD_DEPRECATED(mblen); PROTO_STD_DEPRECATED(mbstowcs); PROTO_STD_DEPRECATED(mbtowc); @@ -124,7 +124,7 @@ PROTO_DEPRECATED(mkstemps); PROTO_DEPRECATED(mktemp); PROTO_DEPRECATED(mrand48); PROTO_DEPRECATED(nrand48); -PROTO_NORMAL(posix_memalign); +//PROTO_NORMAL(posix_memalign); PROTO_DEPRECATED(posix_openpt); PROTO_DEPRECATED(ptsname); PROTO_NORMAL(putenv); @@ -135,9 +135,9 @@ PROTO_DEPRECATED(radixsort); PROTO_STD_DEPRECATED(rand); PROTO_NORMAL(rand_r); PROTO_DEPRECATED(random); -PROTO_NORMAL(realloc); +//PROTO_NORMAL(realloc); PROTO_NORMAL(reallocarray); -PROTO_NORMAL(recallocarray); +//PROTO_NORMAL(recallocarray); PROTO_DEPRECATED(realpath); PROTO_DEPRECATED(seed48); PROTO_NORMAL(seed48_deterministic); Index: include/thread_private.h =================================================================== RCS file: /cvs/src/lib/libc/include/thread_private.h,v diff -u -p -r1.36 thread_private.h --- include/thread_private.h 6 Jan 2021 19:54:17 -0000 1.36 +++ include/thread_private.h 16 Jun 2024 23:50:14 -0000 @@ -10,7 +10,7 @@ #define _MALLOC_MUTEXES 32 void _malloc_init(int); #ifdef __LIBC__ -PROTO_NORMAL(_malloc_init); +//PROTO_NORMAL(_malloc_init); #endif /* __LIBC__ */ /* Index: stdlib/malloc.c =================================================================== RCS file: /cvs/src/lib/libc/stdlib/malloc.c,v diff -u -p -r1.296 malloc.c --- stdlib/malloc.c 30 Mar 2024 07:50:39 -0000 1.296 +++ stdlib/malloc.c 16 Jun 2024 23:50:14 -0000 @@ -1510,7 +1510,7 @@ _malloc_init(int from_rthreads) _MALLOC_UNLOCK(1); } -DEF_STRONG(_malloc_init); +//DEF_STRONG(_malloc_init); #define PROLOGUE(p, fn) \ d = (p); \ @@ -1546,7 +1546,7 @@ malloc(size_t size) EPILOGUE() return r; } -DEF_STRONG(malloc); +//DEF_STRONG(malloc); void * malloc_conceal(size_t size) @@ -1561,7 +1561,7 @@ malloc_conceal(size_t size) EPILOGUE() return r; } -DEF_WEAK(malloc_conceal); +//DEF_WEAK(malloc_conceal); static struct region_info * findpool(void *p, struct dir_info *argpool, struct dir_info **foundpool, @@ -1749,7 +1749,7 @@ free(void *ptr) _MALLOC_UNLOCK(d->mutex); errno = saved_errno; } -DEF_STRONG(free); +//DEF_STRONG(free); static void freezero_p(void *ptr, size_t sz) @@ -1787,7 +1787,7 @@ freezero(void *ptr, size_t sz) _MALLOC_UNLOCK(d->mutex); errno = saved_errno; } -DEF_WEAK(freezero); +//DEF_WEAK(freezero); static void * orealloc(struct dir_info **argpool, void *p, size_t newsz) @@ -1972,7 +1972,7 @@ realloc(void *ptr, size_t size) EPILOGUE() return r; } -DEF_STRONG(realloc); +//DEF_STRONG(realloc); /* * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX @@ -2004,7 +2004,7 @@ calloc(size_t nmemb, size_t size) EPILOGUE() return r; } -DEF_STRONG(calloc); +//DEF_STRONG(calloc); void * calloc_conceal(size_t nmemb, size_t size) @@ -2030,7 +2030,7 @@ calloc_conceal(size_t nmemb, size_t size EPILOGUE() return r; } -DEF_WEAK(calloc_conceal); +//DEF_WEAK(calloc_conceal); static void * orecallocarray(struct dir_info **argpool, void *p, size_t oldsize, @@ -2188,7 +2188,7 @@ recallocarray(void *ptr, size_t oldnmemb EPILOGUE() return r; } -DEF_WEAK(recallocarray); +//DEF_WEAK(recallocarray); static void * mapalign(struct dir_info *d, size_t alignment, size_t sz, int zero_fill) @@ -2337,7 +2337,7 @@ err: errno = saved_errno; return res; } -DEF_STRONG(posix_memalign); +//DEF_STRONG(posix_memalign); void * aligned_alloc(size_t alignment, size_t size) @@ -2363,7 +2363,7 @@ aligned_alloc(size_t alignment, size_t s EPILOGUE() return r; } -DEF_STRONG(aligned_alloc); +//DEF_STRONG(aligned_alloc); #ifdef MALLOC_STATS @@ -2756,7 +2756,7 @@ malloc_dump(void) ulog("\n"); errno = saved_errno; } -DEF_WEAK(malloc_dump); +//DEF_WEAK(malloc_dump); static void malloc_exit(void)