234a1c0ad2
* Tue Feb 1 2022 Florian Weimer <fweimer@redhat.com> - 2.34-24 - Sync with upstream branch release/2.34/master, commit 008003dc6e83439c5e04a744b7fd8197df19096e: - tst-socket-timestamp-compat.c: Check __TIMESIZE [BZ #28837] - Linux: Only generate 64 bit timestamps for 64 bit time_t recvmsg/recvmmsg - linux: Fix ancillary 64-bit time timestamp conversion (BZ #28349, BZ#28350) - support: Add support_socket_so_timestamp_time64 * Tue Feb 1 2022 Florian Weimer <fweimer@redhat.com> - 2.34-23 - Align with glibc 2.35 version of C.UTF-8 * Tue Feb 1 2022 Florian Weimer <fweimer@redhat.com> - 2.34-22 - Sync with upstream branch release/2.34/master, commit aa601d024424c40ae9a69b0c4e394a70ea0570c8: - x86: Use CHECK_FEATURE_PRESENT to check HLE [BZ #27398] - x86: Filter out more Intel CPUs for TSX [BZ #27398] - Fix glibc 2.34 ABI omission (missing GLIBC_2.34 in dynamic loader) - x86: Fix __wcsncmp_evex in strcmp-evex.S [BZ# 28755] - x86: Fix __wcsncmp_avx2 in strcmp-avx2.S [BZ# 28755] Resolves: #2037056
25 lines
999 B
Diff
25 lines
999 B
Diff
commit 008003dc6e83439c5e04a744b7fd8197df19096e
|
|
Author: H.J. Lu <hjl.tools@gmail.com>
|
|
Date: Sat Jan 29 05:22:31 2022 -0800
|
|
|
|
tst-socket-timestamp-compat.c: Check __TIMESIZE [BZ #28837]
|
|
|
|
time_t size is defined by __TIMESIZE, not __WORDSIZE. Check __TIMESIZE,
|
|
instead of __WORDSIZE, for time_t size. This fixes BZ #28837.
|
|
|
|
(cherry pick from commit 77a602ebb0769e7ccc5f9f8e06f7fffe66f69dfc)
|
|
|
|
diff --git a/sysdeps/unix/sysv/linux/tst-socket-timestamp-compat.c b/sysdeps/unix/sysv/linux/tst-socket-timestamp-compat.c
|
|
index de261dae5a6385cf..0ff1a214e605105b 100644
|
|
--- a/sysdeps/unix/sysv/linux/tst-socket-timestamp-compat.c
|
|
+++ b/sysdeps/unix/sysv/linux/tst-socket-timestamp-compat.c
|
|
@@ -237,7 +237,7 @@ do_test (void)
|
|
{
|
|
/* This test only make sense for ABIs that support 32 bit time_t socket
|
|
timestampss. */
|
|
- if (sizeof (time_t) > 4 && __WORDSIZE == 64)
|
|
+ if (sizeof (time_t) > 4 && __TIMESIZE == 64)
|
|
return 0;
|
|
|
|
srv = xsocket (AF_INET, SOCK_DGRAM, 0);
|