public inbox for newlib-cvs@sourceware.org help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org> To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] newlib: don't check malloc/free pointer Date: Wed, 08 Aug 2018 08:53:00 -0000 [thread overview] Message-ID: <20180808085306.79913.qmail@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=6f485ba0261f88c1eca15bb8061ab2e6af863bbf commit 6f485ba0261f88c1eca15bb8061ab2e6af863bbf Author: Corinna Vinschen <corinna@vinschen.de> Date: Wed Aug 8 10:42:48 2018 +0200 newlib: don't check malloc/free pointer use preprocessor check for MALLOC_PROVIDED instead Signed-off-by: Corinna Vinschen <corinna@vinschen.de> Diff: --- newlib/libc/stdlib/__atexit.c | 12 +----------- 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 b534026..97ce053 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 27aedf5..3eec112 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)
reply other threads:[~2018-08-08 8:53 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180808085306.79913.qmail@sourceware.org \ --to=corinna@sourceware.org \ --cc=newlib-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).