diff options
author | Roland McGrath <roland@hack.frob.com> | 2014-07-07 09:28:38 -0700 |
---|---|---|
committer | Roland McGrath <roland@hack.frob.com> | 2014-07-07 09:28:38 -0700 |
commit | 08192659bbeae149e7cb1f4c43547257f7099bb0 (patch) | |
tree | 9f602a4e9f0aefdb06bc15a76be46e958e91a58f /sysdeps/unix/sysv/linux/s390 | |
parent | 96baf6ffc57b811bbc424a1fc72ef77dd56d7a18 (diff) | |
download | glibc-08192659bbeae149e7cb1f4c43547257f7099bb0.tar.gz glibc-08192659bbeae149e7cb1f4c43547257f7099bb0.tar.xz glibc-08192659bbeae149e7cb1f4c43547257f7099bb0.zip |
Get rid of nptl/sysdeps/ entirely!
Diffstat (limited to 'sysdeps/unix/sysv/linux/s390')
-rw-r--r-- | sysdeps/unix/sysv/linux/s390/jmp-unwind.c | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/s390/pthread_mutex_cond_lock.c | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-64/sigaction.c | 10 |
3 files changed, 3 insertions, 11 deletions
diff --git a/sysdeps/unix/sysv/linux/s390/jmp-unwind.c b/sysdeps/unix/sysv/linux/s390/jmp-unwind.c index f35eab5ac1..32226bc593 100644 --- a/sysdeps/unix/sysv/linux/s390/jmp-unwind.c +++ b/sysdeps/unix/sysv/linux/s390/jmp-unwind.c @@ -18,7 +18,7 @@ #include <setjmp.h> #include <stddef.h> -#include <pthreadP.h> +#include <nptl/pthreadP.h> extern void __pthread_cleanup_upto (__jmp_buf env, char *targetframe); #pragma weak __pthread_cleanup_upto diff --git a/sysdeps/unix/sysv/linux/s390/pthread_mutex_cond_lock.c b/sysdeps/unix/sysv/linux/s390/pthread_mutex_cond_lock.c index 6fc0f969ef..aa6cf9a79e 100644 --- a/sysdeps/unix/sysv/linux/s390/pthread_mutex_cond_lock.c +++ b/sysdeps/unix/sysv/linux/s390/pthread_mutex_cond_lock.c @@ -19,4 +19,4 @@ already elided locks. */ #include <elision-conf.h> -#include <nptl/sysdeps/unix/sysv/linux/pthread_mutex_cond_lock.c> +#include <nptl/pthread_mutex_cond_lock.c> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sigaction.c b/sysdeps/unix/sysv/linux/s390/s390-64/sigaction.c index e9a984b5af..995afbc2fc 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/sigaction.c +++ b/sysdeps/unix/sysv/linux/s390/s390-64/sigaction.c @@ -43,12 +43,4 @@ __libc_sigaction (sig, act, oact) } libc_hidden_def (__libc_sigaction) -#ifdef WRAPPER_INCLUDE -# include WRAPPER_INCLUDE -#endif - -#ifndef LIBC_SIGACTION -weak_alias (__libc_sigaction, __sigaction) -libc_hidden_weak (__sigaction) -weak_alias (__libc_sigaction, sigaction) -#endif +#include <nptl/sigaction.c> |