From c2bbc54a62da248a1b828bb6c0518185be3324eb Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Mon, 21 Dec 2015 11:53:14 -0500 Subject: [PATCH] Fix atexit logic to honor _ATEXIT_DYNAMIC_ALLOC setting. If small reent is enabled (_REENT_SMALL is defined) then malloc() was used in __register_exitproc() even if user requested it to be disabled (_ATEXIT_DYNAMIC_ALLOC is defined). With this fix, function fails when _ATEXIT_DYNAMIC_ALLOC is defined and whole static storage is already used. 2015-12-21 Freddie Chopin * libc/stdlib/__atexit.c (__register_exitproc): Fix for _ATEXIT_DYNAMIC_ALLOC. --- newlib/ChangeLog | 5 +++++ newlib/libc/stdlib/__atexit.c | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 480eb863f..736def6b8 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,8 @@ +2015-12-21 Freddie Chopin + + * libc/stdlib/__atexit.c (__register_exitproc): Fix for + _ATEXIT_DYNAMIC_ALLOC. + 2015-12-21 Freddie Chopin * libc/stdlib/on_exit_args.{c,h}: New files. diff --git a/newlib/libc/stdlib/__atexit.c b/newlib/libc/stdlib/__atexit.c index 23eab29a9..d07f6c122 100644 --- a/newlib/libc/stdlib/__atexit.c +++ b/newlib/libc/stdlib/__atexit.c @@ -131,6 +131,12 @@ _DEFUN (__register_exitproc, args = p->_on_exit_args_ptr; if (args == NULL) { +#ifndef _ATEXIT_DYNAMIC_ALLOC +#ifndef __SINGLE_THREAD__ + __lock_release_recursive(__atexit_lock); +#endif + return -1; +#else if (malloc) args = malloc (sizeof * p->_on_exit_args_ptr); @@ -144,6 +150,7 @@ _DEFUN (__register_exitproc, args->_fntypes = 0; args->_is_cxa = 0; p->_on_exit_args_ptr = args; +#endif } #else args = &p->_on_exit_args;