forked from rpms/glibc
42eb238e49
* Tue Mar 15 2022 Florian Weimer <fweimer@redhat.com> - 2.34-29 - Sync with upstream branch release/2.34/master, commit 224d8c1890b6c57c7e4e8ddbb792dd9552086704: - debug: Synchronize feature guards in fortified functions [BZ #28746] - debug: Autogenerate _FORTIFY_SOURCE tests - Enable _FORTIFY_SOURCE=3 for gcc 12 and above - fortify: Fix spurious warning with realpath - __glibc_unsafe_len: Fix comment - debug: Add tests for _FORTIFY_SOURCE=3 - Make sure that the fortified function conditionals are constant - Don't add access size hints to fortifiable functions - nss: Protect against errno changes in function lookup (bug 28953) - nss: Do not mention NSS test modules in <gnu/lib-names.h> - io: Add fsync call in tst-stat - hppa: Fix warnings from _dl_lookup_address - nptl: Fix cleanups for stack grows up [BZ# 28899] - hppa: Revise gettext trampoline design - hppa: Fix swapcontext - Fix elf/tst-audit2 on hppa - localedef: Handle symbolic links when generating locale-archive - NEWS: Add a bug fix entry for BZ #28896 - x86: Fix TEST_NAME to make it a string in tst-strncmp-rtm.c - x86: Test wcscmp RTM in the wcsncmp overflow case [BZ #28896] - x86: Fallback {str|wcs}cmp RTM in the ncmp overflow case [BZ #28896] - string: Add a testcase for wcsncmp with SIZE_MAX [BZ #28755] - linux: fix accuracy of get_nprocs and get_nprocs_conf [BZ #28865] - Add reference to BZ#28860 on NEWS - linux: Fix missing __convert_scm_timestamps (BZ #28860) Resolves: #2063230 Resolves: #2033683 Resolves: #2063041 Resolves: #2063142
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>
|