ad85e10075
Upstream commit: commit 6484ae5b8c4d4314f748e4d3c9a9baa5385e57c5 - malloc: Fix -Wuse-after-free warning in tst-mallocalign1 [BZ #26779] - s_sincosf.h: Change pio4 type to float [BZ #28713] - math: Properly cast X_TLOSS to float [BZ #28713] - Regenerate ulps on x86_64 with GCC 12 - Avoid -Wuse-after-free in tests [BZ #26779]. - Fix build of nptl/tst-thread_local1.cc with GCC 12 - Fix stdio-common tests for GCC 12 -Waddress - Fix stdlib/tst-setcontext.c for GCC 12 -Warray-compare - resolv: Avoid GCC 12 false positive warning [BZ #28439]. - intl: Avoid -Wuse-after-free [BZ #26779] - elf: Drop elf/tls-macros.h in favor of __thread and tls_model attributes [BZ #28152] [BZ #28205] - time: Set daylight to 1 for matching DST/offset change (RHBZ#2155352) - elf/tst-tlsopt-powerpc fails when compiled with -mcpu=power10 (BZ# 29776) - time: Use 64 bit time on tzfile - nscd: Use 64 bit time_t on libc nscd routines (BZ# 29402) - nis: Build libnsl with 64 bit time_t - Use LFS and 64 bit time for installed programs (BZ #15333) Resolves: #2155352 Related: #2160734
25 lines
692 B
Diff
25 lines
692 B
Diff
commit e14a91e59d35bf2fa649a9726ccce838b8c6e4b7
|
|
Author: Adhemerval Zanella Netto <adhemerval.zanella@linaro.org>
|
|
Date: Wed Oct 26 16:04:25 2022 -0300
|
|
|
|
time: Use 64 bit time on tzfile
|
|
|
|
The tzfile_mtime is already compared to 64 bit time_t stat call.
|
|
Reviewed-by: DJ Delorie <dj@redhat.com>
|
|
|
|
(cherry picked from commit 4e21c2075193e406a92c0d1cb091a7c804fda4d9)
|
|
|
|
diff --git a/time/tzfile.c b/time/tzfile.c
|
|
index 8668392ad387af05..84fd9df65f76f148 100644
|
|
--- a/time/tzfile.c
|
|
+++ b/time/tzfile.c
|
|
@@ -32,7 +32,7 @@
|
|
int __use_tzfile;
|
|
static dev_t tzfile_dev;
|
|
static ino64_t tzfile_ino;
|
|
-static time_t tzfile_mtime;
|
|
+static __time64_t tzfile_mtime;
|
|
|
|
struct ttinfo
|
|
{
|