fix build with 64-bit time_t/off_t on 32-bit platforms

It is possible to build with 64-bit timestamps and file offsets on 32-bit
platforms such as armv7 (e.g. for avoiding Y2038), and indeed this is the
default for Yocto.

This is (presently) broken in upstream Swift, so workaround until we can get
PRs merged upstream.

Author: lhoward

recipes-devtools/swift/swift-foundation-essentials.bb

@@ -13,6 +13,8 @@ SRC_URI = "git://github.com/swiftlang/swift-foundation.git;protocol=https;name=f
 SRC_URI += "git://github.com/swiftlang/swift-foundation-icu.git;protocol=https;name=icu;tag=swift-${SWIFT_VERSION}-RELEASE;nobranch=1;destsuffix=swift-foundation-icu;"
 SRC_URI += "git://github.com/swiftlang/swift-syntax.git;protocol=https;name=syntax;tag=swift-${SWIFT_VERSION}-RELEASE;nobranch=1;destsuffix=swift-foundation-icu;"
 SRC_URI += "git://github.com/apple/swift-collections.git;protocol=https;nobranch=1;name=collections;tag=1.1.4;destsuffix=swift-collections;"
+SRC_URI += "file://0001-build-with-64-bit-fsblkcnt_t-on-32-bit-glibc-platfor.patch;striplevel=1;"
+SRC_URI += "file://0002-build-with-64-bit-time_t-on-32-bit-platforms.patch;striplevel=1;"
 
 S = "${WORKDIR}/git"
 

recipes-devtools/swift/swift-foundation-essentials/0001-build-with-64-bit-fsblkcnt_t-on-32-bit-glibc-platfor.patch

