Update.

2000-07-27  Jes Sorensen  <jes@linuxcare.com>

	* sysdeps/unix/sysv/linux/ia64/fork.c: Make __libc_fork the strong
	name and add weak alias for __fork.

	* sysdeps/unix/sysv/linux/ia64/syscalls.list: Change llseek, pread
	& pwrite to use __libc_<name> as strong names instead of
	__syscall_<name>.

	* include/sched.h: Add clone2 prototype.

2000-07-26  Jes Sorensen  <jes@linuxcare.com>

	* sysdeps/unix/sysv/linux/ia64/sysdep.h (ENTRY): Don't declare the
	procedure name twice.

2000-07-27  Philip Blundell  <philb@gnu.org>

	* malloc/malloc.c (HAVE_MREMAP): Undo change of 1997-12-04.

7 files changed, 123 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 0eb4a99c2a..ee9dde4fed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2000-07-27  Jes Sorensen  <jes@linuxcare.com>
+
+	* sysdeps/unix/sysv/linux/ia64/fork.c: Make __libc_fork the strong
+	name and add weak alias for __fork.
+
+	* sysdeps/unix/sysv/linux/ia64/syscalls.list: Change llseek, pread
+	& pwrite to use __libc_<name> as strong names instead of
+	__syscall_<name>.
+
+	* include/sched.h: Add clone2 prototype.
+
+2000-07-26  Jes Sorensen  <jes@linuxcare.com>
+
+	* sysdeps/unix/sysv/linux/ia64/sysdep.h (ENTRY): Don't declare the
+	procedure name twice.
+
+2000-07-27  Philip Blundell  <philb@gnu.org>
+
+	* malloc/malloc.c (HAVE_MREMAP): Undo change of 1997-12-04.
+
 2000-07-27  Andreas Jaeger  <aj@suse.de>
 
 	* sysdeps/unix/sysv/linux/bits/socket.h: Rename MSG_URG TO
diff --git a/include/sched.h b/include/sched.h
index 3866a0d08b..a7894c5ab1 100644
--- a/include/sched.h
+++ b/include/sched.h
@@ -13,7 +13,9 @@ extern int __sched_get_priority_max (int __algorithm);
 extern int __sched_get_priority_min (int __algorithm);
 extern int __sched_rr_get_interval (__pid_t __pid, struct timespec *__t);
 
-/* This is Linux specific.  */
+/* These are Linux specific.  */
 extern int __clone (int (*__fn) (void *__arg), void *__child_stack,
 		    int __flags, void *__arg);
+extern int __clone2 (int (*__fn) (void *__arg), void *__child_stack_base,
+		     size_t __child_stack_size, int __flags, void *__arg);
 #endif
diff --git a/linuxthreads/shlib-versions b/linuxthreads/shlib-versions
index a7d26c288d..763639ab89 100644
--- a/linuxthreads/shlib-versions
+++ b/linuxthreads/shlib-versions
@@ -2,4 +2,5 @@
 mips.*-.*-linux.*	libpthread=0		GLIBC_2.0 GLIBC_2.2
 sparc64-.*-linux.*	libpthread=0		GLIBC_2.2
 sh.*-.*-linux.*		libpthread=0		GLIBC_2.2
+ia64.*-.*-linux.*	libpthread=0		GLIBC_2.2
 .*-.*-linux.*		libpthread=0
