diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2018-08-08 10:42:48 +0200 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2018-08-08 10:50:19 +0200 |
| commit | 6f485ba0261f88c1eca15bb8061ab2e6af863bbf (patch) | |
| tree | 8a6e6055931cc654a54e87717cc544ee573dc30c | |
| parent | 2d87d95f12bbbb8bff611c8a19b943b9ebedb1fd (diff) | |
| download | cygnal-6f485ba0261f88c1eca15bb8061ab2e6af863bbf.tar.gz cygnal-6f485ba0261f88c1eca15bb8061ab2e6af863bbf.tar.bz2 cygnal-6f485ba0261f88c1eca15bb8061ab2e6af863bbf.zip | |
newlib: don't check malloc/free pointer
use preprocessor check for MALLOC_PROVIDED instead
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
| -rw-r--r-- | newlib/libc/stdlib/__atexit.c | 12 | ||||
| -rw-r--r-- | newlib/libc/stdlib/__call_atexit.c | 7 |
2 files changed, 2 insertions, 17 deletions
diff --git a/newlib/libc/stdlib/__atexit.c b/newlib/libc/stdlib/__atexit.c index b53402670..97ce053bf 100644 --- a/newlib/libc/stdlib/__atexit.c +++ b/newlib/libc/stdlib/__atexit.c @@ -89,22 +89,12 @@ __register_exitproc (int type, } if (p->_ind >= _ATEXIT_SIZE) { -#ifndef _ATEXIT_DYNAMIC_ALLOC +#if !defined (_ATEXIT_DYNAMIC_ALLOC) || !defined (MALLOC_PROVIDED) #ifndef __SINGLE_THREAD__ __lock_release_recursive(__atexit_recursive_mutex); #endif return -1; #else - /* Don't dynamically allocate the atexit array if malloc is not - available. */ - if (!malloc) - { -#ifndef __SINGLE_THREAD__ - __lock_release_recursive(__atexit_recursive_mutex); -#endif - return -1; - } - p = (struct _atexit *) malloc (sizeof *p); if (p == NULL) { diff --git a/newlib/libc/stdlib/__call_atexit.c b/newlib/libc/stdlib/__call_atexit.c index 27aedf5f5..3eec11214 100644 --- a/newlib/libc/stdlib/__call_atexit.c +++ b/newlib/libc/stdlib/__call_atexit.c @@ -131,14 +131,9 @@ __call_exitprocs (int code, void *d) goto restart; } -#ifndef _ATEXIT_DYNAMIC_ALLOC +#if !defined (_ATEXIT_DYNAMIC_ALLOC) || !defined (MALLOC_PROVIDED) break; #else - /* Don't dynamically free the atexit array if free is not - available. */ - if (!free) - break; - /* Move to the next block. Free empty blocks except the last one, which is part of _GLOBAL_REENT. */ if (p->_ind == 0 && p->_next) |