@@ -0,0 +1,33 @@
+From 3eb8a04f9597ed71ddd3eb54db77a9d5e37f032d Mon Sep 17 00:00:00 2001
+From: Luke Howard <[email protected]>
+Date: Sat, 28 Jun 2025 11:58:13 +1000
+Subject: [PATCH 1/2] build with 64-bit fsblkcnt_t on 32-bit glibc platforms
+
+It is possible to build with 64-bit file offsets on 32-bit platforms such as
+armv7, and indeed this is the default for some build environments such as
+Yocto. Use fsblkcnt_t, which is an alias to a type of the correct width, when
+computing blockSize.
+---
+ .../FoundationEssentials/FileManager/FileManager+Files.swift  | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/Sources/FoundationEssentials/FileManager/FileManager+Files.swift b/Sources/FoundationEssentials/FileManager/FileManager+Files.swift
+index 64f8e21..824c3ac 100644
+--- a/Sources/FoundationEssentials/FileManager/FileManager+Files.swift
++++ b/Sources/FoundationEssentials/FileManager/FileManager+Files.swift
+@@ -727,8 +727,12 @@ extension _FileManagerImpl {
+             let blockSize = UInt64(result.f_bsize)
+             #else
+             let fsNumber = result.f_fsid
++            #if canImport(Glibc)
++            let blockSize = fsblkcnt_t(result.f_frsize) // support 64-bit block sizes on 32-bit platforms
++            #else
+             let blockSize = UInt(result.f_frsize)
+             #endif
++            #endif
+             var totalSizeBytes = result.f_blocks * blockSize
+             var availSizeBytes = result.f_bavail * blockSize
+             var totalFiles = result.f_files
+-- 
+2.43.0
+

recipes-devtools/swift/swift-foundation-essentials/0002-build-with-64-bit-time_t-on-32-bit-platforms.patch

@@ -0,0 +1,34 @@
+From ad2b4b35979caf1d66d77933dda66012f7108294 Mon Sep 17 00:00:00 2001
+From: Luke Howard <[email protected]>
+Date: Sat, 28 Jun 2025 11:59:30 +1000
+Subject: [PATCH 2/2] build with 64-bit time_t on 32-bit platforms
+
+It is good practice to build with 64-bit time_t/timeval on 32-bit platforms to
+avoid the Y2038 issue. This is the default when building on Yocto for armv7,
+for example. Unfortunately suseconds_t is not an alias to a type of the correct
+width (unlike time_t), so for Glibc make it a private alias of time_t to fix
+the build.
+---
+ .../FileManager/FileManager+Files.swift                     | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/Sources/FoundationEssentials/FileManager/FileManager+Files.swift b/Sources/FoundationEssentials/FileManager/FileManager+Files.swift
+index 824c3ac..c7ea78c 100644
+--- a/Sources/FoundationEssentials/FileManager/FileManager+Files.swift
++++ b/Sources/FoundationEssentials/FileManager/FileManager+Files.swift
+@@ -951,6 +951,12 @@ extension _FileManagerImpl {
+                 #endif
+             }
+             
++            #if canImport(Glibc)
++            // support for 64-bit timestamps on 32-bit platforms; unfortunately
++            // suseconds_t is not an alias of the appropriate type, but time_t is
++            typealias suseconds_t = time_t
++            #endif
++
+             if let date = attributes[.modificationDate] as? Date {
+                 let (isecs, fsecs) = modf(date.timeIntervalSince1970)
+                 if let tv_sec = time_t(exactly: isecs),
+-- 
+2.43.0
+

recipes-devtools/swift/swift-foundation.bb

@@ -14,6 +14,7 @@ SRC_URI += "git://github.com/swiftlang/swift-foundation.git;protocol=https;name=
 SRC_URI += "git://github.com/swiftlang/swift-foundation-icu.git;protocol=https;name=icu;tag=swift-${SWIFT_VERSION}-RELEASE;nobranch=1;destsuffix=swift-foundation-icu;"
 SRC_URI += "git://github.com/swiftlang/swift-syntax.git;protocol=https;name=syntax;tag=swift-${SWIFT_VERSION}-RELEASE;nobranch=1;destsuffix=swift-syntax;"
 SRC_URI += "file://0001-CFRunLoopTimerGetTolerance-CFRunLoopTimerSetToleranc.patch;striplevel=1;"
+SRC_URI += "file://0002-build-with-64-bit-time_t-on-32-bit-platforms.patch;striplevel=1;"
 
 S = "${WORKDIR}/git"
 

recipes-devtools/swift/swift-foundation/0002-build-with-64-bit-time_t-on-32-bit-platforms.patch

@@ -0,0 +1,34 @@
+From 214f7205f8a4065c6b4b5ac3471167bd1edc475f Mon Sep 17 00:00:00 2001
+From: Luke Howard <[email protected]>
+Date: Sat, 28 Jun 2025 12:04:30 +1000
+Subject: [PATCH] build with 64-bit time_t on 32-bit platforms
+
+It is good practice to build with 64-bit time_t/timeval on 32-bit platforms to
+avoid the Y2038 issue. This is the default when building on Yocto for armv7,
+for example. Unfortunately suseconds_t is not an alias to a type of the correct
+width (unlike time_t), so for Glibc make it a private alias of time_t to fix
+the build.
+---
+ Sources/Foundation/NSDate.swift | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/Sources/Foundation/NSDate.swift b/Sources/Foundation/NSDate.swift
+index ac7bd1bc..77579282 100644
+--- a/Sources/Foundation/NSDate.swift
++++ b/Sources/Foundation/NSDate.swift
+@@ -30,6 +30,12 @@ extension TimeInterval {
+ #else
+ extension timeval {
+     internal init(_timeIntervalSince1970: TimeInterval) {
++        #if canImport(Glibc)
++        // support for 64-bit timestamps on 32-bit platforms; unfortunately
++        // suseconds_t is not an alias of the appropriate type, but time_t is
++        typealias suseconds_t = time_t
++        #endif
++
+         let (integral, fractional) = modf(_timeIntervalSince1970)
+         self.init(tv_sec: time_t(integral), tv_usec: suseconds_t(1.0e6 * fractional))
+     }
+-- 
+2.43.0
+

recipes-devtools/swift/swift-stdlib.bb

@@ -18,6 +18,7 @@ SRC_URI = "\
     git://github.com/swiftlang/swift-experimental-string-processing.git;protocol=https;name=stringproc;tag=swift-${SWIFT_VERSION}-RELEASE;nobranch=1;destsuffix=swift-experimental-string-processing; \
     git://github.com/swiftlang/swift-syntax.git;protocol=https;name=syntax;tag=swift-${SWIFT_VERSION}-RELEASE;nobranch=1;destsuffix=swift-syntax; \
     file://0001-add-arm-to-float16support-for-armv7.patch;striplevel=1; \
+    file://0002-build-with-64-bit-time_t-on-32-bit-platforms.patch;striplevel=1; \
     "
 
 S = "${WORKDIR}/swift"

recipes-devtools/swift/swift-stdlib/0002-build-with-64-bit-time_t-on-32-bit-platforms.patch

@@ -0,0 +1,54 @@
+From 06073712f137bd1db7f0b94f4526b00be81ec3fb Mon Sep 17 00:00:00 2001
+From: Luke Howard <[email protected]>
+Date: Sat, 28 Jun 2025 15:01:30 +1000
+Subject: [PATCH] build with 64-bit time_t on 32-bit platforms
+
+It is good practice to build with 64-bit time_t/timeval on 32-bit platforms to
+avoid the Y2038 issue. This is the default when building on Yocto for armv7,
+for example. Unfortunately suseconds_t is not an alias to a type of the correct
+width (unlike time_t).
+---
+ stdlib/public/Platform/Platform.swift | 18 +++++++++++-------
+ 1 file changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/stdlib/public/Platform/Platform.swift b/stdlib/public/Platform/Platform.swift
+index 0c2d63a0cff..4949fc66456 100644
+--- a/stdlib/public/Platform/Platform.swift
++++ b/stdlib/public/Platform/Platform.swift
+@@ -439,7 +439,7 @@ extension timespec {
+   @available(SwiftStdlib 5.7, *)
+   public init(_ duration: Duration) {
+     let comps = duration.components
+-    self.init(tv_sec: Int(comps.seconds),
++    self.init(tv_sec: time_t(comps.seconds),
+               tv_nsec: Int(comps.attoseconds / 1_000_000_000))
+   }
+ }
+@@ -458,14 +458,18 @@ extension timeval {
+   public init(_ duration: Duration) {
+     let comps = duration.components
+ #if os(Linux)
+-  // Linux platforms define timeval as Int/Int
+-  self.init(tv_sec: Int(comps.seconds),
+-              tv_usec: Int(comps.attoseconds / 1_000_000_000_000))
++    // Linux platforms define timeval as Int/Int, except on 32-bit platforms
++    // where _TIME_BITS=64 is defined. Abuse time_t as an alias for the correct
++    // suseconds_t type, as it is not an alias to the 64-bit type on 32-bit
++    // platforms.
++    typealias _Seconds = time_t
++    typealias _Microseconds = time_t
+ #else
+-    // Darwin platforms define timeval as Int/Int32
+-    self.init(tv_sec: Int(comps.seconds),
+-              tv_usec: Int32(comps.attoseconds / 1_000_000_000_000))
++    typealias _Seconds = Int
++    typealias _Microseconds = Int32
+ #endif
++    self.init(tv_sec: _Seconds(comps.seconds),
++              tv_usec: _Microseconds(comps.attoseconds / 1_000_000_000_000))
+   }
+ }
+ 
+-- 
+2.39.5 (Apple Git-154)
+