Merge pull request #5146 from michael-yuji/freebsd-wip

[FreeBSD] Fix FreeBSD build

Author: finagolfin

Sources/CoreFoundation/CFPlatform.c

@@ -281,7 +281,7 @@ const char *_CFProcessPath(void) {
 
 #if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_BSD
 CF_CROSS_PLATFORM_EXPORT Boolean _CFIsMainThread(void) {
-#if defined(__OpenBSD__)
+#if defined(__OpenBSD__) || defined(__FreeBSD__)
     return pthread_equal(pthread_self(), _CFMainPThread) != 0;
 #else
     return pthread_main_np() == 1;
@@ -928,9 +928,13 @@ static void __CFTSDFinalize(void *arg) {
 #if _POSIX_THREADS && !TARGET_OS_WASI
     if (table->destructorCount == PTHREAD_DESTRUCTOR_ITERATIONS - 1) {    // On PTHREAD_DESTRUCTOR_ITERATIONS-1 call, destroy our data
         free(table);
-        
+
+        // FreeBSD libthr emits debug message to stderr if there are leftover nonnull TSD after PTHREAD_DESTRUCTOR_ITERATIONS
+        // On this platform, the destructor will never be called again, therefore it is unneccessary to set the TSD to CF_TSD_BAD_PTR
+        #if !defined(__FreeBSD__)
         // Now if the destructor is called again we will take the shortcut at the beginning of this function.
         __CFTSDSetSpecific(CF_TSD_BAD_PTR);
+        #endif
         return;
     }
 #else

Sources/CoreFoundation/include/CoreFoundation.h

@@ -74,7 +74,7 @@
 
 #include "ForSwiftFoundationOnly.h"
 
-#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_WIN32 || TARGET_OS_LINUX || TARGET_OS_WASI
+#if TARGET_OS_OSX || TARGET_OS_IPHONE || TARGET_OS_WIN32 || TARGET_OS_LINUX || TARGET_OS_WASI || TARGET_OS_BSD
 #  if !TARGET_OS_WASI
 #include "CFMessagePort.h"
 #include "CFPlugIn.h"

Sources/CoreFoundation/internalInclude/CFBundle_Internal.h

@@ -431,7 +431,7 @@ CF_PRIVATE const CFStringRef _kCFBundleUseAppleLocalizationsKey;
 // The buffer must be PATH_MAX long or more.
 static bool _CFGetPathFromFileDescriptor(int fd, char *path);
 
-#if TARGET_OS_MAC || (TARGET_OS_BSD && !defined(__OpenBSD__))
+#if TARGET_OS_MAC || (TARGET_OS_BSD && !defined(__OpenBSD__) && !defined(__FreeBSD__))
 
 static bool _CFGetPathFromFileDescriptor(int fd, char *path) {
     return fcntl(fd, F_GETPATH, path) != -1;

Sources/Foundation/FileManager+POSIX.swift

@@ -93,7 +93,7 @@ extension FileManager {
             }
             urls = mountPoints(statBuf, Int(fsCount))
         }
-#elseif os(OpenBSD)
+#elseif os(OpenBSD) || os(FreeBSD)
         func mountPoints(_ statBufs: UnsafePointer<statfs>, _ fsCount: Int) -> [URL] {
             var urls: [URL] = []
 

Sources/Foundation/FileManager.swift

@@ -318,9 +318,15 @@ extension FileManager {
             flags |= flagsToSet
             flags &= ~flagsToUnset
 
-            guard chflags(fsRep, flags) == 0 else {
+#if os(FreeBSD)
+            guard chflags(path, UInt(flags)) == 0 else {
                 throw _NSErrorWithErrno(errno, reading: false, path: path)
             }
+#else
+            guard chflags(path, flags) == 0 else {
+                throw _NSErrorWithErrno(errno, reading: false, path: path)
+            }
+#endif
 #endif
         }
 

Sources/Foundation/Host.swift

@@ -195,7 +195,7 @@ open class Host: NSObject {
                 let family = ifa_addr.pointee.sa_family
                 if family == sa_family_t(AF_INET) || family == sa_family_t(AF_INET6) {
                     let sa_len: socklen_t = socklen_t((family == sa_family_t(AF_INET6)) ? MemoryLayout<sockaddr_in6>.size : MemoryLayout<sockaddr_in>.size)
-#if os(OpenBSD)
+#if os(OpenBSD) || os(FreeBSD)
                     let hostlen = size_t(NI_MAXHOST)
 #else
                     let hostlen = socklen_t(NI_MAXHOST)
@@ -295,7 +295,7 @@ open class Host: NSObject {
             }
             var hints = addrinfo()
             hints.ai_family = PF_UNSPEC
-#if os(macOS) || os(iOS) || os(Android) || os(OpenBSD) || canImport(Musl)
+#if os(macOS) || os(iOS) || os(Android) || os(OpenBSD) || canImport(Musl) || os(FreeBSD)
             hints.ai_socktype = SOCK_STREAM
 #else
             hints.ai_socktype = Int32(SOCK_STREAM.rawValue)
@@ -325,7 +325,7 @@ open class Host: NSObject {
                 }
                 let sa_len: socklen_t = socklen_t((family == AF_INET6) ? MemoryLayout<sockaddr_in6>.size : MemoryLayout<sockaddr_in>.size)
                 let lookupInfo = { (content: inout [String], flags: Int32) in
-#if os(OpenBSD)
+#if os(OpenBSD) || os(FreeBSD)
                     let hostlen = size_t(NI_MAXHOST)
 #else
                     let hostlen = socklen_t(NI_MAXHOST)

Sources/Foundation/NSLock.swift

@@ -41,7 +41,7 @@ extension NSLocking {
 private typealias _MutexPointer = UnsafeMutablePointer<SRWLOCK>
 private typealias _RecursiveMutexPointer = UnsafeMutablePointer<CRITICAL_SECTION>
 private typealias _ConditionVariablePointer = UnsafeMutablePointer<CONDITION_VARIABLE>
-#elseif CYGWIN || os(OpenBSD)
+#elseif CYGWIN || os(OpenBSD) || os(FreeBSD)
 private typealias _MutexPointer = UnsafeMutablePointer<pthread_mutex_t?>
 private typealias _RecursiveMutexPointer = UnsafeMutablePointer<pthread_mutex_t?>
 private typealias _ConditionVariablePointer = UnsafeMutablePointer<pthread_cond_t?>
@@ -289,14 +289,14 @@ open class NSRecursiveLock: NSObject, NSLocking, @unchecked Sendable {
         InitializeConditionVariable(timeoutCond)
         InitializeSRWLock(timeoutMutex)
 #else
-#if CYGWIN || os(OpenBSD)
+#if CYGWIN || os(OpenBSD) || os(FreeBSD)
         var attrib : pthread_mutexattr_t? = nil
 #else
         var attrib = pthread_mutexattr_t()
 #endif
         withUnsafeMutablePointer(to: &attrib) { attrs in
             pthread_mutexattr_init(attrs)
-#if os(OpenBSD)
+#if os(OpenBSD) || os(FreeBSD)
             let type = Int32(PTHREAD_MUTEX_RECURSIVE.rawValue)
 #else
             let type = Int32(PTHREAD_MUTEX_RECURSIVE)

Sources/Foundation/NSPlatform.swift

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

Sources/Foundation/Port.swift

@@ -107,7 +107,7 @@ fileprivate let FOUNDATION_SOCK_STREAM = SOCK_STREAM
 fileprivate let FOUNDATION_IPPROTO_TCP = IPPROTO_TCP
 #endif
 
-#if canImport(Glibc) && !os(OpenBSD)
+#if canImport(Glibc) && !os(OpenBSD) && !os(FreeBSD)
 import Glibc
 fileprivate let FOUNDATION_SOCK_STREAM = Int32(SOCK_STREAM.rawValue)
 fileprivate let FOUNDATION_IPPROTO_TCP = Int32(IPPROTO_TCP)
@@ -119,7 +119,7 @@ fileprivate let FOUNDATION_SOCK_STREAM = Int32(SOCK_STREAM)
 fileprivate let FOUNDATION_IPPROTO_TCP = Int32(IPPROTO_TCP)
 #endif
 
-#if canImport(Glibc) && os(OpenBSD)
+#if canImport(Glibc) && (os(OpenBSD) || os(FreeBSD))
 import Glibc
 fileprivate let FOUNDATION_SOCK_STREAM = Int32(SOCK_STREAM)
 fileprivate let FOUNDATION_IPPROTO_TCP = Int32(IPPROTO_TCP)

Sources/Foundation/Process.swift

@@ -781,7 +781,7 @@ open class Process: NSObject, @unchecked Sendable {
         }
 
         var taskSocketPair : [Int32] = [0, 0]
-#if os(macOS) || os(iOS) || os(Android) || os(OpenBSD) || canImport(Musl)
+#if os(macOS) || os(iOS) || os(Android) || os(OpenBSD) || os(FreeBSD) || canImport(Musl)
         socketpair(AF_UNIX, SOCK_STREAM, 0, &taskSocketPair)
 #else
         socketpair(AF_UNIX, Int32(SOCK_STREAM.rawValue), 0, &taskSocketPair)
@@ -938,7 +938,7 @@ open class Process: NSObject, @unchecked Sendable {
             useFallbackChdir = false
         }
 
-#if canImport(Darwin) || os(Android) || os(OpenBSD)
+#if canImport(Darwin) || os(Android) || os(OpenBSD) || os(FreeBSD)
         var spawnAttrs: posix_spawnattr_t? = nil
 #else
         var spawnAttrs: posix_spawnattr_t = posix_spawnattr_t()