summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2022-02-03 16:52:52 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2022-02-03 17:20:36 -0300
commit0351c75c5f94134fcec0e778e8cf86d149f8bbfb (patch)
tree1cb35c25e513ecfef8f27a4b300fa590712f876f
parent6eaf10cbb78d22eae7999d9de55f6b93999e0860 (diff)
downloadglibc-0351c75c5f94134fcec0e778e8cf86d149f8bbfb.tar.gz
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)
-rw-r--r--sysdeps/unix/sysv/linux/convert_scm_timestamps.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/convert_scm_timestamps.c b/sysdeps/unix/sysv/linux/convert_scm_timestamps.c
index 5d3c4199e0..953ce97bd2 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>