diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-03-17 23:53:39 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-03-17 23:53:39 +0100 |
| commit | c2fb08c78ac4716266c4dd7c9b4aa3c33b033d13 (patch) | |
| tree | 6adb6af6f85b49d4780518f3443e3363e77dcf10 /sysdeps | |
| parent | dc33bef307ad6eeb1cc4e4e230b69c6058890388 (diff) | |
| download | glibc-c2fb08c78ac4716266c4dd7c9b4aa3c33b033d13.zip glibc-c2fb08c78ac4716266c4dd7c9b4aa3c33b033d13.tar.gz glibc-c2fb08c78ac4716266c4dd7c9b4aa3c33b033d13.tar.bz2 | |
hurd: Fix link cthread/pthread symbol exposition.
* hurd/Versions (HURD_CTHREADS_0.3): Rename weak refs cthread_fork,
cthread_detach, pthread_getattr_np, pthread_attr_getstack,
cthread_keycreate, cthread_getspecific, cthread_setspecific to
__cthread_fork, __cthread_detach, __pthread_getattr_np,
__pthread_attr_getstack, __cthread_keycreate, __cthread_getspecific,
__cthread_setspecific.
* hurd/hurdsig.c (_hurdsig_init): Use __cthread_fork,
__cthread_detach, __pthread_getattr_np, __pthread_attr_getstack,
__cthread_t instead of cthread_fork, cthread_detach,
pthread_getattr_np, pthread_attr_getstack.
* sysdeps/mach/hurd/cthreads.c (cthread_keycreate): Rename to
__cthread_keycreate.
(cthread_getspecific): Rename to __cthread_getspecific.
(cthread_setspecific): Rename to __cthread_setspecific.
(__libc_getspecific): Use __cthread_getspecific instead of
cthread_getspecific.
* sysdeps/mach/hurd/libc-lock.h (__libc_key_create): Use
__cthread_keycreate instead of cthread_keycreate.
(__libc_setspecific): Use __cthread_setspecific instead of
cthread_setspecific.
* sysdeps/mach/libc-lock.h (__libc_key_create, __libc_setspecific):
Likewise.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/mach/hurd/cthreads.c | 8 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/libc-lock.h | 4 | ||||
| -rw-r--r-- | sysdeps/mach/libc-lock.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sysdeps/mach/hurd/cthreads.c b/sysdeps/mach/hurd/cthreads.c index 640c97e..3568930 100644 --- a/sysdeps/mach/hurd/cthreads.c +++ b/sysdeps/mach/hurd/cthreads.c @@ -26,7 +26,7 @@ char __libc_lock_self0[0]; /* Placeholder for key creation routine from Hurd cthreads library. */ int weak_function -cthread_keycreate (cthread_key_t *key) +__cthread_keycreate (cthread_key_t *key) { __set_errno (ENOSYS); *key = -1; @@ -36,7 +36,7 @@ cthread_keycreate (cthread_key_t *key) /* Placeholder for key retrieval routine from Hurd cthreads library. */ int weak_function -cthread_getspecific (cthread_key_t key, void **pval) +__cthread_getspecific (cthread_key_t key, void **pval) { *pval = NULL; __set_errno (ENOSYS); @@ -46,7 +46,7 @@ cthread_getspecific (cthread_key_t key, void **pval) /* Placeholder for key setting routine from Hurd cthreads library. */ int weak_function -cthread_setspecific (cthread_key_t key, void *val) +__cthread_setspecific (cthread_key_t key, void *val) { __set_errno (ENOSYS); return -1; @@ -58,6 +58,6 @@ void * __libc_getspecific (cthread_key_t key) { void *val; - cthread_getspecific (key, &val); + __cthread_getspecific (key, &val); return val; } diff --git a/sysdeps/mach/hurd/libc-lock.h b/sysdeps/mach/hurd/libc-lock.h index 2dfade9..ed45f07 100644 --- a/sysdeps/mach/hurd/libc-lock.h +++ b/sysdeps/mach/hurd/libc-lock.h @@ -201,8 +201,8 @@ struct __libc_once /* Type for key of thread specific data. */ typedef cthread_key_t __libc_key_t; -#define __libc_key_create(KEY,DEST) cthread_keycreate (KEY) -#define __libc_setspecific(KEY,VAL) cthread_setspecific (KEY, VAL) +#define __libc_key_create(KEY,DEST) __cthread_keycreate (KEY) +#define __libc_setspecific(KEY,VAL) __cthread_setspecific (KEY, VAL) void *__libc_getspecific (__libc_key_t key); #endif /* _CTHREADS_ */ diff --git a/sysdeps/mach/libc-lock.h b/sysdeps/mach/libc-lock.h index caeba47..89e5715 100644 --- a/sysdeps/mach/libc-lock.h +++ b/sysdeps/mach/libc-lock.h @@ -124,8 +124,8 @@ struct __libc_once #define __libc_mutex_unlock __mutex_unlock #endif -#define __libc_key_create(KEY,DEST) cthread_keycreate (KEY) -#define __libc_setspecific(KEY,VAL) cthread_setspecific (KEY, VAL) +#define __libc_key_create(KEY,DEST) __cthread_keycreate (KEY) +#define __libc_setspecific(KEY,VAL) __cthread_setspecific (KEY, VAL) void *__libc_getspecific (__libc_key_t key); /* XXX until cthreads supports recursive locks */ |