From c0e447afd0d4b671fb55948c4cdb4bee543d0b50 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Tue, 7 May 2013 18:24:14 +0000 Subject: [PATCH] 2013-05-07 Sebastian Huber * libc/stdlib/__atexit.c (__atexit_lock): Declare. * libc/stdlib/__call_atexit.c (__atexit_lock): Define. --- newlib/ChangeLog | 5 +++++ newlib/libc/stdlib/__atexit.c | 5 ++++- newlib/libc/stdlib/__call_atexit.c | 4 +--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index afbe141ee..35dd7da88 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,8 @@ +2013-05-07 Sebastian Huber + + * libc/stdlib/__atexit.c (__atexit_lock): Declare. + * libc/stdlib/__call_atexit.c (__atexit_lock): Define. + 2013-05-06 Sandra Loosemore * configure.host (machine_dir, sys_dir, syscall_dir, newlib_cflags): diff --git a/newlib/libc/stdlib/__atexit.c b/newlib/libc/stdlib/__atexit.c index 4687d0023..1caf2e56b 100644 --- a/newlib/libc/stdlib/__atexit.c +++ b/newlib/libc/stdlib/__atexit.c @@ -10,7 +10,10 @@ /* Make this a weak reference to avoid pulling in malloc. */ void * malloc(size_t) _ATTRIBUTE((__weak__)); -__LOCK_INIT_RECURSIVE(, __atexit_lock); + +#ifndef __SINGLE_THREAD__ +extern _LOCK_RECURSIVE_T __atexit_lock; +#endif /* * Register a function to be performed at exit or on shared library unload. diff --git a/newlib/libc/stdlib/__call_atexit.c b/newlib/libc/stdlib/__call_atexit.c index 4c4506343..a21dd5733 100644 --- a/newlib/libc/stdlib/__call_atexit.c +++ b/newlib/libc/stdlib/__call_atexit.c @@ -11,9 +11,7 @@ /* Make this a weak reference to avoid pulling in free. */ void free(void *) _ATTRIBUTE((__weak__)); -#ifndef __SINGLE_THREAD__ -extern _LOCK_RECURSIVE_T __atexit_lock; -#endif +__LOCK_INIT_RECURSIVE(, __atexit_lock); #ifdef _WANT_REGISTER_FINI -- 2.43.5