Update.

2000-04-13  Ulrich Drepper  <drepper@redhat.com>

	* posix/globtest.sh: Work around inconsistency with expanding ~/
	in shell (PR libc/1690).  Reported by patsmith@pobox.com.

9 files changed, 99 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index f2e6f98371..6accbb2fcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-13  Ulrich Drepper  <drepper@redhat.com>
+
+	* posix/globtest.sh: Work around inconsistency with expanding ~/
+	in shell (PR libc/1690).  Reported by patsmith@pobox.com.
+
 2000-04-12  Ulrich Drepper  <drepper@redhat.com>
 
 	* posix/getconf.c: Add support for many more POSIX options.
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index e129e8cbd5..d7c9b5f20f 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,5 +1,11 @@
 2000-04-12  Ulrich Drepper  <drepper@redhat.com>
 
+	* Makefile (libpthread-routines): Add getcpuclockid.
+	* Versions [libpthread] (GLIBC_2.2): Add pthread_getcpuclockid.
+	* sysdeps/pthread/getcpuclockid.c: New file.
+	* sysdeps/unix/sysv/linux/i386/getcpuclockid.c: New file.
+	* sysdeps/pthread/pthread.h: Add prototype for pthread_getcpuclockid.
+
 	* sysdeps/unix/sysv/linux/bits/posix_opt.h (_POSIX_SPIN_LOCKS):
 	Defined.
 	* sysdeps/unix/sysv/linux/i386/bits/posix_opt.h: Likewise.
diff --git a/linuxthreads/Makefile b/linuxthreads/Makefile
index d2b154285d..b51ea84f33 100644
--- a/linuxthreads/Makefile
+++ b/linuxthreads/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -35,7 +35,7 @@ extra-libs-others := $(extra-libs)
 libpthread-routines := attr cancel condvar join manager mutex ptfork \
 		       ptlongjmp pthread signals specific errno lockfile \
 		       semaphore spinlock wrapsyscall rwlock pt-machine \
-		       oldsemaphore events
+		       oldsemaphore events getcpuclockid
 
 vpath %.c Examples
 tests = ex1 ex2 ex3 ex4 ex5 ex6
diff --git a/linuxthreads/Versions b/linuxthreads/Versions
index e5348fc59e..92ec98da5f 100644
--- a/linuxthreads/Versions
+++ b/linuxthreads/Versions
@@ -134,5 +134,6 @@ libpthread {
     sem_timedwait;
     pthread_spin_destroy; pthread_spin_init; pthread_spin_lock;
     pthread_spin_trylock; pthread_spin_unlock;
+    pthread_getcpuclockid;
   }
 }
diff --git a/linuxthreads/spinlock.c b/linuxthreads/spinlock.c
index 981d7a44c0..6e7eb12e57 100644
--- a/linuxthreads/spinlock.c
+++ b/linuxthreads/spinlock.c
@@ -82,8 +82,6 @@ void internal_function __pthread_lock(pthread_spinlock_t * lock,
   /* Put back any resumes we caught that don't belong to us. */
   while (spurious_wakeup_count--)
     restart(self);
-
-  return 0;
 }
 int __pthread_spin_lock(pthread_spinlock_t * lock)
 {
diff --git a/linuxthreads/sysdeps/pthread/getcpuclockid.c b/linuxthreads/sysdeps/pthread/getcpuclockid.c
new file mode 100644
index 0000000000..ef1f84fd3e
--- /dev/null
+++ b/linuxthreads/sysdeps/pthread/getcpuclockid.c
@@ -0,0 +1,28 @@
+/* Copyright (C) 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   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>
+#include <sys/time.h>
+
+int
+pthread_getcpuclockid (pthread_t pthread_id, clockid_t *clock_id)
+{
+  /* We don't have a timer for that.  */
+  return ENOENT;
+}
diff --git a/linuxthreads/sysdeps/pthread/pthread.h b/linuxthreads/sysdeps/pthread/pthread.h
index 4cc1aaae06..de00130029 100644
--- a/linuxthreads/sysdeps/pthread/pthread.h
+++ b/linuxthreads/sysdeps/pthread/pthread.h
@@ -411,19 +411,20 @@ extern int pthread_rwlockattr_setkind_np (pthread_rwlockattr_t *__attr,
 
 /* Initialize the spinlock LOCK.  If PSHARED is nonzero the spinlock can
    be shared between different processes.  */
-extern int pthread_spin_init (pthread_spinlock_t *__lock, int __pshared);
+extern int pthread_spin_init (pthread_spinlock_t *__lock, int __pshared)
+     __THROW;
 
 /* Destroy the spinlock LOCK.  */
-extern int pthread_spin_destroy (pthread_spinlock_t *__lock);
+extern int pthread_spin_destroy (pthread_spinlock_t *__lock) __THROW;
 
 /* Wait until spinlock LOCK is retrieved.  */
-extern int pthread_spin_lock (pthread_spinlock_t *__lock);
+extern int pthread_spin_lock (pthread_spinlock_t *__lock) __THROW;
 
 /* Try to lock spinlock LOCK.  */
-extern int pthread_spin_trylock (pthread_spinlock_t *__lock);
+extern int pthread_spin_trylock (pthread_spinlock_t *__lock) __THROW;
 
 /* Release spinlock LOCK.  */
-extern int pthread_spin_unlock (pthread_spinlock_t *__lock);
+extern int pthread_spin_unlock (pthread_spinlock_t *__lock) __THROW;
 #endif
 
 
@@ -525,6 +526,14 @@ extern void _pthread_cleanup_pop_restore (struct _pthread_cleanup_buffer *__buff
 					  int __execute) __THROW;
 #endif
 
+
+#ifdef __USE_XOPEN2K
+/* Get ID of CPU-time clock for thread THREAD_ID.  */
+extern int pthread_getcpuclockid (pthread_t __thread_id,
+				  clockid_t *__clock_id) __THROW;
+#endif
+
+
 /* Functions for handling signals.  */
 #include <bits/sigthread.h>
 
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/i386/getcpuclockid.c b/linuxthreads/sysdeps/unix/sysv/linux/i386/getcpuclockid.c
new file mode 100644
index 0000000000..2c4218acdc
--- /dev/null
+++ b/linuxthreads/sysdeps/unix/sysv/linux/i386/getcpuclockid.c
@@ -0,0 +1,37 @@
+/* Copyright (C) 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   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>
+#include <unistd.h>
+#include <sys/time.h>
+
+#include <internals.h>
+
+int
+pthread_getcpuclockid (pthread_t thread_id, clockid_t *clock_id)
+{
+  /* We don't allow any process ID but our own.  */
+  if (thread_id != thread_self ())
+    return EPERM;
+
+  /* Store the number.  */
+  *clock_id = CLOCK_PTHREAD_CPUTIME_ID;
+
+  return 0;
+}
diff --git a/posix/globtest.sh b/posix/globtest.sh
index 6c088301b0..40d95d5dcb 100755
--- a/posix/globtest.sh
+++ b/posix/globtest.sh
@@ -235,7 +235,12 @@ echo ~ | cmp - $testout || result=1
 ${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
 ${common_objpfx}posix/globtest -q -t "$testdir" "~/" |
 sort > $testout
-echo ~/ | cmp - $testout || result=1
+# Some shell incorrectly(?) convert ~/ into // if ~ expands to /.
+if test ~/ = //; then
+    echo / | cmp - $testout || result=1
+else
+    echo ~/ | cmp - $testout || result=1
+endif
 
 # Test tilde expansion with username
 ${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \