Update.

	* sysdeps/ia64/Makefile [subdir=csu] (sysdep_routines): Add hp-timing.
	* sysdeps/ia64/Versions: Add _dl_cpuclock_offset for ld in 2.2.3.
	* sysdeps/ia64/hp-timing.c: New file.
	* sysdeps/ia64/hp-timing.h: New file.
	* sysdeps/unix/sysv/linux/ia64/bits/time.h: Add definitions for
	CLOCK_PROCESS_CPUTIME_ID and CLOCK_THREAD_CPUTIME_ID.

	* sysdeps/generic/clock_getcpuclockid.c: Make function generic, test
	using #ifdef whether the clock is available.
	* sysdeps/unix/i386/clock_getcpuclockid.c: Not needed anymore.

	* sysdeps/generic/dl-sysdep.c: Initialize _dl_cpuclock_offset to move
	it into data section.

4 files changed, 21 insertions, 39 deletions

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index c4676e9f7f..7225ec4ab6 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,5 +1,7 @@
 2001-04-23  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/ia64/Versions: New file.
+
 	* sysdeps/unix/sysv/linux/ia64/pt-initfini.c (_init): We don't
 	have to call __gmon_start__ in the libpthread DSO.
 	* sysdeps/pthread/pt-initfini.c (_init): Likewise.
diff --git a/linuxthreads/sysdeps/ia64/Versions b/linuxthreads/sysdeps/ia64/Versions
new file mode 100644
index 0000000000..f9921aff55
--- /dev/null
+++ b/linuxthreads/sysdeps/ia64/Versions
@@ -0,0 +1,5 @@
+libpthread {
+  GLIBC_2.2.3 {
+    __pthread_clock_gettime; __pthread_clock_settime;
+  }
+}
diff --git a/linuxthreads/sysdeps/pthread/getcpuclockid.c b/linuxthreads/sysdeps/pthread/getcpuclockid.c
index ef1f84fd3e..76d39a5de4 100644
--- a/linuxthreads/sysdeps/pthread/getcpuclockid.c
+++ b/linuxthreads/sysdeps/pthread/getcpuclockid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2001 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
@@ -19,10 +19,22 @@
 #include <errno.h>
 #include <pthread.h>
 #include <sys/time.h>
+#include <internals.h>
 
 int
-pthread_getcpuclockid (pthread_t pthread_id, clockid_t *clock_id)
+pthread_getcpuclockid (pthread_t thread_id, clockid_t *clock_id)
 {
+  /* We don't allow any process ID but our own.  */
+  if (thread_handle (thread_id)->h_descr != thread_self ())
+    return EPERM;
+
+#ifdef CLOCK_THREAD_CPUTIME_ID
+  /* Store the number.  */
+  *clock_id = CLOCK_THREAD_CPUTIME_ID;
+
+  return 0;
+#else
   /* We don't have a timer for that.  */
   return ENOENT;
+#endif
 }
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/i386/getcpuclockid.c b/linuxthreads/sysdeps/unix/sysv/linux/i386/getcpuclockid.c
deleted file mode 100644
index b1a96705ac..0000000000
--- a/linuxthreads/sysdeps/unix/sysv/linux/i386/getcpuclockid.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* 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_handle (thread_id)->h_descr != thread_self ())
-    return EPERM;
-
-  /* Store the number.  */
-  *clock_id = CLOCK_THREAD_CPUTIME_ID;
-
-  return 0;
-}