mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-27 03:41:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update HP_TIMING_NOW for _ISOMAC in sysdeps/generic/hp-timing.h

Browse Source 
commit e9698175b0
Author: Lukasz Majewski <lukma@denx.de>
Date:   Mon Mar 16 08:31:41 2020 +0100

    y2038: Replace __clock_gettime with __clock_gettime64

breaks benchtests with sysdeps/generic/hp-timing.h:

In file included from ./bench-timing.h:23,
                 from ./bench-skeleton.c:25,
                 from
/export/build/gnu/tools-build/glibc-gitlab/build-x86_64-linux/benchtests/bench-rint.c:45:
./bench-skeleton.c: In function ‘main’:
../sysdeps/generic/hp-timing.h:37:23: error: storage size of ‘tv’ isn’t known
   37 |   struct __timespec64 tv;      \
      |                       ^~

Define HP_TIMING_NOW with clock_gettime in sysdeps/generic/hp-timing.h
if _ISOMAC is defined.  Don't define __clock_gettime in bench-timing.h
since it is no longer needed.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
H.J. Lu 2020-06-05 09:43:13 -07:00
parent 9b7424215b
commit f607047668
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
benchtests/bench-timing.h
View File

@ -18,7 +18,6 @@
#undef attribute_hidden
#define attribute_hidden
#define __clock_gettime __clock_gettime64
#include <hp-timing.h>
#include <stdint.h>

11
sysdeps/generic/hp-timing.h
View File

@ -32,11 +32,20 @@ typedef uint64_t hp_timing_t;
/* The clock_gettime (CLOCK_MONOTONIC) has unspecified starting time,
nano-second accuracy, and for some architectues is implemented as
vDSO symbol. */
#define HP_TIMING_NOW(var) \
#ifdef _ISOMAC
# define HP_TIMING_NOW(var) \
({ \
struct timespec tv; \
clock_gettime (CLOCK_MONOTONIC, &tv); \
(var) = (tv.tv_nsec + UINT64_C(1000000000) * tv.tv_sec); \
})
#else
# define HP_TIMING_NOW(var) \
({ \
struct __timespec64 tv; \
__clock_gettime64 (CLOCK_MONOTONIC, &tv); \
(var) = (tv.tv_nsec + UINT64_C(1000000000) * tv.tv_sec); \
})
#endif
#endif /* hp-timing.h */