From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 80056 invoked by alias); 8 Aug 2018 08:53:07 -0000 Mailing-List: contact newlib-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: newlib-cvs-owner@sourceware.org Received: (qmail 79918 invoked by uid 9078); 8 Aug 2018 08:53:06 -0000 Date: Wed, 08 Aug 2018 08:53:00 -0000 Message-ID: <20180808085306.79913.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] newlib: don't check malloc/free pointer X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/master X-Git-Oldrev: 2d87d95f12bbbb8bff611c8a19b943b9ebedb1fd X-Git-Newrev: 6f485ba0261f88c1eca15bb8061ab2e6af863bbf X-SW-Source: 2018-q3/txt/msg00040.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=6f485ba0261f88c1eca15bb8061ab2e6af863bbf commit 6f485ba0261f88c1eca15bb8061ab2e6af863bbf Author: Corinna Vinschen 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 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)