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