diff options
Diffstat (limited to 'libpthread/nptl/sysdeps')
4 files changed, 11 insertions, 5 deletions
diff --git a/libpthread/nptl/sysdeps/generic/libc-tls.c b/libpthread/nptl/sysdeps/generic/libc-tls.c index cb451b252..5a71e3a60 100644 --- a/libpthread/nptl/sysdeps/generic/libc-tls.c +++ b/libpthread/nptl/sysdeps/generic/libc-tls.c @@ -200,7 +200,7 @@ __libc_setup_tls (size_t tcbsize, size_t tcbalign) # error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined" # endif if (__builtin_expect (lossage != NULL, 0)) - __libc_fatal (lossage); + abort(); /* We have to create a fake link map which normally would be created by the dynamic linker. It just has to have enough information to diff --git a/libpthread/nptl/sysdeps/pthread/unwind-forcedunwind.c b/libpthread/nptl/sysdeps/pthread/unwind-forcedunwind.c index 1c5bb1947..8b1f24407 100644 --- a/libpthread/nptl/sysdeps/pthread/unwind-forcedunwind.c +++ b/libpthread/nptl/sysdeps/pthread/unwind-forcedunwind.c @@ -22,10 +22,8 @@ #include <unwind.h> #include <pthreadP.h> -#ifdef __UCLIBC__ #define __libc_dlopen(x) dlopen(x, (RTLD_LOCAL | RTLD_LAZY)) #define __libc_dlsym dlsym -#endif static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); static _Unwind_Reason_Code (*libgcc_s_personality) @@ -56,7 +54,10 @@ pthread_cancel_init (void) || ARCH_CANCEL_INIT (handle) #endif ) - __libc_fatal ("libgcc_s.so.1 must be installed for pthread_cancel to work\n"); + { + printf("libgcc_s.so.1 must be installed for pthread_cancel to work\n"); + abort(); + } libgcc_s_resume = resume; libgcc_s_personality = personality; diff --git a/libpthread/nptl/sysdeps/pthread/unwind-resume.c b/libpthread/nptl/sysdeps/pthread/unwind-resume.c index 088f4c6f6..021024d49 100644 --- a/libpthread/nptl/sysdeps/pthread/unwind-resume.c +++ b/libpthread/nptl/sysdeps/pthread/unwind-resume.c @@ -37,7 +37,10 @@ init (void) if (handle == NULL || (resume = __libc_dlsym (handle, "_Unwind_Resume")) == NULL || (personality = __libc_dlsym (handle, "__gcc_personality_v0")) == NULL) - __libc_fatal ("libgcc_s.so.1 must be installed for pthread_cancel to work\n"); + { + printf("libgcc_s.so.1 must be installed for pthread_cancel to work\n"); + abort(); + } libgcc_s_resume = resume; libgcc_s_personality = personality; diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/register-atfork.c b/libpthread/nptl/sysdeps/unix/sysv/linux/register-atfork.c index 9707e4663..a73f6c421 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/register-atfork.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/register-atfork.c @@ -109,6 +109,7 @@ __register_atfork (prepare, parent, child, dso_handle) libc_hidden_def (__register_atfork) +#ifndef __UCLIBC__ libc_freeres_fn (free_mem) { /* Get the lock to not conflict with running forks. */ @@ -133,3 +134,4 @@ libc_freeres_fn (free_mem) free (oldp); } } +#endif |