This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch sthibaul/hurd-builds updated. glibc-2.26.9000-1245-g3f2314f
- From: sthibaul at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 28 Jan 2018 17:36:26 -0000
- Subject: GNU C Library master sources branch sthibaul/hurd-builds updated. glibc-2.26.9000-1245-g3f2314f
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, sthibaul/hurd-builds has been updated
via 3f2314fc37361af3bd9b3e84178652c332b4817c (commit)
from f5601e2e0dd22f2b935424ab6ac8d8b3a04dd54c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=3f2314fc37361af3bd9b3e84178652c332b4817c
commit 3f2314fc37361af3bd9b3e84178652c332b4817c
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun Jan 28 18:31:35 2018 +0100
Fix thread linkspace
Libc uses some thread functions, but should not expose the corresponding
symbols, so call aliases.
diff --git a/hurd/Versions b/hurd/Versions
index fcf2549..eb4153d 100644
--- a/hurd/Versions
+++ b/hurd/Versions
@@ -137,14 +137,14 @@ libc {
HURD_CTHREADS_0.3 {
# weak refs to libthreads functions that libc calls iff libthreads in use
- cthread_fork; cthread_detach;
- pthread_getattr_np; pthread_attr_getstack;
+ __cthread_fork; __cthread_detach;
+ __pthread_getattr_np; __pthread_attr_getstack;
# variables used for detecting cthreads
_cthread_exit_routine; _cthread_init_routine;
# cthreads functions with stubs in libc
- cthread_keycreate; cthread_getspecific; cthread_setspecific;
+ __cthread_keycreate; __cthread_getspecific; __cthread_setspecific;
}
GLIBC_PRIVATE {
diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c
index c6b8c63..6158df6 100644
--- a/hurd/hurdsig.c
+++ b/hurd/hurdsig.c
@@ -1258,11 +1258,11 @@ _hurdsig_init (const int *intarray, size_t intarraysize)
/* Start the signal thread listening on the message port. */
-#pragma weak cthread_fork
-#pragma weak cthread_detach
-#pragma weak pthread_getattr_np
-#pragma weak pthread_attr_getstack
- if (!cthread_fork)
+#pragma weak __cthread_fork
+#pragma weak __cthread_detach
+#pragma weak __pthread_getattr_np
+#pragma weak __pthread_attr_getstack
+ if (!__cthread_fork)
{
err = __thread_create (__mach_task_self (), &_hurd_msgport_thread);
assert_perror (err);
@@ -1287,7 +1287,7 @@ _hurdsig_init (const int *intarray, size_t intarraysize)
}
else
{
- cthread_t thread;
+ __cthread_t thread;
/* When cthreads is being used, we need to make the signal thread a
proper cthread. Otherwise it cannot use mutex_lock et al, which
will be the cthreads versions. Various of the message port RPC
@@ -1297,17 +1297,17 @@ _hurdsig_init (const int *intarray, size_t intarraysize)
we'll let the signal thread's per-thread variables be found as for
any normal cthread, and just leave the magic __hurd_sigthread_*
values all zero so they'll be ignored. */
- cthread_detach (thread = cthread_fork ((cthread_fn_t) &_hurd_msgport_receive, 0));
+ __cthread_detach (thread = __cthread_fork ((cthread_fn_t) &_hurd_msgport_receive, 0));
- if (pthread_getattr_np)
+ if (__pthread_getattr_np)
{
/* Record stack layout for fork() */
pthread_attr_t attr;
void *addr;
size_t size;
- pthread_getattr_np ((pthread_t) thread, &attr);
- pthread_attr_getstack (&attr, &addr, &size);
+ __pthread_getattr_np ((pthread_t) thread, &attr);
+ __pthread_attr_getstack (&attr, &addr, &size);
__hurd_sigthread_stack_base = (uintptr_t) addr;
__hurd_sigthread_stack_end = __hurd_sigthread_stack_base + size;
}
diff --git a/sysdeps/mach/hurd/cthreads.c b/sysdeps/mach/hurd/cthreads.c
index a4280cc..dfd7012 100644
--- a/sysdeps/mach/hurd/cthreads.c
+++ b/sysdeps/mach/hurd/cthreads.c
@@ -25,7 +25,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;
@@ -35,7 +35,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);
@@ -45,7 +45,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;
-----------------------------------------------------------------------
Summary of changes:
hurd/Versions | 6 +++---
hurd/hurdsig.c | 20 ++++++++++----------
sysdeps/mach/hurd/cthreads.c | 6 +++---
3 files changed, 16 insertions(+), 16 deletions(-)
hooks/post-receive
--
GNU C Library master sources