diff options
| -rw-r--r-- | ldso/ldso/ldso.c | 3 | ||||
| -rw-r--r-- | libc/misc/internals/__uClibc_main.c | 3 | ||||
| -rw-r--r-- | libc/misc/time/time.c | 8 | ||||
| -rw-r--r-- | libc/stdlib/abort.c | 8 |
4 files changed, 12 insertions, 10 deletions
diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c index c3538426b..97fa924e5 100644 --- a/ldso/ldso/ldso.c +++ b/ldso/ldso/ldso.c @@ -88,6 +88,7 @@ extern void _start(void); #ifdef __UCLIBC_HAS_SSP__ #include <dl-osinfo.h> +uintptr_t stack_chk_guard; #ifndef THREAD_SET_STACK_GUARD /* Only exported for architectures that don't store the stack guard canary * in local thread area. */ @@ -212,7 +213,7 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, unsigned long load_addr, /* sjhill: your TLS init should go before this */ #ifdef __UCLIBC_HAS_SSP__ /* Set up the stack checker's canary. */ - uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard (); + stack_chk_guard = _dl_setup_stack_chk_guard (); # ifdef THREAD_SET_STACK_GUARD THREAD_SET_STACK_GUARD (stack_chk_guard); # else diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c index 32071c50c..73aafa18b 100644 --- a/libc/misc/internals/__uClibc_main.c +++ b/libc/misc/internals/__uClibc_main.c @@ -57,6 +57,7 @@ void *__libc_stack_end=NULL; /* Only exported for architectures that don't store the stack guard canary * in thread local area. */ #include <stdint.h> +uintptr_t stack_chk_guard; /* for gcc-4.1 non-TLS */ uintptr_t __stack_chk_guard attribute_relro; /* for gcc-3.x + Etoh ssp */ @@ -186,7 +187,7 @@ void __uClibc_init(void) #ifndef SHARED # ifdef __UCLIBC_HAS_SSP__ /* Set up the stack checker's canary. */ - uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard(); + stack_chk_guard = _dl_setup_stack_chk_guard(); # ifdef THREAD_SET_STACK_GUARD THREAD_SET_STACK_GUARD (stack_chk_guard); # else diff --git a/libc/misc/time/time.c b/libc/misc/time/time.c index b6dce44ea..84f201d44 100644 --- a/libc/misc/time/time.c +++ b/libc/misc/time/time.c @@ -475,21 +475,21 @@ clock_t clock(void) /**********************************************************************/ #ifdef L_ctime -char *ctime(const time_t *clock) +char *ctime(const time_t *t) { /* ANSI/ISO/SUSv3 say that ctime is equivalent to the following. */ - return asctime(localtime(clock)); + return asctime(localtime(t)); } libc_hidden_def(ctime) #endif /**********************************************************************/ #ifdef L_ctime_r -char *ctime_r(const time_t *clock, char *buf) +char *ctime_r(const time_t *t, char *buf) { struct tm xtm; - return asctime_r(localtime_r(clock, &xtm), buf); + return asctime_r(localtime_r(t, &xtm), buf); } #endif diff --git a/libc/stdlib/abort.c b/libc/stdlib/abort.c index 29e53a18e..a940768c0 100644 --- a/libc/stdlib/abort.c +++ b/libc/stdlib/abort.c @@ -59,14 +59,14 @@ static pthread_mutex_t mylock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; /* Cause an abnormal program termination with core-dump */ void abort(void) { - sigset_t sigset; + sigset_t sigs; /* Make sure we acquire the lock before proceeding */ LOCK; /* Unmask SIGABRT to be sure we can get it */ - if (__sigemptyset(&sigset) == 0 && __sigaddset(&sigset, SIGABRT) == 0) { - sigprocmask(SIG_UNBLOCK, &sigset, (sigset_t *) NULL); + if (__sigemptyset(&sigs) == 0 && __sigaddset(&sigs, SIGABRT) == 0) { + sigprocmask(SIG_UNBLOCK, &sigs, (sigset_t *) NULL); } while (1) { @@ -77,7 +77,7 @@ void abort(void) #ifdef __UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT__ /* If we are using stdio, try to shut it down. At the very least, * this will attempt to commit all buffered writes. It may also - * unboffer all writable files, or close them outright. + * unbuffer all writable files, or close them outright. * Check the stdio routines for details. */ if (_stdio_term) { _stdio_term(); |