diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-06-16 10:52:04 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-06-16 10:52:04 +0200 |
| commit | f96a85e0fe83abdc30c73e6f01b995baf733e97b (patch) | |
| tree | 20ee97cbd3a7d1f5b9af63e9e037eba19737776c /sysdeps/htl | |
| parent | 8c9d53428e463da0ab99ff5162d94c3a043b3a2d (diff) | |
| download | glibc-f96a85e0fe83abdc30c73e6f01b995baf733e97b.tar.gz | |
hurd: Fix missing __pthread_get_cleanup_stack symbol
Rework 57e1651557e8 ("hurd: Avoid PLT ref for __pthread_get_cleanup_stack")
to keep the __pthread_get_cleanup_stack symbol.
* htl/pt-cleanup.c (__pthread_get_cleanup_stack): Rename to
___pthread_get_cleanup_stack.
(__pthread_get_cleanup_stack): Remove hidden def, add alias.
* htl/pt-exit.c (__pthread_exit): Use ___pthread_get_cleanup_stack
instead of __pthread_get_cleanup_stack.
* sysdeps/htl/pthread-functions.h [libpthread]
(__pthread_get_cleanup_stack): Remove hidden proto.
* sysdeps/htl/pthreadP.h (___pthread_get_cleanup_stack): Add
prototype.
* sysdeps/htl/pthreadP.h (___pthread_get_cleanup_stack): Add hidden
attribute.
* htl/pt-join.c (__pthread_get_cleanup_stack): Define to
___pthread_get_cleanup_stack.
Diffstat (limited to 'sysdeps/htl')
| -rw-r--r-- | sysdeps/htl/pthread-functions.h | 3 | ||||
| -rw-r--r-- | sysdeps/htl/pthreadP.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h index bb901e3b7f..a0d06cc039 100644 --- a/sysdeps/htl/pthread-functions.h +++ b/sysdeps/htl/pthread-functions.h @@ -60,9 +60,6 @@ pthread_t __pthread_self (void); int __pthread_setcancelstate (int, int *); int __pthread_setcanceltype (int, int *); struct __pthread_cancelation_handler **__pthread_get_cleanup_stack (void); -#if IS_IN (libpthread) -hidden_proto (__pthread_get_cleanup_stack) -#endif int __pthread_once (pthread_once_t *, void (*) (void)); int __pthread_rwlock_rdlock (pthread_rwlock_t *); int __pthread_rwlock_wrlock (pthread_rwlock_t *); diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h index 3fcb811f49..132ac1718e 100644 --- a/sysdeps/htl/pthreadP.h +++ b/sysdeps/htl/pthreadP.h @@ -64,6 +64,7 @@ int __pthread_attr_setstacksize (pthread_attr_t *__attr, size_t __stacksize); int __pthread_attr_setstack (pthread_attr_t *__attr, void *__stackaddr, size_t __stacksize); int __pthread_attr_getstack (const pthread_attr_t *, void **, size_t *); +struct __pthread_cancelation_handler **___pthread_get_cleanup_stack (void) attribute_hidden; #if IS_IN (libpthread) hidden_proto (__pthread_key_create) |