From patchwork Sun May 24 23:34:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 39359 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 080D03870909; Sun, 24 May 2020 23:35:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 080D03870909 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1590363325; bh=Gxs0VAHBY3qTpQIPp3mB8n+MlfJU031/0ZePpW5jDpQ=; h=References:In-Reply-To:Date:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=atoWtcOE/ZbH4T5AL9Pth9iCYPDw1yzCVHkRGw2QwWtgItKEeV8oo8uECq7ZI161s WK5FSYsi8HIAYqR91Dv9tt1D7nsQnRkWx1467cAy8+oIBvqARVQ8CLarb5U4vlS3RV EohP+uSuaybE6NBsXt4FIzqyL6A8ZZkgKaJDYGBo= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-io1-xd43.google.com (mail-io1-xd43.google.com [IPv6:2607:f8b0:4864:20::d43]) by sourceware.org (Postfix) with ESMTPS id 9FC32385BF81 for ; Sun, 24 May 2020 23:35:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9FC32385BF81 Received: by mail-io1-xd43.google.com with SMTP id u23so3977607iot.12 for ; Sun, 24 May 2020 16:35:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Gxs0VAHBY3qTpQIPp3mB8n+MlfJU031/0ZePpW5jDpQ=; b=iX8R6wY/BWOoIu3vMdJsAkkfD4tB8Gjl4V7wkeYRC6UJ4qdXxnPPWVVbHp3boUvNic UrTzP3IZeX8BE5YECwJU0Ok8FVmbQt4prgbMcp0MAfswYdAd0bgrhed+PSwkOIsAH6z2 5OVlbrJLyfcXrSXH4lIMTn4C53FIQfggtFPp0mT6xfZqHP0HzomlCDvqaC4SX3+o3OZO nHV/V7Or2ThFMeAtqkhNooSqCLh6HvQObJNXJZ4J35gXBextkoE/T4p6UxePHd17m1yX LsKCEGt36qy19ReLC+KHLphHIeqsubuXR7KD2b83LAEajscOEVuzutsWjU4OH11VvGw/ Ezsw== X-Gm-Message-State: AOAM531rX9P4Q6tR2BeZFiZE1RM3oy/E5AKD59ZunR83eFRUfsEpdG/h 0iqpUaya+OkpazXsMW0wT0Rhhz093tJhQz13QhA= X-Google-Smtp-Source: ABdhPJwyDBuop8360GcAYkrL/YKIHxyEOr65lKWy7rM9LxWws94O8UqICypvopjl53EEmC2mHxgcllQdttx2VIPeHB0= X-Received: by 2002:a6b:bf85:: with SMTP id p127mr632804iof.37.1590363319902; Sun, 24 May 2020 16:35:19 -0700 (PDT) MIME-Version: 1.0 References: <20200505181605.22346-1-lukma@denx.de> <20200521122423.7d98dd96@jawa> <20200524110338.0165621c@jawa> <20200524173021.3f5a926f@jawa> In-Reply-To: Date: Sun, 24 May 2020 16:34:44 -0700 Message-ID: Subject: V2 [PATCH] Fix __clock_gettime64 for sysdeps/generic/hp-timing.h To: Lukasz Majewski X-Spam-Status: No, score=-9.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Cc: Florian Weimer , GNU C Library , Andreas Schwab , Alistair Francis , Joseph Myers Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" On Sun, May 24, 2020 at 9:13 AM H.J. Lu wrote: > > On Sun, May 24, 2020 at 8:30 AM Lukasz Majewski wrote: > > > > On Sun, 24 May 2020 04:39:47 -0700 > > "H.J. Lu" wrote: > > > > > On Sun, May 24, 2020 at 2:03 AM Lukasz Majewski wrote: > > > > > > > > On Sat, 23 May 2020 13:32:05 -0700 > > > > "H.J. Lu" wrote: > > > > > > > > > On Thu, May 21, 2020 at 4:11 AM H.J. Lu > > > > > wrote: > > > > > > > > > > > > On Thu, May 21, 2020 at 3:24 AM Lukasz Majewski > > > > > > wrote: > > > > > > > > > > > > > > Hi "H.J. Lu", > > > > > > > > > > > > > > > On Tue, May 5, 2020 at 11:21 AM Lukasz Majewski > > > > > > > > wrote: > > > > > > > > > > > > > > > > > > The __clock_gettime internal function is not supporting 64 > > > > > > > > > bit time on architectures with __WORDSIZE == 32 and > > > > > > > > > __TIMESIZE != 64 (like e.g. ARM 32 bit). > > > > > > > > > > > > > > > > > > The __clock_gettime64 function shall be used instead in > > > > > > > > > the glibc itself as it supports 64 bit time on those > > > > > > > > > systems. This patch does not bring any changes to systems > > > > > > > > > with __WORDSIZE == 64 as for them the __clock_gettime64 > > > > > > > > > is aliased to __clock_gettime (in ./include/time.h). > > > > > > > > > > > > > > > > > > --- > > > > > > > > > Changes for v3: > > > > > > > > > - Fix the commit message (add missing "function" after > > > > > > > > > __clock_gettime64) > > > > > > > > > - Refactor __nisfind_server() function to support 64 bit > > > > > > > > > time with struct timespec instead of struct timeval > > > > > > > > > - Change expires to __time64_t > > > > > > > > > > > > > > > > > > Changes for v2: > > > > > > > > > - Use only TIMESPEC_TO_TIMEVAL instead of > > > > > > > > > valid_timespec64_to_timeval in logout.c and logwtmp.c as > > > > > > > > > it is generic enough to also support struct __timespec64 > > > > > > > > > conversion to struct timeval --- > > > > > > > > > benchtests/bench-timing.h | 2 +- > > > > > > > > > include/random-bits.h | 4 > > > > > > > > > ++-- login/logout.c | > > > > > > > > > 4 ++-- login/logwtmp.c | > > > > > > > > > 5 +++-- nis/nis_call.c > > > > > > > > > | 16 +++++++--------- sysdeps/generic/hp-timing.h > > > > > > > > > | 4 ++-- sysdeps/generic/memusage.h > > > > > > > > > | 4 ++-- > > > > > > > > > sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c | 4 ++-- > > > > > > > > > sysdeps/unix/sysv/linux/clock.c | 7 > > > > > > > > > ++----- 9 files changed, 23 insertions(+), 27 > > > > > > > > > deletions(-) > > > > > > > > > > > > > > > > Does this patch work with "make bench" when > > > > > > > > sysdeps/generic/hp-timing.h is used, like on arm? I got > > > > > > > > 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; \ > > > > > > > > | ^~ > > > > > > > > ./bench-timing.h:35:25: note: in expansion of macro > > > > > > > > ‘HP_TIMING_NOW’ 35 | #define TIMING_NOW(var) HP_TIMING_NOW > > > > > > > > (var) | ^~~~~~~~~~~~~ > > > > > > > > ./bench-skeleton.c:82:8: note: in expansion of macro > > > > > > > > ‘TIMING_NOW’ 82 | TIMING_NOW (start); > > > > > > > > | ^~~~~~~~~~ > > > > > > > > ../sysdeps/generic/hp-timing.h:38:3: error: implicit > > > > > > > > declaration of function ‘__clock_gettime64’; did you mean > > > > > > > > ‘clock_gettime’? [-Werror=implicit-function-declaration] > > > > > > > > 38 | __clock_gettime64 (CLOCK_MONOTONIC, &tv); \ > > > > > > > > | ^~~~~~~~~~~~~~~~~ > > > > > > > > ./bench-timing.h:35:25: note: in expansion of macro > > > > > > > > ‘HP_TIMING_NOW’ 35 | #define TIMING_NOW(var) HP_TIMING_NOW > > > > > > > > (var) | ^~~~~~~~~~~~~ > > > > > > > > ./bench-skeleton.c:82:8: note: in expansion of macro > > > > > > > > ‘TIMING_NOW’ 82 | TIMING_NOW (start); > > > > > > > > | ^~~~~~~~~~ > > > > > > > > ../sysdeps/generic/hp-timing.h:37:23: error: unused variable > > > > > > > > ‘tv’ [-Werror=unused-variable] > > > > > > > > 37 | struct __timespec64 tv; \ > > > > > > > > | ^~ > > > > > > > > ./bench-timing.h:35:25: note: in expansion of macro > > > > > > > > ‘HP_TIMING_NOW’ 35 | #define TIMING_NOW(var) HP_TIMING_NOW > > > > > > > > (var) | ^~~~~~~~~~~~~ > > > > > > > > ./bench-skeleton.c:82:8: note: in expansion of macro > > > > > > > > ‘TIMING_NOW’ 82 | TIMING_NOW (start); > > > > > > > > | ^~~~~~~~~~ > > > > > > > > ../sysdeps/generic/hp-timing.h:37:23: error: storage size of > > > > > > > > ‘tv’ isn’t known 37 | struct __timespec64 tv; \ > > > > > > > > | ^~ > > > > > > > > ./bench-timing.h:35:25: note: in expansion of macro > > > > > > > > ‘HP_TIMING_NOW’ 35 | #define TIMING_NOW(var) HP_TIMING_NOW > > > > > > > > (var) | ^~~~~~~~~~~~~ > > > > > > > > ./bench-skeleton.c:86:8: note: in expansion of macro > > > > > > > > ‘TIMING_NOW’ 86 | TIMING_NOW (end); > > > > > > > > | ^~~~~~~~~~ > > > > > > > > ../sysdeps/generic/hp-timing.h:37:23: error: unused variable > > > > > > > > ‘tv’ [-Werror=unused-variable] > > > > > > > > 37 | struct __timespec64 tv; \ > > > > > > > > | ^~ > > > > > > > > ./bench-timing.h:35:25: note: in expansion of macro > > > > > > > > ‘HP_TIMING_NOW’ 35 | #define TIMING_NOW(var) HP_TIMING_NOW > > > > > > > > (var) | ^~~~~~~~~~~~~ > > > > > > > > ./bench-skeleton.c:86:8: note: in expansion of macro > > > > > > > > ‘TIMING_NOW’ 86 | TIMING_NOW (end); > > > > > > > > | ^~~~~~~~~~ > > > > > > > > ../sysdeps/generic/hp-timing.h:37:23: error: storage size of > > > > > > > > ‘tv’ isn’t known 37 | struct __timespec64 tv; \ > > > > > > > > | ^~ > > > > > > > > ./bench-timing.h:35:25: note: in expansion of macro > > > > > > > > ‘HP_TIMING_NOW’ 35 | #define TIMING_NOW(var) HP_TIMING_NOW > > > > > > > > (var) | ^~~~~~~~~~~~~ > > > > > > > > ./bench-skeleton.c:90:8: note: in expansion of macro > > > > > > > > ‘TIMING_NOW’ 90 | TIMING_NOW (start); > > > > > > > > | ^~~~~~~~~~ > > > > > > > > ../sysdeps/generic/hp-timing.h:37:23: error: unused variable > > > > > > > > ‘tv’ [-Werror=unused-variable] > > > > > > > > 37 | struct __timespec64 tv; \ > > > > > > > > | ^~ > > > > > > > > ./bench-timing.h:35:25: note: in expansion of macro > > > > > > > > ‘HP_TIMING_NOW’ 35 | #define TIMING_NOW(var) HP_TIMING_NOW > > > > > > > > (var) | ^~~~~~~~~~~~~ > > > > > > > > ./bench-skeleton.c:90:8: note: in expansion of macro > > > > > > > > ‘TIMING_NOW’ 90 | TIMING_NOW (start); > > > > > > > > | ^~~~~~~~~~ > > > > > > > > ../sysdeps/generic/hp-timing.h:37:23: error: storage size of > > > > > > > > ‘tv’ isn’t known 37 | struct __timespec64 tv; \ > > > > > > > > | ^~ > > > > > > > > ./bench-timing.h:35:25: note: in expansion of macro > > > > > > > > ‘HP_TIMING_NOW’ 35 | #define TIMING_NOW(var) HP_TIMING_NOW > > > > > > > > (var) | ^~~~~~~~~~~~~ > > > > > > > > ./bench-skeleton.c:94:8: note: in expansion of macro > > > > > > > > ‘TIMING_NOW’ 94 | TIMING_NOW (end); > > > > > > > > | ^~~~~~~~~~ > > > > > > > > ../sysdeps/generic/hp-timing.h:37:23: error: unused variable > > > > > > > > ‘tv’ [-Werror=unused-variable] > > > > > > > > 37 | struct __timespec64 tv; \ > > > > > > > > | ^~ > > > > > > > > ./bench-timing.h:35:25: note: in expansion of macro > > > > > > > > ‘HP_TIMING_NOW’ 35 | #define TIMING_NOW(var) HP_TIMING_NOW > > > > > > > > (var) | ^~~~~~~~~~~~~ > > > > > > > > ./bench-skeleton.c:94:8: note: in expansion of macro > > > > > > > > ‘TIMING_NOW’ 94 | TIMING_NOW (end); > > > > > > > > | ^~~~~~~~~~ > > > > > > > > ../sysdeps/generic/hp-timing.h:37:23: error: storage size of > > > > > > > > ‘tv’ isn’t known 37 | struct __timespec64 tv; \ > > > > > > > > | ^~ > > > > > > > > ./bench-timing.h:35:25: note: in expansion of macro > > > > > > > > ‘HP_TIMING_NOW’ 35 | #define TIMING_NOW(var) HP_TIMING_NOW > > > > > > > > (var) | ^~~~~~~~~~~~~ > > > > > > > > ./bench-skeleton.c:103:3: note: in expansion of macro > > > > > > > > ‘TIMING_NOW’ 103 | TIMING_NOW (start); > > > > > > > > | ^~~~~~~~~~ > > > > > > > > ../sysdeps/generic/hp-timing.h:37:23: error: unused variable > > > > > > > > ‘tv’ [-Werror=unused-variable] > > > > > > > > 37 | struct __timespec64 tv; \ > > > > > > > > | ^~ > > > > > > > > ./bench-timing.h:35:25: note: in expansion of macro > > > > > > > > ‘HP_TIMING_NOW’ 35 | #define TIMING_NOW(var) HP_TIMING_NOW > > > > > > > > (var) | ^~~~~~~~~~~~~ > > > > > > > > ./bench-skeleton.c:103:3: note: in expansion of macro > > > > > > > > ‘TIMING_NOW’ 103 | TIMING_NOW (start); > > > > > > > > | ^~~~~~~~~~ > > > > > > > > ../sysdeps/generic/hp-timing.h:37:23: error: storage size of > > > > > > > > ‘tv’ isn’t known 37 | struct __timespec64 tv; \ > > > > > > > > | ^~ > > > > > > > > ./bench-timing.h:35:25: note: in expansion of macro > > > > > > > > ‘HP_TIMING_NOW’ 35 | #define TIMING_NOW(var) HP_TIMING_NOW > > > > > > > > (var) | ^~~~~~~~~~~~~ > > > > > > > > ./bench-skeleton.c:106:3: note: in expansion of macro > > > > > > > > ‘TIMING_NOW’ 106 | TIMING_NOW (end); > > > > > > > > | ^~~~~~~~~~ > > > > > > > > ../sysdeps/generic/hp-timing.h:37:23: error: unused variable > > > > > > > > ‘tv’ [-Werror=unused-variable] > > > > > > > > 37 | struct __timespec64 tv; \ > > > > > > > > | ^~ > > > > > > > > ./bench-timing.h:35:25: note: in expansion of macro > > > > > > > > ‘HP_TIMING_NOW’ 35 | #define TIMING_NOW(var) HP_TIMING_NOW > > > > > > > > (var) | ^~~~~~~~~~~~~ > > > > > > > > ./bench-skeleton.c:106:3: note: in expansion of macro > > > > > > > > ‘TIMING_NOW’ 106 | TIMING_NOW (end); > > > > > > > > | ^~~~~~~~~~ > > > > > > > > cc1: all warnings being treated as errors > > > > > > > > > > > > > > How shall I reproduce this error? > > > > > > > > > > > > Apply the enclosed patch and do > > > > > > > > > > > > $ make USE_CLOCK_GETTIME=1 bench > > > > > > > > > > > > > Was it supposed to be catch with build-many-glibc.py ? > > > > > > > > > > > > > > > > > > > No, "make bench" isn't tested by build-many-glibc.py. > > > > > > > > > > > > > > > > Here is the patch to fix __clock_gettime64 for > > > > > sysdeps/generic/hp-timing.h. OK for master? > > > > > > > > > > > > > Thanks for preparing the fix. > > > > > > > > If I may ask - I do have some question about the following code: > > > > +#else > > > > +struct __timespec64; > > > > +extern int __clock_gettime64 (clockid_t clock_id, struct > > > > __timespec64 *tp); +#endif > > > > > > > > Why do we need the "struct __timespec64;" declaration there as > > > > in ./sysdeps/generic/hp-timing.h you explicitly added: > > > > #include ? > > > > > > > > > > include/time.h is also included by other files which may not include > > > . > > > > > > > In which files you observe this situation? > > > > The was introduced to avoid including time.h > > when only new, y2038 safe struct __timespec64 is necessary. > > > > Without it, I got > > cc -m32 getprtent_r.c -c -std=gnu11 -fgnu89-inline -O2 -g -march=i686 > -Wall -Wwrite-strings -Wundef -Werror -fmerge-all-constants > -frounding-math -fno-stack-protector -Wstrict-prototypes > -Wold-style-definition -fmath-errno -fPIC -Wa,-mtune=i686 > -fexceptions -ftls-model=initial-exec -I../include > -I/export/build/gnu/tools-build/glibc-32bit-gitlab/build-i686-linux/inet > -I/export/build/gnu/tools-build/glibc-32bit-gitlab/build-i686-linux > -I../sysdeps/unix/sysv/linux/i386/i686 -I../sysdeps/i386/i686/nptl > -I../sysdeps/unix/sysv/linux/i386 > -I../sysdeps/unix/sysv/linux/x86/include > -I../sysdeps/unix/sysv/linux/x86 -I../sysdeps/x86/nptl > -I../sysdeps/i386/nptl -I../sysdeps/unix/sysv/linux/include > -I../sysdeps/unix/sysv/linux -I../sysdeps/nptl -I../sysdeps/pthread > -I../sysdeps/gnu -I../sysdeps/unix/inet -I../sysdeps/unix/sysv > -I../sysdeps/unix/i386 -I../sysdeps/unix -I../sysdeps/posix > -I../sysdeps/i386/i686/fpu/multiarch -I../sysdeps/i386/i686/fpu > -I../sysdeps/i386/i686/multiarch -I../sysdeps/i386/i686 > -I../sysdeps/i386/fpu -I../sysdeps/x86/fpu -I../sysdeps/i386 > -I../sysdeps/x86 -I../sysdeps/wordsize-32 > -I../sysdeps/ieee754/float128 -I../sysdeps/ieee754/ldbl-96/include > -I../sysdeps/ieee754/ldbl-96 -I../sysdeps/ieee754/dbl-64 > -I../sysdeps/ieee754/flt-32 -I../sysdeps/ieee754 > -I../sysdeps/generic -I.. -I../libio -I. -D_LIBC_REENTRANT -include > /export/build/gnu/tools-build/glibc-32bit-gitlab/build-i686-linux/libc-modules.h > -DMODULE_NAME=libc -include ../include/libc-symbols.h -DPIC -DSHARED > -DTOP_NAMESPACE=glibc -o > /export/build/gnu/tools-build/glibc-32bit-gitlab/build-i686-linux/inet/getprtent_r.os > -MD -MP -MF /export/build/gnu/tools-build/glibc-32bit-gitlab/build-i686-linux/inet/getprtent_r.os.dt > -MT /export/build/gnu/tools-build/glibc-32bit-gitlab/build-i686-linux/inet/getprtent_r.os > In file included from ../sysdeps/nptl/lowlevellock.h:24, > from ../sysdeps/unix/sysv/linux/x86/lowlevellock.h:23, > from ../nptl/descr.h:29, > from ../sysdeps/i386/nptl/tls.h:120, > from ../sysdeps/i386/i686/nptl/tls.h:33, > from ../include/link.h:51, > from ../include/dlfcn.h:4, > from ../nss/nsswitch.h:28, > from ../include/nsswitch.h:1, > from ../inet/netgroup.h:22, > from ../include/netdb.h:203, > from getprtent_r.c:18: > ../include/time.h:9:58: error: ‘struct __timespec64’ declared inside > parameter list will not be visible outside of this definition or > declaration [-Werror] > 9 | extern int __clock_gettime64 (clockid_t clock_id, struct > __timespec64 *tp); > | ^~~~~~~~~~~~ > cc1: all warnings being treated as errors > > This may happen for all 32-bit targets. We can't change include/time.h. Here is the updated patch to put __clock_gettime64 in sysdeps/generic/hp-timing.h if _ISOMAC is defined. From f805c47d4ec1013cf04509538ee8935e38610e4f Mon Sep 17 00:00:00 2001 From: "H.J. Lu" 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 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 provide __clock_gettime64 in sysdeps/generic/hp-timing.h if _ISOMAC is defined. Don't define __clock_gettime since it is no longer needed. --- benchtests/bench-timing.h | 1 - sysdeps/generic/hp-timing.h | 10 ++++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) 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 #include diff --git a/sysdeps/generic/hp-timing.h b/sysdeps/generic/hp-timing.h index af9d92f7f7..2efd7a6e54 100644 --- a/sysdeps/generic/hp-timing.h +++ b/sysdeps/generic/hp-timing.h @@ -24,6 +24,16 @@ #include #include +#ifdef _ISOMAC +# include +extern __typeof (clock_gettime) __clock_gettime; +# if __TIMESIZE == 64 +# define __clock_gettime64 __clock_gettime +# else +extern int __clock_gettime64 (clockid_t clock_id, struct __timespec64 *tp); +# endif +#endif + /* It should not be used for ld.so. */ #define HP_TIMING_INLINE (0) -- 2.26.2