diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2015-12-21 19:53:14 +0300 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2015-12-21 19:53:14 +0300 |
| commit | c2bbc54a62da248a1b828bb6c0518185be3324eb (patch) | |
| tree | e6f4e9966c58c3315115a0a837e22cc1f51049ea | |
| parent | d2bb300b9bb7917d33e3bc37fca3bf6ee6e5fcc4 (diff) | |
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 <freddie.chopin@gmail.com>
* libc/stdlib/__atexit.c (__register_exitproc): Fix for
_ATEXIT_DYNAMIC_ALLOC.
| -rw-r--r-- | newlib/ChangeLog | 5 | ||||
| -rw-r--r-- | newlib/libc/stdlib/__atexit.c | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 480eb863f..736def6b8 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,5 +1,10 @@ 2015-12-21 Freddie Chopin <freddie.chopin@gmail.com> + * libc/stdlib/__atexit.c (__register_exitproc): Fix for + _ATEXIT_DYNAMIC_ALLOC. + +2015-12-21 Freddie Chopin <freddie.chopin@gmail.com> + * libc/stdlib/on_exit_args.{c,h}: New files. * libc/stdlib/Makefile.am: Add new source file. * libc/stdlib/Makefile.in: Regenerate. 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; |