aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-03-07 18:37:10 +0000
committerUlrich Drepper <drepper@redhat.com>2003-03-07 18:37:10 +0000
commit41d4d22399119f11bbdfa5d460a7270412029eb7 (patch)
treef031af3e9e0fdb59687a534480f69fcc51764a5d
parent0a0ee8be8f5e1caf73f7801b6cfdde56f23a63d5 (diff)
downloadglibc-41d4d22399119f11bbdfa5d460a7270412029eb7.tar
glibc-41d4d22399119f11bbdfa5d460a7270412029eb7.tar.gz
glibc-41d4d22399119f11bbdfa5d460a7270412029eb7.tar.bz2
glibc-41d4d22399119f11bbdfa5d460a7270412029eb7.zip
Update.
* sysdeps/i386/i486/bits/atomic.h: Fix a few unused definitions. * sysdeps/unix/sysv/linux/i386/lowlevellock.h: Remove all trace of lll_wake_tid. This was used only to work around kernel limits in the early days. * sysdeps/unix/sysv/linux/s390/lowlevellock.h: Likewise. * sysdeps/unix/sysv/linux/sh/libc-lowlevellock.S: Likewise. * sysdeps/unix/sysv/linux/sh/lowlevellock.S: Likewise. * sysdeps/unix/sysv/linux/sh/lowlevellock.h: Likewise.
-rw-r--r--nptl/ChangeLog10
-rw-r--r--nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h16
-rw-r--r--nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h10
-rw-r--r--nptl/sysdeps/unix/sysv/linux/sh/libc-lowlevellock.S19
-rw-r--r--nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S21
-rw-r--r--nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h8
6 files changed, 13 insertions, 71 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 3ad0d2eb9a..562e38bffd 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,15 @@
2003-03-07 Ulrich Drepper <drepper@redhat.com>
+ * sysdeps/i386/i486/bits/atomic.h: Fix a few unused definitions.
+
+ * sysdeps/unix/sysv/linux/i386/lowlevellock.h: Remove all trace of
+ lll_wake_tid. This was used only to work around kernel limits in
+ the early days.
+ * sysdeps/unix/sysv/linux/s390/lowlevellock.h: Likewise.
+ * sysdeps/unix/sysv/linux/sh/libc-lowlevellock.S: Likewise.
+ * sysdeps/unix/sysv/linux/sh/lowlevellock.S: Likewise.
+ * sysdeps/unix/sysv/linux/sh/lowlevellock.h: Likewise.
+
* init.c (__static_tls_align_m1): Renamed from __static_tls_align.
(__pthread_initialize_minimal_internal): Change initialization of
__static_tls_align_m1 appropriately.
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
index dbe89e1c7c..8b302c9dc4 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
+++ b/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -300,20 +300,6 @@ extern int __lll_timedwait_tid (int *tid, const struct timespec *abstime)
__result; })
-#define lll_wake_tid(tid) \
- do { \
- int __ignore; \
- (tid) = 0; \
- __asm __volatile (LLL_TID_EBX_LOAD \
- LLL_TID_ENTER_KERNEL \
- LLL_TID_EBX_LOAD \
- : "=a" (__ignore) \
- : "0" (SYS_futex), LLL_TID_EBX_REG (&(tid)), "S" (0), \
- "c" (FUTEX_WAKE), "d" (0x7fffffff) \
- "i" (offsetof (tcbhead_t, sysinfo))); \
- } while (0)
-
-
/* Conditional variable handling. */
extern void __lll_cond_wait (pthread_cond_t *cond)
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h
index 13cfbd6bd2..0846503e2f 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h
+++ b/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h
@@ -260,16 +260,6 @@ __lll_timedwait_tid (int *ptid, const struct timespec *abstime)
#define lll_timedwait_tid(tid, abstime) __lll_timedwait_tid (&(tid), abstime)
-static inline void
-__attribute__ ((always_inline))
-__lll_wake_tid (int *ptid)
-{
- *ptid = 0;
- lll_futex_wake (ptid, INT_MAX);
-}
-#define lll_wake_tid(tid) __lll_wake_tid (&(tid))
-
-
/* Conditional variable handling. */
extern void __lll_cond_wait (pthread_cond_t *cond)
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/libc-lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/sh/libc-lowlevellock.S
index 350a935388..82b0189404 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/libc-lowlevellock.S
+++ b/nptl/sysdeps/unix/sysv/linux/sh/libc-lowlevellock.S
@@ -121,7 +121,7 @@ __lll_wait_tid:
nop
.size __lll_wait_tid,.-__lll_wait_tid
-
+
.globl __lll_timedwait_tid
.type __lll_timedwait_tid,@function
.hidden __lll_timedwait_tid
@@ -202,20 +202,3 @@ __lll_timedwait_tid:
.long 1000000000
.size __lll_timedwait_tid,.-__lll_timedwait_tid
-
-
- .globl __lll_wake_tid
- .type __lll_wake_tid,@function
- .hidden __lll_wake_tid
-__lll_wake_tid:
- mov #FUTEX_WAKE, r5
- mov #-1, r6
- shlr r6 /* r6 = 0x7fffffff */
- mov #0, r7
- mov #SYS_futex, r3
- extu.b r3, r3
- trapa #0x14
- SYSCALL_INST_PAD
- rts
- nop
- .size __lll_wake_tid,.-__lll_wake_tid
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
index 8352ef0450..ab54ea5234 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
+++ b/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
@@ -122,7 +122,7 @@ __lll_wait_tid:
nop
.size __lll_wait_tid,.-__lll_wait_tid
-
+
.globl __lll_timedwait_tid
.type __lll_timedwait_tid,@function
.hidden __lll_timedwait_tid
@@ -203,22 +203,3 @@ __lll_timedwait_tid:
.long 1000000000
.size __lll_timedwait_tid,.-__lll_timedwait_tid
-
-
- .globl __lll_wake_tid
- .type __lll_wake_tid,@function
- .hidden __lll_wake_tid
-__lll_wake_tid:
- mov #FUTEX_WAKE, r5
- mov #-1, r6
- shlr r6 /* r6 = 0x7fffffff */
- mov #0, r7
- mov #SYS_futex, r3
- extu.b r3, r3
- trapa #0x14
- SYSCALL_INST_PAD
- rts
- nop
- .size __lll_wake_tid,.-__lll_wake_tid
-
-
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h
index d9a69c7a48..7e00fd01da 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h
+++ b/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h
@@ -215,14 +215,6 @@ extern int __lll_timedwait_tid (int *tid, const struct timespec *abstime)
__result; })
-extern int __lll_wake_tid (int *tid) attribute_hidden;
-#define lll_wake_tid(tid) \
- do { \
- (tid) = 0; \
- ___lll_wake_tid (&tid); \
- } while (0)
-
-
/* Conditional variable handling. */
extern void __lll_cond_wait (pthread_cond_t *cond) attribute_hidden;