Update.

	* sysdeps/unix/i386/i586/clock_getres.c: Removed.
	* sysdeps/unix/i386/i586/clock_gettime.c: Removed.
	* sysdeps/unix/i386/i586/clock_nanosleep.c: Removed.
	* sysdeps/unix/i386/i586/clock_settime.c: Removed.
	* sysdeps/unix/i386/i586/cpuclock-init.h: Removed.
	* sysdeps/generic/cpuclock-init.h: Removed.
	* sysdeps/unix/i386/i686/Implies: Removed.
	* sysdeps/unix/i386/i686/tempname.c: Removed.
	* sysdeps/i386/i686/Versions: New file.
	* sysdeps/unix/i386/i586/Versions: Removed.

	* sysdeps/posix/clock_getres.c: If HP_TIMING_AVAIL is nonzero handle
	CLOCK_PROCESS_CPUTIME_ID and CLOCK_THREAD_CPUTIME_ID.
	* sysdeps/unix/clock_gettime.c: Likewise.
	* sysdeps/unix/clock_nanosleep.c: Likewise.
	* sysdeps/unix/clock_settime.c: Likewise.
	* sysdeps/posix/tempname.c: Is HP_TIMING_AVAIL is nonzero define
	RANDOM_BITS use CPU clock.

	* sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/bits/time.h: New file.
	* sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9b/bits/time.h: New file.
	* sysdeps/unix/sysv/linux/sparc/sparc64/bits/time.h: New file.
	* sysdeps/sparc/Versions: New file.

	* elf/dl-support.c: Don't use cpuclock-init.h definitions, use
	hp-timing.h definitions.
	* sysdeps/generic/dl-sysdep.c: Likewise.

	* include/libc-internal.h: Include hp-timing.h.  Use hp_timing_t in
	__get_clockfreq prototype.

	* sysdeps/unix/sysv/linux/i386/get_clockfreq.c (__get_clockfreq):
	Use hp_timing_t type.

	* sysdeps/unix/sysv/linux/ia64/get_clockfreq.c: New file.

6 files changed, 0 insertions, 321 deletions

