diff --git a/lib/libc/musl/src/aio/aio.c b/lib/libc/musl/src/aio/aio.c index d7e063bf93ca82fb5a6708a4bad7f8e1ead9e752..5c586260c33e79e71834deb71e38f046e1882ced 100644 --- a/lib/libc/musl/src/aio/aio.c +++ b/lib/libc/musl/src/aio/aio.c @@ -11,11 +11,6 @@ #include "pthread_impl.h" #include "aio_impl.h" -#define malloc __libc_malloc -#define calloc __libc_calloc -#define realloc __libc_realloc -#define free __libc_free - /* The following is a threads-based implementation of AIO with minimal * dependence on implementation details. Most synchronization is * performed with pthread primitives, but atomics and futex operations diff --git a/lib/libc/musl/src/exit/atexit.c b/lib/libc/musl/src/exit/atexit.c index 854e9fddbe559218805261c7623dbaa7304569d1..2804a1d7ad31971be2bda9447f76b271f51da30b 100644 --- a/lib/libc/musl/src/exit/atexit.c +++ b/lib/libc/musl/src/exit/atexit.c @@ -4,11 +4,6 @@ #include "lock.h" #include "fork_impl.h" -#define malloc __libc_malloc -#define calloc __libc_calloc -#define realloc undef -#define free undef - /* Ensure that at least 32 atexit handlers can be registered without malloc */ #define COUNT 32 diff --git a/lib/libc/musl/src/include/stdlib.h b/lib/libc/musl/src/include/stdlib.h index 812b04de2fd6b6efb1576a72eea4fa16007fc2ad..1599691fbeec4d037674c309a03dccec1e12db36 100644 --- a/lib/libc/musl/src/include/stdlib.h +++ b/lib/libc/musl/src/include/stdlib.h @@ -10,10 +10,4 @@ hidden int __ptsname_r(int, char *, size_t); hidden char *__randname(char *); hidden void __qsort_r (void *, size_t, size_t, int (*)(const void *, const void *, void *), void *); -hidden void *__libc_malloc(size_t); -hidden void *__libc_malloc_impl(size_t); -hidden void *__libc_calloc(size_t, size_t); -hidden void *__libc_realloc(void *, size_t); -hidden void __libc_free(void *); - #endif diff --git a/lib/libc/musl/src/ldso/dlerror.c b/lib/libc/musl/src/ldso/dlerror.c index dae0f3a9b24a93d01882fdafd4ed91cb29416375..141df3ab134988e03a570a70828e37400c2ec87c 100644 --- a/lib/libc/musl/src/ldso/dlerror.c +++ b/lib/libc/musl/src/ldso/dlerror.c @@ -5,11 +5,6 @@ #include "dynlink.h" #include "atomic.h" -#define malloc __libc_malloc -#define calloc __libc_calloc -#define realloc __libc_realloc -#define free __libc_free - char *dlerror() { pthread_t self = __pthread_self(); diff --git a/lib/libc/musl/src/locale/dcngettext.c b/lib/libc/musl/src/locale/dcngettext.c index 0b53286db753648d68ddef5b2905091bf39c4b9f..67e551058cb03aa77d34828ed7ca0ef47a043a57 100644 --- a/lib/libc/musl/src/locale/dcngettext.c +++ b/lib/libc/musl/src/locale/dcngettext.c @@ -12,11 +12,6 @@ #include "lock.h" #include "fork_impl.h" -#define malloc __libc_malloc -#define calloc __libc_calloc -#define realloc undef -#define free undef - struct binding { struct binding *next; int dirlen; diff --git a/lib/libc/musl/src/locale/duplocale.c b/lib/libc/musl/src/locale/duplocale.c index 5ce33ae6ded0acc40a93706bf39db10c3775f2b3..030b64cb0e706cdf29c7104526e86b6ee08d7adb 100644 --- a/lib/libc/musl/src/locale/duplocale.c +++ b/lib/libc/musl/src/locale/duplocale.c @@ -3,11 +3,6 @@ #include "locale_impl.h" #include "libc.h" -#define malloc __libc_malloc -#define calloc undef -#define realloc undef -#define free undef - locale_t __duplocale(locale_t old) { locale_t new = malloc(sizeof *new); diff --git a/lib/libc/musl/src/locale/freelocale.c b/lib/libc/musl/src/locale/freelocale.c index 385d12069d5733d8a291ceb6c870d842befed953..802b8bfe1c72458d8def7c505df0c022d026b1f0 100644 --- a/lib/libc/musl/src/locale/freelocale.c +++ b/lib/libc/musl/src/locale/freelocale.c @@ -1,11 +1,6 @@ #include #include "locale_impl.h" -#define malloc undef -#define calloc undef -#define realloc undef -#define free __libc_free - void freelocale(locale_t l) { if (__loc_is_allocated(l)) free(l); diff --git a/lib/libc/musl/src/locale/locale_map.c b/lib/libc/musl/src/locale/locale_map.c index da61f7fc032c5d010cd6409589aeb2e0ca61c84f..a8c9e7f24427920941ae0fe2dc3d24bf0af0f443 100644 --- a/lib/libc/musl/src/locale/locale_map.c +++ b/lib/libc/musl/src/locale/locale_map.c @@ -7,11 +7,6 @@ #include "lock.h" #include "fork_impl.h" -#define malloc __libc_malloc -#define calloc undef -#define realloc undef -#define free undef - const char *__lctrans_impl(const char *msg, const struct __locale_map *lm) { const char *trans = 0; diff --git a/lib/libc/musl/src/locale/newlocale.c b/lib/libc/musl/src/locale/newlocale.c index 9ac3cd386f99df95ba6e8f5a32a91b9c402db10d..12ae87d679e987293756808d5b05bb0846f86861 100644 --- a/lib/libc/musl/src/locale/newlocale.c +++ b/lib/libc/musl/src/locale/newlocale.c @@ -4,11 +4,6 @@ #include "locale_impl.h" #include "lock.h" -#define malloc __libc_malloc -#define calloc undef -#define realloc undef -#define free undef - static int default_locale_init_done; static struct __locale_struct default_locale, default_ctype_locale; diff --git a/lib/libc/musl/src/process/fdop.h b/lib/libc/musl/src/process/fdop.h index 7cf733b21dc14ce2708fac19fa46dea87fcdfa9b..5adf1443874854c6a7a33c4b641ff18c152a0f38 100644 --- a/lib/libc/musl/src/process/fdop.h +++ b/lib/libc/musl/src/process/fdop.h @@ -10,8 +10,3 @@ struct fdop { mode_t mode; char path[]; }; - -#define malloc __libc_malloc -#define calloc __libc_calloc -#define realloc undef -#define free __libc_free diff --git a/lib/libc/musl/src/thread/pthread_atfork.c b/lib/libc/musl/src/thread/pthread_atfork.c index 26d325438cec6ae63cc814766de557cc7a6a89c3..6d348ac8b73f8f3bc02dba246c303ee459cebe51 100644 --- a/lib/libc/musl/src/thread/pthread_atfork.c +++ b/lib/libc/musl/src/thread/pthread_atfork.c @@ -3,11 +3,6 @@ #include "libc.h" #include "lock.h" -#define malloc __libc_malloc -#define calloc undef -#define realloc undef -#define free undef - static struct atfork_funcs { void (*prepare)(void); void (*parent)(void); diff --git a/lib/libc/musl/src/thread/sem_open.c b/lib/libc/musl/src/thread/sem_open.c index 0ad29de96cc1667f3a6d629f5da4104b56ede9d6..c3d2f6d3c0b2f97d64c3e72dd68c00062655c527 100644 --- a/lib/libc/musl/src/thread/sem_open.c +++ b/lib/libc/musl/src/thread/sem_open.c @@ -14,11 +14,6 @@ #include "lock.h" #include "fork_impl.h" -#define malloc __libc_malloc -#define calloc __libc_calloc -#define realloc undef -#define free undef - static struct { ino_t ino; sem_t *sem; diff --git a/lib/libc/musl/src/time/__tz.c b/lib/libc/musl/src/time/__tz.c index c34b3eb755a54b38efa8f8e4b39e0bfb1e23b406..ff51bd9802244cbac936e449f284455994151c24 100644 --- a/lib/libc/musl/src/time/__tz.c +++ b/lib/libc/musl/src/time/__tz.c @@ -9,11 +9,6 @@ #include "lock.h" #include "fork_impl.h" -#define malloc __libc_malloc -#define calloc undef -#define realloc undef -#define free undef - long __timezone = 0; int __daylight = 0; char *__tzname[2] = { 0, 0 };