From 912f3579b3034f3b375a43eed4592f9a81301b6f Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Sat, 23 May 2020 10:04:20 -0700
Subject: [PATCH] Fix __clock_gettime64 for sysdeps/generic/hp-timing.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit e9698175b0b60407db1e89bcf29437ab224bca0b
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;      \
      |                       ^~

We should always provide __clock_gettime64 for sysdeps/generic/hp-timing.h.
Don't define __clock_gettime in benchtests/bench-timing.h since
it is no longer needed.
---
 benchtests/bench-timing.h   |  1 -
 include/time.h              | 12 +++++++++---
 sysdeps/generic/hp-timing.h |  1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/benchtests/bench-timing.h b/benchtests/bench-timing.h
index a0d6f82465..d0176fb76e 100644
--- a/benchtests/bench-timing.h
+++ b/benchtests/bench-timing.h
@@ -18,7 +18,6 @@
 
 #undef attribute_hidden
 #define attribute_hidden
-#define __clock_gettime __clock_gettime64
 #include <hp-timing.h>
 #include <stdint.h>
 
diff --git a/include/time.h b/include/time.h
index fe4da9ca10..246683a1c5 100644
--- a/include/time.h
+++ b/include/time.h
@@ -1,6 +1,15 @@
 #ifndef _TIME_H
 #include <time/time.h>
 
+/* For sysdeps/generic/hp-timing.h.  */
+extern __typeof (clock_gettime) __clock_gettime;
+#if __TIMESIZE == 64
+# define __clock_gettime64 __clock_gettime
+#else
+struct __timespec64;
+extern int __clock_gettime64 (clockid_t clock_id, struct __timespec64 *tp);
+#endif
+
 #ifndef _ISOMAC
 # include <bits/types/struct_timeval.h>
 # include <struct___timespec64.h>
@@ -23,7 +32,6 @@ libc_hidden_proto (localtime)
 libc_hidden_proto (strftime)
 libc_hidden_proto (strptime)
 
-extern __typeof (clock_gettime) __clock_gettime;
 libc_hidden_proto (__clock_gettime)
 extern __typeof (clock_settime) __clock_settime;
 libc_hidden_proto (__clock_settime)
@@ -295,14 +303,12 @@ extern double __difftime (time_t time1, time_t time0);
 
 #if __TIMESIZE == 64
 # define __clock_nanosleep_time64 __clock_nanosleep
-# define __clock_gettime64 __clock_gettime
 # define __timespec_get64 __timespec_get
 #else
 extern int __clock_nanosleep_time64 (clockid_t clock_id,
                                      int flags, const struct __timespec64 *req,
                                      struct __timespec64 *rem);
 libc_hidden_proto (__clock_nanosleep_time64)
-extern int __clock_gettime64 (clockid_t clock_id, struct __timespec64 *tp);
 libc_hidden_proto (__clock_gettime64)
 extern int __timespec_get64 (struct __timespec64 *ts, int base);
 libc_hidden_proto (__timespec_get64)
diff --git a/sysdeps/generic/hp-timing.h b/sysdeps/generic/hp-timing.h
index af9d92f7f7..7e22d43151 100644
--- a/sysdeps/generic/hp-timing.h
+++ b/sysdeps/generic/hp-timing.h
@@ -23,6 +23,7 @@
 #include <time.h>
 #include <stdint.h>
 #include <hp-timing-common.h>
+#include <struct___timespec64.h>
 
 /* It should not be used for ld.so.  */
 #define HP_TIMING_INLINE	(0)
-- 
2.26.2