From: Stafford Horne <shorne@gmail.com>
To: GLIBC patches <libc-alpha@sourceware.org>
Cc: Stafford Horne <shorne@gmail.com>,
Adhemerval Zanella <adhemerval.zanella@linaro.org>,
Joseph Myers <joseph@codesourcery.com>
Subject: [PATCH] time: Fix compile error in itimer test affecting hurd
Date: Thu, 19 Aug 2021 23:58:53 +0900 [thread overview]
Message-ID: <20210819145853.63520-1-shorne@gmail.com> (raw)
The recent change to use __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 to avoid
doing 64-bit checks on some platforms broke the test for hurd where
__KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 is not defined. With error:
tst-itimer.c: In function 'do_test':
tst-itimer.c:103:11: error: '__KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64' undeclared (first use in this function)
103 | if (__KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
tst-itimer.c:103:11: note: each undeclared identifier is reported only once for each function it appears in
Define a new macro that works for both hurd and linux to detect when
setitimer and getitimer support 64-bit time_t.
Fixes commit 6e8a0aac2f ("time: Fix overflow itimer tests on 32-bit
systems").
Cc: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Cc: Joseph Myers <joseph@codesourcery.com>
---
Hi Joseph,
I know you mentioned defining a new macro, I was not sure if you meant in the
test or globally. I opted to add this to the test as I don't see a good reason
to add the macro to hurd which is only needed for this test.
I build tested this on i686-gnu and ran my tests on or1k and it does work.
-Stafford
time/tst-itimer.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/time/tst-itimer.c b/time/tst-itimer.c
index bd7d7afe83..af97ef6acf 100644
--- a/time/tst-itimer.c
+++ b/time/tst-itimer.c
@@ -25,6 +25,12 @@
#include <unistd.h>
#include <time.h>
+#ifdef __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64
+# define ITIMER_SUPPORTS_TIMESPEC64 __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64
+#else
+# define ITIMER_SUPPORTS_TIMESPEC64 (sizeof (__time_t) == 8)
+#endif
+
static sig_atomic_t cnt;
static void
@@ -100,7 +106,7 @@ do_test (void)
/* Linux does not provide 64 bit time_t support for getitimer and
setitimer on architectures with 32 bit time_t support. */
- if (__KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64)
+ if (ITIMER_SUPPORTS_TIMESPEC64)
{
TEST_COMPARE (setitimer (timers[i], &it, NULL), 0);
TEST_COMPARE (setitimer (timers[i], &(struct itimerval) { 0 },
@@ -131,7 +137,7 @@ do_test (void)
it.it_interval.tv_usec = 20;
it.it_value.tv_sec = 30;
it.it_value.tv_usec = 40;
- if (__KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64)
+ if (ITIMER_SUPPORTS_TIMESPEC64)
{
TEST_COMPARE (setitimer (timers[i], &it, NULL), 0);
--
2.31.1
next reply other threads:[~2021-08-19 14:59 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-19 14:58 Stafford Horne [this message]
2021-08-19 20:57 ` Stafford Horne
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210819145853.63520-1-shorne@gmail.com \
--to=shorne@gmail.com \
--cc=adhemerval.zanella@linaro.org \
--cc=joseph@codesourcery.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).