diff --git a/linuxthreads/sysdeps/ia64/pspinlock.c b/linuxthreads/sysdeps/ia64/pspinlock.c
new file mode 100644
index 0000000000..ada28bd9f0
--- /dev/null
+++ b/linuxthreads/sysdeps/ia64/pspinlock.c
@@ -0,0 +1,93 @@
+/* POSIX spinlock implementation.  ia64 version.
+   Copyright (C) 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Jes Sorensen <jes@linuxcare.com>
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <errno.h>
+#include <pthread.h>
+
+
+/* This implementation is inspired by the implementation used in the
+   Linux kernel. */
+
+int
+__pthread_spin_lock (pthread_spinlock_t *lock)
+{
+  asm volatile
+    ("mov ar.ccv = r0\n\t"
+     "mov r3 = 1\n\t"
+     ";;\n"
+     "1:\n\t"
+     "ld4 r2 = %0\n\t"
+     ";;\n\t"
+     "cmp4.eq p0, p7 = r0, r2\n\t"
+     "(p7) br.cond.spnt.few 1b \n\t"
+     "cmpxchg4.acq r2 = %0, r3, ar.ccv\n\t"
+     ";;\n\t"
+     "cmp4.eq p0, p7 = r0, r2\n\t"
+     "(p7) br.cond.spnt.few 1b\n\t"
+     ";;\n"
+     :: "m" (lock) : "r2", "r3", "p7", "memory");
+  return 0;
+}
+weak_alias (__pthread_spin_lock, pthread_spin_lock)
+
+
+int
+__pthread_spin_trylock (pthread_spinlock_t *lock)
+{
+  int oldval;
+
+  asm volatile
+    ("mov ar.ccv = r0\n\t"
+     "mov r2 = 1\n\t"
+     ";;\n\t"
+     "cmpxchg4.acq %0 = %1, r2, ar.ccv\n\t"
+     ";;\n"
+     : "=r" (oldval) : "m" (lock) : "r2", "memory");
+  return oldval > 0 ? 0 : EBUSY;
+}
+weak_alias (__pthread_spin_trylock, pthread_spin_trylock)
+
+
+int
+__pthread_spin_unlock (pthread_spinlock_t *lock)
+{
+  return *lock = 0;
+}
+weak_alias (__pthread_spin_unlock, pthread_spin_unlock)
+
+
+int
+__pthread_spin_init (pthread_spinlock_t *lock, int pshared)
+{
+  /* We can ignore the `pshared' parameter.  Since we are busy-waiting
+     all processes which can access the memory location `lock' points
+     to can use the spinlock.  */
+  return *lock = 0;
+}
+weak_alias (__pthread_spin_init, pthread_spin_init)
+
+
+int
+__pthread_spin_destroy (pthread_spinlock_t *lock)
+{
+  /* Nothing to do.  */
+  return 0;
+}
+weak_alias (__pthread_spin_destroy, pthread_spin_destroy)
diff --git a/sysdeps/unix/sysv/linux/ia64/fork.c b/sysdeps/unix/sysv/linux/ia64/fork.c
index ab9b3bc7ef..c63e994622 100644
--- a/sysdeps/unix/sysv/linux/ia64/fork.c
+++ b/sysdeps/unix/sysv/linux/ia64/fork.c
@@ -25,9 +25,10 @@ extern int __clone (int (*fn)(void *), void *ksp, unsigned long int flags,
 		  void *arg);
 
 int
-__fork (void)
+__libc_fork (void)
 {
   return __clone (NULL, NULL, SIGCHLD, 0);
 }
 
-weak_alias (__fork, fork)
+weak_alias (__libc_fork, fork)
+weak_alias (__libc_fork, __fork)
diff --git a/sysdeps/unix/sysv/linux/ia64/syscalls.list b/sysdeps/unix/sysv/linux/ia64/syscalls.list
index 866fb19d2e..3ada92ef20 100644
--- a/sysdeps/unix/sysv/linux/ia64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/ia64/syscalls.list
@@ -3,9 +3,9 @@
 umount2		-	umount		2	__umount2	umount2
 
 # Whee! 64-bit systems naturally implement llseek.
-llseek		EXTRA	lseek		3	__llseek	llseek __lseek64 lseek64
-pread		-	pread		4	__syscall_pread	__syscall_pread64 __pread pread __pread64 pread64
-pwrite		-	pwrite		4	__syscall_pwrite	__syscall_pwrite64 __pwrite pwrite __pwrite64 pwrite64
+llseek		EXTRA	lseek		3	__libc_lseek64	__lseek llseek __lseek64 lseek64
+pread		-	pread		4	__libc_pread	__libc_pread64 __pread pread __pread64 pread64
+pwrite		-	pwrite		4	__libc_pwrite	__libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64
 fstatfs		-	fstatfs		i:ip	__fstatfs	fstatfs fstatfs64 __fstatfs64
 statfs		-	statfs		i:sp	__statfs	statfs statfs64
 mmap		-	mmap		b:aniiii __mmap		mmap __mmap64 mmap64
diff --git a/sysdeps/unix/sysv/linux/ia64/sysdep.h b/sysdeps/unix/sysv/linux/ia64/sysdep.h
index 6901d5e38e..83c4bad003 100644
--- a/sysdeps/unix/sysv/linux/ia64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/ia64/sysdep.h
@@ -65,7 +65,6 @@
 	.psr abi64;				\
 	.psr lsb;				\
 	.lsb;					\
-	.proc C_SYMBOL_NAME(name);		\
 	.text;					\
 	.align 32;				\
 	.proc C_SYMBOL_NAME(name);		\