Merge remote-tracking branch 'compnerd/bionic'

Author: hyp

CMakeLists.txt

@@ -70,20 +70,16 @@ include(XCTest)
 
 set(CF_DEPLOYMENT_SWIFT YES CACHE BOOL "Build for Swift" FORCE)
 
-set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
-set(THREADS_PREFER_PTHREAD_FLAG OFF)
 if(HAS_LIBDISPATCH_API)
+  set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+  set(THREADS_PREFER_PTHREAD_FLAG OFF)
+  if(ANDROID)
+    set(CMAKE_THREAD_LIBS_INIT "-lc")
+    set(THREADS_HAVE_PTHREAD_ARG FALSE)
+  endif()
   find_package(Threads REQUIRED)
 endif()
 
-# CMake's Threads adds '-pthread' flag to the interface link
-# libraries, which isn't supported by Swift. This is not enabled
-# when building with MSVC, but it trips up the Android build, so
-# we need to clear out the threads INTERFACE_LINK_LIBRARIES.
-if (CMAKE_SYSTEM_NAME STREQUAL "Android")
-  set_property(TARGET Threads::Threads PROPERTY INTERFACE_LINK_LIBRARIES "")
-endif()
-
 set(SAVED_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
 set(BUILD_SHARED_LIBS NO)
 add_subdirectory(CoreFoundation EXCLUDE_FROM_ALL)

CoreFoundation/Base.subproj/ForSwiftFoundationOnly.h

@@ -64,6 +64,7 @@
 #include <sys/stat.h>
 #include <sys/syscall.h>
 #include <termios.h>
+#include <linux/stat.h>
 #elif TARGET_OS_WASI
 #include <fcntl.h>
 #include <sys/stat.h>

CoreFoundation/Base.subproj/module.modulemap

@@ -1,6 +1,12 @@
 framework module CoreFoundation [extern_c] [system] {
     umbrella header "CoreFoundation.h"
     explicit module CFPlugInCOM { header "CFPlugInCOM.h" }
+    explicit module ForSwiftFoundationOnly {
+      header "ForSwiftFoundationOnly.h"
+      // Do not re-export imported Clang modules to avoid pulling in
+      // system headers like linux/stat.h whose constants might conflict
+      // with constants from the platform module.
+    }
 
     export *
     module * {

Sources/Foundation/CGFloat.swift

@@ -7,6 +7,10 @@
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 
+#if canImport(Android)
+import Android
+#endif
+
 @frozen
 public struct CGFloat: Sendable {
 #if arch(i386) || arch(arm) || arch(wasm32)

Sources/Foundation/Data.swift

@@ -64,6 +64,8 @@ internal func malloc_good_size(_ size: Int) -> Int {
 import Glibc
 #elseif canImport(Musl)
 import Musl
+#elseif canImport(Android)
+import Android
 #elseif canImport(WASILibc)
 import WASILibc
 #endif

Sources/Foundation/FileManager+POSIX.swift

@@ -7,14 +7,14 @@
 //
 #if !os(Windows)
 
+#if canImport(Android)
+import Android
+#endif
+
 #if os(Android) && (arch(i386) || arch(arm)) // struct stat.st_mode is UInt32
 internal func &(left: UInt32, right: mode_t) -> mode_t {
     return mode_t(left) & right
 }
-#elseif os(Android)
-internal func &(left: mode_t, right: Int32) -> mode_t {
-    return left & mode_t(right)
-}
 #endif
 
 #if os(WASI)
@@ -413,7 +413,7 @@ extension FileManager {
                     if !parent.isEmpty && !fileExists(atPath: parent, isDirectory: &isDir) {
                         try createDirectory(atPath: parent, withIntermediateDirectories: true, attributes: attributes)
                     }
-                    if mkdir(pathFsRep, mode_t(S_IRWXU) | mode_t(S_IRWXG) | mode_t(S_IRWXO)) != 0 {
+                    if mkdir(pathFsRep, S_IRWXU | S_IRWXG | S_IRWXO) != 0 {
                         let posixError = errno
                         if posixError == EEXIST && fileExists(atPath: path, isDirectory: &isDir) && isDir.boolValue {
                             // Continue; if there is an existing file and it is a directory, that is still a success.
@@ -432,7 +432,7 @@ extension FileManager {
                     throw _NSErrorWithErrno(EEXIST, reading: false, path: path)
                 }
             } else {
-                if mkdir(pathFsRep, mode_t(S_IRWXU) | mode_t(S_IRWXG) | mode_t(S_IRWXO)) != 0 {
+                if mkdir(pathFsRep, S_IRWXU | S_IRWXG | S_IRWXO) != 0 {
                     throw _NSErrorWithErrno(errno, reading: false, path: path)
                 } else if let attr = attributes {
                     try self.setAttributes(attr, ofItemAtPath: path)
@@ -807,8 +807,13 @@ extension FileManager {
                 let ps = UnsafeMutablePointer<UnsafeMutablePointer<Int8>?>.allocate(capacity: 2)
                 ps.initialize(to: UnsafeMutablePointer(mutating: fsRep))
                 ps.advanced(by: 1).initialize(to: nil)
-                let stream = ps.withMemoryRebound(to: UnsafeMutablePointer<CChar>.self, capacity: 2) {
-                    fts_open($0, FTS_PHYSICAL | FTS_XDEV | FTS_NOCHDIR | FTS_NOSTAT, nil)
+                let stream = ps.withMemoryRebound(to: UnsafeMutablePointer<CChar>.self, capacity: 2) { rebound_ps in
+#if canImport(Android)
+                    let arg = rebound_ps
+#else
+                    let arg = ps
+#endif
+                    return fts_open(arg, FTS_PHYSICAL | FTS_XDEV | FTS_NOCHDIR | FTS_NOSTAT, nil)
                 }
                 ps.deinitialize(count: 2)
                 ps.deallocate()
@@ -1177,8 +1182,13 @@ extension FileManager {
                     defer { ps.deallocate() }
                     ps.initialize(to: UnsafeMutablePointer(mutating: fsRep))
                     ps.advanced(by: 1).initialize(to: nil)
-                    return ps.withMemoryRebound(to: UnsafeMutablePointer<CChar>.self, capacity: 2) {
-                        fts_open($0, FTS_PHYSICAL | FTS_XDEV | FTS_NOCHDIR | FTS_NOSTAT, nil)
+                    return ps.withMemoryRebound(to: UnsafeMutablePointer<CChar>.self, capacity: 2) { rebound_ps in
+#if canImport(Android)
+                        let arg = rebound_ps
+#else
+                        let arg = ps
+#endif
+                        return fts_open(arg, FTS_PHYSICAL | FTS_XDEV | FTS_NOCHDIR | FTS_NOSTAT, nil)
                     }
                 }
                 if _stream == nil {

Sources/Foundation/FileManager.swift

@@ -23,9 +23,7 @@ import WinSDK
 
 #if os(WASI)
 import WASILibc
-#endif
-
-#if os(Android)
+#elseif canImport(Android)
 import Android
 #endif
 
@@ -1346,12 +1344,12 @@ public struct FileAttributeType : RawRepresentable, Equatable, Hashable {
 #else
     internal init(statMode: mode_t) {
         switch statMode & S_IFMT {
-        case mode_t(S_IFCHR): self = .typeCharacterSpecial
-        case mode_t(S_IFDIR): self = .typeDirectory
-        case mode_t(S_IFBLK): self = .typeBlockSpecial
-        case mode_t(S_IFREG): self = .typeRegular
-        case mode_t(S_IFLNK): self = .typeSymbolicLink
-        case mode_t(S_IFSOCK): self = .typeSocket
+        case S_IFCHR: self = .typeCharacterSpecial
+        case S_IFDIR: self = .typeDirectory
+        case S_IFBLK: self = .typeBlockSpecial
+        case S_IFREG: self = .typeRegular
+        case S_IFLNK: self = .typeSymbolicLink
+        case S_IFSOCK: self = .typeSocket
         default: self = .typeUnknown
         }
     }

Sources/Foundation/Host.swift

@@ -12,9 +12,9 @@
 import WinSDK
 #endif
 
-#if os(Android)
+#if canImport(Android)
     import Android
-    // Android Glibc differs a little with respect to the Linux Glibc.
+    // Android Bionic differs a little with respect to the Linux Glibc.
 
     // IFF_LOOPBACK is part of the enumeration net_device_flags, which needs to
     // convert to UInt32.

Sources/Foundation/NSData.swift

@@ -11,6 +11,9 @@
 #if !os(WASI)
 import Dispatch
 #endif
+#if canImport(Android)
+import Android
+#endif
 
 extension NSData {
     public struct ReadingOptions : OptionSet {

Sources/Foundation/NSPathUtilities.swift

@@ -10,6 +10,8 @@
 @_implementationOnly import CoreFoundation
 #if os(Windows)
 import WinSDK
+#elseif canImport(Android)
+import Android
 #elseif os(WASI)
 import WASILibc
 // CoreFoundation brings <errno.h> but it conflicts with WASILibc.errno
@@ -803,7 +805,7 @@ internal func _NSCreateTemporaryFile(_ filePath: String) throws -> (Int32, Strin
     }
 
     // Set the file mode to match macOS
-    guard fchmod(fd, mode_t(S_IRUSR) | mode_t(S_IWUSR) | mode_t(S_IRGRP) | mode_t(S_IWGRP) | mode_t(S_IROTH) | mode_t(S_IWOTH)) != -1 else {
+    guard fchmod(fd, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH) != -1 else {
         let _errno = errno
         close(fd)
         throw _NSErrorWithErrno(_errno, reading: false, path: pathResult)

Sources/Foundation/NSPlatform.swift

@@ -10,6 +10,9 @@
 #if os(macOS) || os(iOS)
 fileprivate let _NSPageSize = Int(vm_page_size)
 #elseif os(Linux) || os(Android) || os(OpenBSD)
+#if canImport(Android)
+import Android
+#endif
 fileprivate let _NSPageSize = Int(getpagesize())
 #elseif os(Windows)
 import WinSDK

Sources/Foundation/NSSwiftRuntime.swift

@@ -18,8 +18,8 @@
 @_exported import Glibc
 #elseif canImport(Musl)
 @_exported import Musl
-#elseif canImport(Android)
-@_exported import Android
+#elseif canImport(Bionic)
+@_exported import Bionic
 #elseif os(WASI)
 @_exported import WASILibc
 #elseif os(Windows)

Sources/Foundation/Process.swift

@@ -18,6 +18,8 @@ import struct WinSDK.HANDLE
 
 #if canImport(Darwin)
 import Darwin
+#elseif canImport(Android)
+import Android
 #endif
 
 extension Process {

Sources/FoundationNetworking/HTTPCookie.swift

@@ -15,6 +15,8 @@ import Foundation
 
 #if os(Windows)
 import WinSDK
+#elseif canImport(Android)
+import Android
 #endif
 
 public struct HTTPCookiePropertyKey : RawRepresentable, Equatable, Hashable {

Tests/Foundation/Tests/TestFileHandle.swift

@@ -19,6 +19,8 @@
 import Dispatch
 #if os(Windows)
 import WinSDK
+#elseif canImport(Android)
+import Android
 #endif
 
 class TestFileHandle : XCTestCase {
@@ -111,14 +113,7 @@ class TestFileHandle : XCTestCase {
 #else
         var fds: [Int32] = [-1, -1]
         fds.withUnsafeMutableBufferPointer { (pointer) -> Void in
-            let baseAddress = pointer.baseAddress
-#if canImport(Android)
-            // pipe takes in a non-nullable pointer in the Android NDK only.
-            guard let baseAddress else {
-                return
-            }
-#endif
-            pipe(baseAddress)
+            pipe(pointer.baseAddress!)
         }
 
         close(fds[1])

Tests/Foundation/Tests/TestNSData.swift

@@ -17,6 +17,10 @@ import CoreFoundation
     #endif
 #endif
 
+#if canImport(Android)
+import Android
+#endif
+
 class TestNSData: LoopbackServerTest {
 
     class AllOnesImmutableData : NSData {

Tests/Foundation/Tests/TestProcess.swift

@@ -7,6 +7,10 @@
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 
+#if canImport(Android)
+import Android
+#endif
+
 class TestProcess : XCTestCase {
 
     func test_exit0() throws {

Tests/Foundation/Tests/TestSocketPort.swift

@@ -8,6 +8,8 @@
 //
 #if os(Windows)
 import WinSDK
+#elseif canImport(Android)
+import Android
 #endif
 
 class TestPortDelegateWithBlock: NSObject, PortDelegate {

Tests/Foundation/Tests/TestTimeZone.swift

@@ -160,12 +160,7 @@ class TestTimeZone: XCTestCase {
         var lt = tm()
         localtime_r(&t, &lt)
         let zoneName = NSTimeZone.system.abbreviation() ?? "Invalid Abbreviation"
-        // tm_zone is nullable in the Android NDK only.
-        let tm_zone: UnsafePointer<CChar>? = lt.tm_zone
-        guard let tm_zone else {
-            return
-        }
-        let expectedName = String(cString: tm_zone, encoding: .ascii) ?? "Invalid Zone"
+        let expectedName = String(cString: lt.tm_zone!, encoding: .ascii) ?? "Invalid Zone"
         XCTAssertEqual(zoneName, expectedName, "expected name \"\(expectedName)\" is not equal to \"\(zoneName)\"")
     }
 #endif

Tests/Foundation/Tests/TestURL.swift

@@ -7,6 +7,10 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 
+#if canImport(Android)
+import Android
+#endif
+
 let kURLTestParsingTestsKey = "ParsingTests"
 
 let kURLTestTitleKey = "In-Title"

Tests/Tools/XDGTestHelper/main.swift

@@ -19,6 +19,8 @@ import FoundationNetworking
 #endif
 #if os(Windows)
 import WinSDK
+#elseif os(Android)
+import Android
 #endif
 
 enum HelperCheckStatus : Int32 {