diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-03-25 02:43:26 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-03-25 02:43:26 +0100 |
| commit | ac7b35ef1125bb925f4a02018431a83ab41690d9 (patch) | |
| tree | a1790ebbba86f4bcb493875a0a877b245f2c3dff | |
| parent | c8f349a1696879aa666a32a990bb17b8f8ba3bed (diff) | |
| parent | 90ae11939792f779bf07ced051ea17857d932a3c (diff) | |
Merge branch 't/pthread_functions' into refs/top-bases/tschwinge/Roger_Whittaker
| -rw-r--r-- | .topmsg | 12 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/bits/libc-lock.h | 6 |
2 files changed, 13 insertions, 5 deletions
@@ -1,7 +1,9 @@ -From: Thomas Schwinge <thomas@schwinge.name> -Subject: [PATCH] tls-threadvar +Commited to git -replace the custom threadvar mechanism with generic TLS. -That will fix sigaltstack. +From: Samuel Thibault <samuel.thibault@ens-lyon.org> +Subject: [PATCH] hurd: Make libc able to call pthread stubs -Note: the added reply_port and _hurd_sigstate fields should be kept last. +* sysdeps/mach/hurd/bits/libc-lock.h [_LIBC]: Include +<bits/libc-lockP.h> + +Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org> diff --git a/sysdeps/mach/hurd/bits/libc-lock.h b/sysdeps/mach/hurd/bits/libc-lock.h index 0a7fb0bf8c..cc4afb1507 100644 --- a/sysdeps/mach/hurd/bits/libc-lock.h +++ b/sysdeps/mach/hurd/bits/libc-lock.h @@ -210,4 +210,10 @@ void *__libc_getspecific (__libc_key_t key); #endif /* _CTHREADS_ */ +/* Hide the definitions which are only supposed to be used inside libc in + a separate file. This file is not present in the installation! */ +#ifdef _LIBC +# include <bits/libc-lockP.h> +#endif + #endif /* bits/libc-lock.h */ |