From dbc5879d9ab39df3a54ed9b34a6c9e55a8bb8f65 Mon Sep 17 00:00:00 2001 From: Austin Foxley Date: Sun, 22 Nov 2009 19:20:56 -0800 Subject: Revert "libc: add hidden calls to pthread cleanup funcs" This reverts commit e0ac4efbdb498319f03a2a95d75d061ab6c68491. Was causing segfaults on every pthread linked executable Signed-off-by: Austin Foxley --- libpthread/linuxthreads.old/forward.c | 2 -- libpthread/linuxthreads.old/sysdeps/pthread/pthread.h | 2 -- 2 files changed, 4 deletions(-) (limited to 'libpthread') diff --git a/libpthread/linuxthreads.old/forward.c b/libpthread/linuxthreads.old/forward.c index f5afc2f98..402b15543 100644 --- a/libpthread/linuxthreads.old/forward.c +++ b/libpthread/linuxthreads.old/forward.c @@ -165,8 +165,6 @@ FORWARD (pthread_setcanceltype, (int type, int *oldtype), (type, oldtype), 0) FORWARD2 (_pthread_cleanup_push, void, (struct _pthread_cleanup_buffer * buffer, void (*routine)(void *), void * arg), (buffer, routine, arg), return) FORWARD2 (_pthread_cleanup_push_defer, void, (struct _pthread_cleanup_buffer * buffer, void (*routine)(void *), void * arg), (buffer, routine, arg), return) -libc_hidden_def(_pthread_cleanup_push_defer) FORWARD2 (_pthread_cleanup_pop, void, (struct _pthread_cleanup_buffer * buffer, int execute), (buffer, execute), return) FORWARD2 (_pthread_cleanup_pop_restore, void, (struct _pthread_cleanup_buffer * buffer, int execute), (buffer, execute), return) -libc_hidden_def(_pthread_cleanup_pop_restore) diff --git a/libpthread/linuxthreads.old/sysdeps/pthread/pthread.h b/libpthread/linuxthreads.old/sysdeps/pthread/pthread.h index b1dcd1417..38d566731 100644 --- a/libpthread/linuxthreads.old/sysdeps/pthread/pthread.h +++ b/libpthread/linuxthreads.old/sysdeps/pthread/pthread.h @@ -642,7 +642,6 @@ extern void _pthread_cleanup_pop (struct _pthread_cleanup_buffer *__buffer, extern void _pthread_cleanup_push_defer (struct _pthread_cleanup_buffer *__buffer, void (*__routine) (void *), void *__arg) __THROW; -libc_hidden_proto(_pthread_cleanup_push_defer) extern void __pthread_cleanup_push_defer (struct _pthread_cleanup_buffer *__buffer, void (*__routine) (void *), void *__arg) __THROW; @@ -656,7 +655,6 @@ extern void __pthread_cleanup_push_defer (struct _pthread_cleanup_buffer *__buff extern void _pthread_cleanup_pop_restore (struct _pthread_cleanup_buffer *__buffer, int __execute) __THROW; -libc_hidden_proto(_pthread_cleanup_pop_restore) extern void __pthread_cleanup_pop_restore (struct _pthread_cleanup_buffer *__buffer, int __execute) __THROW; #endif -- cgit v1.2.3