forked from rpms/glibc
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
|
commit 0351c75c5f94134fcec0e778e8cf86d149f8bbfb
|
||
|
|
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
||
|
|
Date: Thu Feb 3 16:52:52 2022 -0300
|
||
|
|
|
||
|
|
linux: Fix missing __convert_scm_timestamps (BZ #28860)
|
||
|
|
|
||
|
|
Commit 948ce73b31 made recvmsg/recvmmsg to always call
|
||
|
|
__convert_scm_timestamps for 64 bit time_t symbol, so adjust it to
|
||
|
|
always build it for __TIMESIZE != 64.
|
||
|
|
|
||
|
|
It fixes build for architecture with 32 bit time_t support when
|
||
|
|
configured with minimum kernel of 5.1.
|
||
|
|
|
||
|
|
(cherry-picked from 798d716df71fb23dc89d1d5dba1fc26a1b5c0024)
|
||
|
|
|
||
|
|
diff --git a/sysdeps/unix/sysv/linux/convert_scm_timestamps.c b/sysdeps/unix/sysv/linux/convert_scm_timestamps.c
|
||
|
|
index 5d3c4199e0b32944..953ce97bd2e03849 100644
|
||
|
|
--- a/sysdeps/unix/sysv/linux/convert_scm_timestamps.c
|
||
|
|
+++ b/sysdeps/unix/sysv/linux/convert_scm_timestamps.c
|
||
|
|
@@ -16,9 +16,10 @@
|
||
|
|
License along with the GNU C Library; if not, see
|
||
|
|
<https://www.gnu.org/licenses/>. */
|
||
|
|
|
||
|
|
-#include <kernel-features.h>
|
||
|
|
+#include <bits/wordsize.h>
|
||
|
|
+#include <bits/timesize.h>
|
||
|
|
|
||
|
|
-#ifndef __ASSUME_TIME64_SYSCALLS
|
||
|
|
+#if __TIMESIZE != 64
|
||
|
|
# include <stdint.h>
|
||
|
|
# include <string.h>
|
||
|
|
# include <sys/socket.h>
|