diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2007-05-26 20:13:27 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2007-05-26 20:13:27 +0000 |
| commit | 6df7ffad195864a5c28d9d24093866e919ef0494 (patch) | |
| tree | 02d6096090d896d537fc60d5047af0da0bc0772b /nptl/sysdeps | |
| parent | d8ff3792a8020ff25b703109a763161236cfa8dd (diff) | |
| download | glibc-6df7ffad195864a5c28d9d24093866e919ef0494.tar glibc-6df7ffad195864a5c28d9d24093866e919ef0494.tar.gz glibc-6df7ffad195864a5c28d9d24093866e919ef0494.tar.bz2 glibc-6df7ffad195864a5c28d9d24093866e919ef0494.zip | |
* sysdeps/unix/sysv/linux/powerpc/libc-start.c: Include <sysdep.h>.
Diffstat (limited to 'nptl/sysdeps')
| -rw-r--r-- | nptl/sysdeps/i386/tls.h | 10 | ||||
| -rw-r--r-- | nptl/sysdeps/powerpc/tcb-offsets.sym | 1 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/sem_timedwait.c | 10 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/sem_wait.c | 1 | ||||
| -rw-r--r-- | nptl/sysdeps/x86_64/tls.h | 8 |
5 files changed, 2 insertions, 28 deletions
diff --git a/nptl/sysdeps/i386/tls.h b/nptl/sysdeps/i386/tls.h index 90a8b50dad..64eab45c01 100644 --- a/nptl/sysdeps/i386/tls.h +++ b/nptl/sysdeps/i386/tls.h @@ -458,16 +458,6 @@ union user_desc_init #define THREAD_GSCOPE_WAIT() \ GL(dl_wait_lookup_done) () - -#ifndef __ASSUME_PRIVATE_FUTEX -# define THREAD_SET_PRIVATE_FUTEX(value) \ - THREAD_SETMEM (THREAD_SELF, header.private_futex, value) -# define THREAD_COPY_PRIVATE_FUTEX(descr) \ - ((descr)->header.private_futex \ - = THREAD_GETMEM (THREAD_SELF, header.private_futex)) -#endif - - #endif /* __ASSEMBLER__ */ #endif /* tls.h */ diff --git a/nptl/sysdeps/powerpc/tcb-offsets.sym b/nptl/sysdeps/powerpc/tcb-offsets.sym index 4a8671e802..eda43dce8e 100644 --- a/nptl/sysdeps/powerpc/tcb-offsets.sym +++ b/nptl/sysdeps/powerpc/tcb-offsets.sym @@ -15,3 +15,4 @@ MULTIPLE_THREADS_OFFSET thread_offsetof (header.multiple_threads) PID thread_offsetof (pid) TID thread_offsetof (tid) POINTER_GUARD (offsetof (tcbhead_t, pointer_guard) - TLS_TCB_OFFSET - sizeof (tcbhead_t)) +PRIVATE_FUTEX_OFFSET thread_offsetof (header.private_futex) diff --git a/nptl/sysdeps/unix/sysv/linux/sem_timedwait.c b/nptl/sysdeps/unix/sysv/linux/sem_timedwait.c index 30f6a87df4..4c8acd0938 100644 --- a/nptl/sysdeps/unix/sysv/linux/sem_timedwait.c +++ b/nptl/sysdeps/unix/sysv/linux/sem_timedwait.c @@ -31,16 +31,6 @@ extern void __sem_wait_cleanup (void *arg) attribute_hidden; -void -attribute_hidden -__sem_wait_cleanup (void *arg) -{ - struct new_sem *isem = (struct new_sem *) arg; - - atomic_decrement (&isem->nwaiters); -} - - int sem_timedwait (sem_t *sem, const struct timespec *abstime) { diff --git a/nptl/sysdeps/unix/sysv/linux/sem_wait.c b/nptl/sysdeps/unix/sysv/linux/sem_wait.c index e35b6480f2..05114c9704 100644 --- a/nptl/sysdeps/unix/sysv/linux/sem_wait.c +++ b/nptl/sysdeps/unix/sysv/linux/sem_wait.c @@ -65,6 +65,7 @@ __new_sem_wait (sem_t *sem) { __set_errno (-err); err = -1; + break; } if (atomic_decrement_if_positive (&isem->value) > 0) diff --git a/nptl/sysdeps/x86_64/tls.h b/nptl/sysdeps/x86_64/tls.h index cb3b474f97..c3afb3f03c 100644 --- a/nptl/sysdeps/x86_64/tls.h +++ b/nptl/sysdeps/x86_64/tls.h @@ -364,14 +364,6 @@ typedef struct #define THREAD_GSCOPE_WAIT() \ GL(dl_wait_lookup_done) () -#ifndef __ASSUME_PRIVATE_FUTEX -# define THREAD_SET_PRIVATE_FUTEX(value) \ - THREAD_SETMEM (THREAD_SELF, header.private_futex, value) -# define THREAD_COPY_PRIVATE_FUTEX(descr) \ - ((descr)->header.private_futex \ - = THREAD_GETMEM (THREAD_SELF, header.private_futex)) -#endif - #endif /* __ASSEMBLER__ */ #endif /* tls.h */ |