Update.

	* sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S: New file.
	* sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S: New file.
	* sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S: New file.

4 files changed, 478 insertions, 0 deletions

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 6ba843a9a3..5a593c095e 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,9 @@
 2003-03-12  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S: New file.
+	* sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S: New file.
+	* sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S: New file.
+
 	* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedwrlock.S
 	(__pthread_rwlock_timedwrlock): Add missing opcode suffix.
 	* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedrdlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
new file mode 100644
index 0000000000..6ef605cde1
--- /dev/null
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
@@ -0,0 +1,175 @@
+/* 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.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <sysdep.h>
+#include <lowlevelrwlock.h>
+
+
+#define SYS_futex		202
+#define FUTEX_WAIT		0
+#define FUTEX_WAKE		1
+
+#define EAGAIN		11
+#define EDEADLK		35
+
+#ifndef UP
+# define LOCK lock
+#else
+# define LOCK
+#endif
+
+
+	.text
+
+	.globl	__pthread_rwlock_rdlock
+	.type	__pthread_rwlock_rdlock,@function
+	.align	16
+__pthread_rwlock_rdlock:
+	xorq	%r10, %r10
+
+	/* Get the lock.  */
+	movl	$1, %esi
+	LOCK
+#if MUTEX == 0
+	xaddl	%esi, (%rdi)
+#else
+	xaddl	%esi, MUTEX(%rdi)
+#endif
+	testl	%esi, %esi
+	jne	1f
+
+2:	movq	WRITER(%rdi), %rax
+	testq	%rax, %rax
+	jne	14f
+	cmpl	$0, WRITERS_QUEUED(%rdi)
+	je	5f
+	cmpl	$0, FLAGS(%rdi)
+	je	5f
+
+3:	incl	READERS_QUEUED(%rdi)
+	je	4f
+
+	movl	READERS_WAKEUP(%rdi), %edx
+
+	LOCK
+#if MUTEX == 0
+	incl	(%rdi)
+#else
+	incl	MUTEX(%rdi)
+#endif
+	jne	10f
+
+11:	addq	$READERS_WAKEUP-MUTEX, %rdi
+	movq	%r10, %rsi	/* movl $FUTEX_WAIT, %ecx */
+	movq	$SYS_futex, %rax
+	syscall
+
+	subq	$READERS_WAKEUP-MUTEX, %rdi
+
+	/* Reget the lock.  */
+	movl	$1, %esi
+	LOCK
+#if MUTEX == 0
+	xaddl	%esi, (%rdi)
+#else
+	xaddl	%esi, MUTEX(%rdi)
+#endif
+	testl	%esi, %esi
+	jne	12f
+
+13:	decl	READERS_QUEUED(%rdi)
+	jmp	2b
+
+5:	xorq	%rcx, %rcx
+	incl	NR_READERS(%rdi)
+	je	8f
+9:	LOCK
+#if MUTEX == 0
+	decl	(%rdi)
+#else
+	decl	MUTEX(%rdi)
+#endif
+	jne	6f
+7:
+
+	movq	%rcx, %rax
+	retq
+
+1:
+#if MUTEX != 0
+	addq	$MUTEX, %rdi
+#endif
+	call	__lll_mutex_lock_wait
+#if MUTEX != 0
+	subq	$MUTEX, %rdi
+#endif
+	jmp	2b
+
+14:	cmpq	%gs:16, %rax
+	jne	3b
+	/* Deadlock detected.  */
+	movq	$EDEADLK, %rcx
+	jmp	9b
+
+6:
+#if MUTEX != 0
+	addq	$MUTEX, %rdi
+#endif
+	call	__lll_mutex_unlock_wake
+#if MUTEX != 0
+	subq	$MUTEX, %rdi
+#endif
+	jmp	7b
+
+	/* Overflow.  */
+8:	decl	NR_READERS(%rdi)
+	movq	$EAGAIN, %rcx
+	jmp	9b
+
+	/* Overflow.  */
+4:	decl	READERS_QUEUED(%rdi)
+	movq	$EAGAIN, %rcx
+	jmp	9b
+
+10:
+#if MUTEX != 0
+	addq	$MUTEX, %rdi
+#endif
+	call	__lll_mutex_unlock_wake
+#if MUTEX != 0
+	subq	$MUTEX, %rdi
+#endif
+	jmp	11b
+
+12:
+#if MUTEX == 0
+	addq	$MUTEX, %rdi
+#endif
+	call	__lll_mutex_lock_wait
+#if MUTEX != 0
+	subq	$MUTEX, %rdi
+#endif
+	jmp	13b
+	.size	__pthread_rwlock_rdlock,.-__pthread_rwlock_rdlock
+
+	.globl	pthread_rwlock_rdlock
+pthread_rwlock_rdlock = __pthread_rwlock_rdlock
+
+	.globl	__pthread_rwlock_rdlock_internal
+__pthread_rwlock_rdlock_internal = __pthread_rwlock_rdlock
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S
new file mode 100644
index 0000000000..233f609b1e
--- /dev/null
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S
@@ -0,0 +1,136 @@
+/* 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.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <sysdep.h>
+#include <lowlevelrwlock.h>
+
+
+#define SYS_futex		240
+#define FUTEX_WAIT		0
+#define FUTEX_WAKE		1
+
+#ifndef UP
+# define LOCK lock
+#else
+# define LOCK
+#endif
+
+
+	.text
+
+	.globl	__pthread_rwlock_unlock
+	.type	__pthread_rwlock_unlock,@function
+	.align	16
+__pthread_rwlock_unlock:
+	/* Get the lock.  */
+	movl	$1, %esi
+	LOCK
+#if MUTEX == 0
+	xaddl	%esi, (%rdi)
+#else
+	xaddl	%esi, MUTEX(%rdi)
+#endif
+	testl	%esi, %esi
+	jne	1f
+
+2:	cmpq	$0, WRITER(%rdi)
+	jne	5f
+	decl	NR_READERS(%rdi)
+	jnz	6f
+
+5:	movq	$0, WRITER(%rdi)
+
+	movq	$1, %rsi
+	leaq	WRITERS_WAKEUP(%rdi), %r11
+	movq	%rsi, %rdx
+	cmpl	$0, WRITERS_QUEUED(%rdi)
+	jne	0f
+
+	/* If also no readers waiting nothing to do.  */
+	cmpl	$0, READERS_QUEUED(%rdi)
+	je	6f
+
+	movq	$0x7fffffff, %rdx
+	leaq	READERS_WAKEUP(%rdi), %r11
+
+0:	incl	(%r11)
+	LOCK
+#if MUTEX == 0
+	decl	(%rdi)
+#else
+	decl	MUTEX(%rdi)
+#endif
+	jne	7f
+
+8:	movq	$SYS_futex, %rax
+	movq	%r11, %rdi
+	syscall
+
+	xorq	%rax, %rax
+	retq
+
+	.align	16
+6:	LOCK
+#if MUTEX == 0
+	decl	(%rdi)
+#else
+	decl	MUTEX(%rdi)
+#endif
+	jne	3f
+
+4:	xorq	%rax, %rax
+	retq
+
+1:
+#if MUTEX != 0
+	addq	$MUTEX, %rdi
+#endif
+	call	__lll_mutex_lock_wait
+#if MUTEX != 0
+	subq	$MUTEX, %rdi
+#endif
+	jmp	2b
+
+3:
+#if MUTEX != 0
+	addq	$MUTEX, %rdi
+#endif
+	call	__lll_mutex_unlock_wake
+#if MUTEX != 0
+	subq	$MUTEX, %rdi
+#endif
+	jmp	4b
+
+7:
+#if MUTEX != 0
+	addq	$MUTEX, %rdi
+#endif
+	call	__lll_mutex_unlock_wake
+#if MUTEX != 0
+	subq	$MUTEX, %rdi
+#endif
+	jmp	8b
+
+	.size	__pthread_rwlock_unlock,.-__pthread_rwlock_unlock
+
+	.globl	pthread_rwlock_unlock
+pthread_rwlock_unlock = __pthread_rwlock_unlock
+
+	.globl	__pthread_rwlock_unlock_internal
+__pthread_rwlock_unlock_internal = __pthread_rwlock_unlock
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
new file mode 100644
index 0000000000..3de464afc4
--- /dev/null
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
@@ -0,0 +1,163 @@
+/* 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.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <sysdep.h>
+#include <lowlevelrwlock.h>
+
+
+#define SYS_futex		202
+#define FUTEX_WAIT		0
+#define FUTEX_WAKE		1
+
+#define EAGAIN		11
+#define EDEADLK		35
+
+#ifndef UP
+# define LOCK lock
+#else
+# define LOCK
+#endif
+
+
+	.text
+
+	.globl	__pthread_rwlock_wrlock
+	.type	__pthread_rwlock_wrlock,@function
+	.align	16
+__pthread_rwlock_wrlock:
+	xorq	%r10, %r10
+
+	/* Get the lock.  */
+	movl	$1, %esi
+	LOCK
+#if MUTEX == 0
+	xaddl	%esi, (%rdi)
+#else
+	xaddl	%esi, MUTEX(%rdi)
+#endif
+	testl	%esi, %esi
+	jne	1f
+
+2:	movq	WRITER(%rdi), %rax
+	testq	%rax, %rax
+	jne	14f
+	cmpl	$0, NR_READERS(%rdi)
+	je	5f
+
+3:	incl	WRITERS_QUEUED(%rdi)
+	je	4f
+
+	movl	WRITERS_WAKEUP(%rdi), %edx
+
+	LOCK
+#if MUTEX == 0
+	decl	(%rdi)
+#else
+	decl	MUTEX(%rdi)
+#endif
+	jne	10f
+
+11:	addq	$WRITERS_WAKEUP-MUTEX, %rdi
+	movq	%r10, %rsi	/* movq $FUTEX_WAIT, %rsi */
+	movq	$SYS_futex, %rax
+	syscall
+
+	subq	$WRITERS_WAKEUP-MUTEX, %rdi
+
+	/* Reget the lock.  */
+	movl	$1, %esi
+	LOCK
+#if MUTEX == 0
+	xaddl	%esi, (%rdi)
+#else
+	xaddl	%esi, MUTEX(%rdi)
+#endif
+	testl	%esi, %esi
+	jne	12f
+
+13:	decl	WRITERS_QUEUED(%rdi)
+	jmp	2b
+
+5:	xorq	%rcx, %rcx
+	movq	%gs:16, %rax
+	movq	%rax, WRITER(%rdi)
+9:	LOCK
+#if MUTEX == 0
+	decl	(%rdi)
+#else
+	decl	$MUTEX(%rdi)
+#endif
+	jne	6f
+7:
+
+	movq	%rcx, %rax
+	retq
+
+1:
+#if MUTEX != 0
+	addq	$MUTEX, %rdi
+#endif
+	call	__lll_mutex_lock_wait
+#if MUTEX != 0
+	subq	$MUTEX, %rdi
+#endif
+	jmp	2b
+
+14:	cmpq	%gs:16, %rax
+	jne	3b
+	movq	$EDEADLK, %rcx
+	jmp	9b
+
+6:
+#if MUTEX != 0
+	addq	$MUTEX, %rdi
+#endif
+	call	__lll_mutex_unlock_wake
+	jmp	7b
+
+4:	decl	WRITERS_QUEUED(%rdi)
+	movl	$EAGAIN, %ecx
+	jmp	9b
+
+10:
+#if MUTEX != 0
+	addq	$MUTEX, %rdi
+#endif
+	call	__lll_mutex_unlock_wake
+#if MUTEX != 0
+	subq	$MUTEX, %rdi
+#endif
+	jmp	11b
+
+12:
+#if MUTEX != 0
+	addq	$MUTEX, %rdi
+#endif
+	call	__lll_mutex_lock_wait
+#if MUTEX != 0
+	subq	$MUTEX, %rdi
+#endif
+	jmp	13b
+	.size	__pthread_rwlock_wrlock,.-__pthread_rwlock_wrlock
+
+	.globl	pthread_rwlock_wrlock
+pthread_rwlock_wrlock = __pthread_rwlock_wrlock
+
+	.globl	__pthread_rwlock_wrlock_internal
+__pthread_rwlock_wrlock_internal = __pthread_rwlock_wrlock