diff --git a/sysdeps/unix/i386/i586/Versions b/sysdeps/unix/i386/i586/Versions
deleted file mode 100644
index 4242ca448a..0000000000
--- a/sysdeps/unix/i386/i586/Versions
+++ /dev/null
@@ -1,5 +0,0 @@
-ld {
-  GLIBC_2.2.3 {
-    _dl_cpuclock_offset;
-  }
-}
diff --git a/sysdeps/unix/i386/i586/clock_getres.c b/sysdeps/unix/i386/i586/clock_getres.c
deleted file mode 100644
index d11d0464af..0000000000
--- a/sysdeps/unix/i386/i586/clock_getres.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright (C) 1999, 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
-   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 <time.h>
-#include <sys/param.h>
-#include <libc-internal.h>
-
-/* This implementation uses the TSC register in modern (i586 and up) IA-32
-   processors (most modern clones also provide it).  Since we need the
-   resolution of the clock and since determining this is not cheap, we
-   cache the value.  But this means that systems with processors running
-   at different speeds or process migration to machines with slower or
-   faster processors will not work without changes.  */
-
-
-/* Clock frequency of the processor.  */
-static long int nsec;
-
-
-/* We add an limitation here: we assume that the machine is not up as
-   long as it takes to wrap-around the 64-bit timestamp counter.  On a
-   4GHz machine it would take 136 years of uptime to wrap around so
-   this "limitation" is not severe.
-
-   We use this clock also as the monotonic clock since we don't allow
-   setting the CPU-time clock.  If this should ever change we will have
-   to separate the two.  */
-#define EXTRA_CLOCK_CASES \
-  case CLOCK_PROCESS_CPUTIME_ID:					      \
-  case CLOCK_THREAD_CPUTIME_ID:						      \
-    {									      \
-      if (__builtin_expect (nsec == 0, 0))				      \
-	{								      \
-	  unsigned long long int freq;					      \
-									      \
-	  /* This can only happen if we haven't initialized the `freq'	      \
-	     variable yet.  Do this now. We don't have to protect this	      \
-	     code against multiple execution since all of them should	      \
-	     lead to the same result.  */				      \
-	  freq = __get_clockfreq ();					      \
-	  if (__builtin_expect (freq == 0, 0))				      \
-	    /* Something went wrong.  */				      \
-	    break;							      \
-									      \
-	  nsec = MAX (1000000000ULL / freq, 1);				      \
-	}								      \
-									      \
-      /* File in the values.  The seconds are always zero (unless we	      \
-	 have a 1Hz machine).  */					      \
-      res->tv_sec = 0;							      \
-      res->tv_nsec = nsec;						      \
-									      \
-      retval = 0;							      \
-    }									      \
-    break;
-
-#include <sysdeps/posix/clock_getres.c>
diff --git a/sysdeps/unix/i386/i586/clock_gettime.c b/sysdeps/unix/i386/i586/clock_gettime.c
deleted file mode 100644
index 5e28370acf..0000000000
--- a/sysdeps/unix/i386/i586/clock_gettime.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* Copyright (C) 1999, 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
-   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 <time.h>
-#include <libc-internal.h>
-
-#include "cpuclock-init.h"
-
-
-/* This implementation uses the TSC register in modern (i586 and up) IA-32
-   processors (most modern clones also provide it).  Since we need the
-   resolution of the clock and since determining this is not cheap, we
-   cache the value.  But this means that systems with processors running
-   at different speeds or process migration to machines with slower or
-   faster processors will not work without changes.  */
-
-
-/* Clock frequency of the processor.  We make it a 64-bit variable
-   because some jokers are already playing with processors with more
-   than 4GHz.  */
-static unsigned long long int freq;
-
-
-/* We need the starting time for the process.  */
-CPUCLOCK_VARDECL (_dl_cpuclock_offset);
-
-
-/* This function is defined in the thread library.  */
-extern int __pthread_clock_gettime (unsigned long long int freq,
-				    struct timespec *tp)
-     __attribute__ ((__weak__));
-
-
-/* We add an limitation here: we assume that the process is not
-   running as long as it takes to wrap-around the 64-bit timestamp
-   counter.  On a 4GHz machine it would take 136 years of uptime to
-   wrap around so this "limitation" is not severe.  */
-#define EXTRA_CLOCK_CASES \
-  case CLOCK_THREAD_CPUTIME_ID:						      \
-    if (__pthread_clock_gettime != NULL)				      \
-      {									      \
-	if (__builtin_expect (freq == 0, 0))				      \
-	  {								      \
-	    /* This can only happen if we haven't initialized the `freq'      \
-	       variable yet.  Do this now. We don't have to protect this      \
-	       code against multiple execution since all of them should	      \
-	       lead to the same result.  */				      \
-	    freq = __get_clockfreq ();					      \
-	    if (__builtin_expect (freq == 0, 0))			      \
-	      /* Something went wrong.  */				      \
-	      break;							      \
-	  }								      \
-									      \
-	retval = __pthread_clock_gettime (freq, tp);			      \
-	break;								      \
-      }									      \
-    /* FALLTHROUGH */							      \
-									      \
-  case CLOCK_PROCESS_CPUTIME_ID:					      \
-    {									      \
-      unsigned long long int tsc;					      \
-									      \
-      if (__builtin_expect (freq == 0, 0))				      \
-	{								      \
-	  /* This can only happen if we haven't initialized the `freq'	      \
-	     variable yet.  Do this now. We don't have to protect this	      \
-	     code against multiple execution since all of them should	      \
-	     lead to the same result.  */				      \
-	  freq = __get_clockfreq ();					      \
-	  if (__builtin_expect (freq == 0, 0))				      \
-	    /* Something went wrong.  */				      \
-	    break;							      \
-	}								      \
-									      \
-      /* Get the current counter.  */					      \
-      asm volatile ("rdtsc" : "=A" (tsc));				      \
-									      \
-      /* Compute the offset since the start time of the process.  */	      \
-      tsc -= _dl_cpuclock_offset;					      \
-									      \
-      /* Compute the seconds.  */					      \
-      tp->tv_sec = tsc / freq;						      \
-									      \
-      /* And the nanoseconds.  This computation should be stable until	      \
-	 we get machines with about 16GHz frequency.  */		      \
-      tp->tv_nsec = ((tsc % freq) * 1000000000ull) / freq;		      \
-									      \
-      retval = 0;							      \
-    }									      \
-    break;
-
-#include <sysdeps/unix/clock_gettime.c>
diff --git a/sysdeps/unix/i386/i586/clock_nanosleep.c b/sysdeps/unix/i386/i586/clock_nanosleep.c
deleted file mode 100644
index a1250cc4bb..0000000000
--- a/sysdeps/unix/i386/i586/clock_nanosleep.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* High-resolution sleep with the specified clock.
-   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.  */
-
-/* Additional definitions for the x86 version.  */
-#define CLOCK_P(clock) \
-  (clock) != CLOCK_PROCESS_CPUTIME_ID					      \
-  && (clock) != CLOCK_THREAD_CPUTIME_ID
-
-#include <sysdeps/unix/clock_nanosleep.c>
diff --git a/sysdeps/unix/i386/i586/clock_settime.c b/sysdeps/unix/i386/i586/clock_settime.c
deleted file mode 100644
index af7ed1be87..0000000000
--- a/sysdeps/unix/i386/i586/clock_settime.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Copyright (C) 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
-   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 <time.h>
-
-#include "cpuclock-init.h"
-#include "libc-internal.h"
-
-/* This implementation uses the TSC register in modern (i586 and up) IA-32
-   processors (most modern clones also provide it).  Since we need the
-   resolution of the clock and since determining this is not cheap, we
-   cache the value.  But this means that systems with processors running
-   at different speeds or process migration to machines with slower or
-   faster processors will not work without changes.  */
-
-
-/* Clock frequency of the processor.  We make it a 64-bit variable
-   because some jokers are already playing with processors with more
-   than 4GHz.  */
-static unsigned long long int freq;
-
-
-/* We need the starting time for the process.  */
-CPUCLOCK_VARDECL (_dl_cpuclock_offset);
-
-
-/* This function is defined in the thread library.  */
-extern void __pthread_clock_settime (unsigned long long int offset)
-     __attribute__ ((__weak__));
-
-
-/* We add an limitation here: we assume that the process is not
-   running as long as it takes to wrap-around the 64-bit timestamp
-   counter.  On a 4GHz machine it would take 136 years of uptime to
-   wrap around so this "limitation" is not severe.  */
-#define EXTRA_CLOCK_CASES \
-  case CLOCK_PROCESS_CPUTIME_ID:					      \
-  case CLOCK_THREAD_CPUTIME_ID:						      \
-    {									      \
-      unsigned long long int tsc;					      \
-      unsigned long long int usertime;					      \
-									      \
-      /* First thing is to get the current time.  */			      \
-      asm volatile ("rdtsc" : "=A" (tsc));				      \
-									      \
-      if (__builtin_expect (freq == 0, 0))				      \
-	{								      \
-	  /* This can only happen if we haven't initialized the `freq'	      \
-	     variable yet.  Do this now. We don't have to protect this	      \
-	     code against multiple execution since all of them should	      \
-	     lead to the same result.  */				      \
-	  freq = __get_clockfreq ();					      \
-	  if (__builtin_expect (freq == 0, 0))				      \
-	    /* Something went wrong.  */				      \
-	    break;							      \
-	}								      \
-									      \
-      /* Convert the user-provided time into CPU ticks.  */		      \
-      usertime = tp->tv_sec * freq + (tp->tv_nsec * freq) / 1000000000ull;    \
-									      \
-      /* Determine the offset and use it as the new base value.  */	      \
-      if (clock_id != CLOCK_THREAD_CPUTIME_ID				      \
-	  || __pthread_clock_settime == NULL)				      \
-	_dl_cpuclock_offset = tsc - usertime;				      \
-      else								      \
-	__pthread_clock_settime (tsc - usertime);			      \
-    }									      \
-  break;
-
-#include <sysdeps/unix/clock_settime.c>
diff --git a/sysdeps/unix/i386/i586/cpuclock-init.h b/sysdeps/unix/i386/i586/cpuclock-init.h
deleted file mode 100644
index ff1ff9752a..0000000000
--- a/sysdeps/unix/i386/i586/cpuclock-init.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* x86 TSC based CPU clock initialization code.
-   Copyright (C) 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
-   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.  */
-
-/* The TSC value has 64 bits.  */
-#define CPUCLOCK_VARDEF(name) unsigned long long int name
-
-/* A declaration.  */
-#define CPUCLOCK_VARDECL(name) extern unsigned long long int name
-
-/* Reading the TSC value is a simple instruction.  */
-#define CPUCLOCK_INIT(name) asm volatile ("rdtsc" : "=A" (name))