diff options
Diffstat (limited to 'sysdeps/generic')
-rw-r--r-- | sysdeps/generic/cpuclock-init.h | 1 | ||||
-rw-r--r-- | sysdeps/generic/dl-sysdep.c | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sysdeps/generic/cpuclock-init.h b/sysdeps/generic/cpuclock-init.h deleted file mode 100644 index 085cf179da..0000000000 --- a/sysdeps/generic/cpuclock-init.h +++ /dev/null @@ -1 +0,0 @@ -/* In general there is no CPU clock. */ diff --git a/sysdeps/generic/dl-sysdep.c b/sysdeps/generic/dl-sysdep.c index 024864f72f..114ec8be4e 100644 --- a/sysdeps/generic/dl-sysdep.c +++ b/sysdeps/generic/dl-sysdep.c @@ -35,7 +35,7 @@ #include <dl-machine.h> #include <dl-procinfo.h> #include <dl-osinfo.h> -#include <cpuclock-init.h> +#include <hp-timing.h> extern int _dl_argc; extern char **_dl_argv; @@ -61,8 +61,8 @@ int __libc_multiple_libcs = 0; /* Defining this here avoids the inclusion void *__libc_stack_end; static ElfW(auxv_t) *_dl_auxv; unsigned long int _dl_hwcap_mask = HWCAP_IMPORTANT; -#ifdef CPUCLOCK_VARDEF -CPUCLOCK_VARDEF (_dl_cpuclock_offset); +#if HP_TIMING_AVAIL +hp_timing_t _dl_cpuclock_offset; #endif #ifndef DL_FIND_ARG_COMPONENTS @@ -100,8 +100,8 @@ _dl_sysdep_start (void **start_argptr, # define set_seen(tag) seen |= M ((tag)->a_type) #endif -#ifdef CPUCLOCK_INIT - CPUCLOCK_INIT (_dl_cpuclock_offset); +#if HP_TIMING_AVAIL + HP_TIMING_NOW (_dl_cpuclock_offset); #endif DL_FIND_ARG_COMPONENTS (start_argptr, _dl_argc, _dl_argv, _environ, |