Skip to content

Add FreeBSD overlay #79261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add FreeBSD overlay #79261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions benchmark/single-source/CString.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import Glibc
import Musl
#elseif os(Windows)
import MSVCRT
#elseif canImport(FreeBSD)
import FreeBSD
#else
import Darwin
#endif
Expand Down
2 changes: 2 additions & 0 deletions benchmark/single-source/Radix2CooleyTukey.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import Glibc
import Musl
#elseif os(Windows)
import MSVCRT
#elseif canImport(FreeBSD)
import FreeBSD
#else
import Darwin
#endif
Expand Down
2 changes: 2 additions & 0 deletions benchmark/single-source/StringEdits.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import Glibc
import Musl
#elseif os(Windows)
import MSVCRT
#elseif canImport(FreeBSD)
import FreeBSD
#else
import Darwin
#endif
Expand Down
2 changes: 2 additions & 0 deletions benchmark/single-source/StringMatch.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import Glibc
import Musl
#elseif os(Windows)
import MSVCRT
#elseif canImport(FreeBSD)
import FreeBSD
#else
import Darwin
#endif
Expand Down
2 changes: 2 additions & 0 deletions benchmark/single-source/Walsh.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import Glibc
import Musl
#elseif os(Windows)
import MSVCRT
#elseif canImport(FreeBSD)
import FreeBSD
#else
import Darwin
#endif
Expand Down
2 changes: 2 additions & 0 deletions benchmark/utils/ArgParse.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import Glibc
import Musl
#elseif os(Windows)
import MSVCRT
#elseif canImport(FreeBSD)
import FreeBSD
#else
import Darwin
#endif
Expand Down
2 changes: 2 additions & 0 deletions benchmark/utils/DriverUtils.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import Glibc
import Musl
#elseif os(Windows)
import MSVCRT
#elseif canImport(FreeBSD)
import FreeBSD
#else
import Darwin
import LibProc
Expand Down
8 changes: 6 additions & 2 deletions lib/ClangImporter/ClangIncludePaths.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,8 +625,12 @@ ClangInvocationFileMapping swift::getClangInvocationFileMapping(
sysroot = libcFileMapping[0].first;
llvm::sys::path::remove_filename(sysroot);
}
} else if (triple.isOSGlibc() || triple.isOSOpenBSD() ||
triple.isOSFreeBSD()) {
} else if (triple.isOSFreeBSD()) {
libcFileMapping = getLibcFileMapping(ctx, "freebsd.modulemap",
StringRef("SwiftFreeBSD.h"), vfs,
suppressDiagnostic);
result.requiresBuiltinHeadersInSystemModules = true;
} else if (triple.isOSGlibc() || triple.isOSOpenBSD()) {
// BSD/Linux Mappings
libcFileMapping = getLibcFileMapping(ctx, "glibc.modulemap",
StringRef("SwiftGlibc.h"), vfs,
Expand Down
1 change: 1 addition & 0 deletions lib/DriverTool/autolink_extract_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ int autolink_extract_main(ArrayRef<const char *> Args, const char *Argv0,
"-lswiftSynchronization",
"-lswiftGlibc",
"-lswiftAndroid",
"-lswiftFreeBSD",
"-lBlocksRuntime",
// Dispatch-specific Swift runtime libs
"-ldispatch",
Expand Down
2 changes: 2 additions & 0 deletions lib/SILGen/SILGen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,8 @@ FuncDecl *SILGenModule::getExit() {
mostLikelyIdentifier = C.getIdentifier("SwiftWASILibc");
} else if (triple.isWindowsMSVCEnvironment()) {
mostLikelyIdentifier = C.getIdentifier("ucrt");
} else if (triple.isOSFreeBSD()) {
mostLikelyIdentifier = C.getIdentifier("SwiftFreeBSD");
} else {
mostLikelyIdentifier = C.getIdentifier("SwiftGlibc");
}
Expand Down
2 changes: 1 addition & 1 deletion stdlib/cmake/modules/AddSwiftStdlib.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ function(_add_target_variant_c_compile_link_flags)
endif()

# Use frame pointers on Linux
if("${CFLAGS_SDK}" STREQUAL "LINUX")
if("${CFLAGS_SDK}" STREQUAL "LINUX" OR "${CFLAGS_SDK}" STREQUAL "FREEBSD")
list(APPEND result "-fno-omit-frame-pointer")
endif()

Expand Down
2 changes: 1 addition & 1 deletion stdlib/private/RuntimeUnittest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ add_swift_target_library(swiftRuntimeUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES
SWIFT_MODULE_DEPENDS_ANDROID Android
SWIFT_MODULE_DEPENDS_LINUX Glibc
SWIFT_MODULE_DEPENDS_LINUX_STATIC Musl
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
SWIFT_MODULE_DEPENDS_FREEBSD FreeBSD
SWIFT_MODULE_DEPENDS_OPENBSD Glibc
SWIFT_MODULE_DEPENDS_CYGWIN Glibc
SWIFT_MODULE_DEPENDS_HAIKU Glibc
Expand Down
2 changes: 1 addition & 1 deletion stdlib/private/StdlibCollectionUnittest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ add_swift_target_library(swiftStdlibCollectionUnittest ${SWIFT_STDLIB_LIBRARY_BU
SWIFT_MODULE_DEPENDS_ANDROID Android
SWIFT_MODULE_DEPENDS_LINUX Glibc
SWIFT_MODULE_DEPENDS_LINUX_STATIC Musl
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
SWIFT_MODULE_DEPENDS_FREEBSD FreeBSD
SWIFT_MODULE_DEPENDS_OPENBSD Glibc
SWIFT_MODULE_DEPENDS_CYGWIN Glibc
SWIFT_MODULE_DEPENDS_HAIKU Glibc
Expand Down
2 changes: 1 addition & 1 deletion stdlib/private/StdlibUnicodeUnittest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ add_swift_target_library(swiftStdlibUnicodeUnittest ${SWIFT_STDLIB_LIBRARY_BUILD
SWIFT_MODULE_DEPENDS_ANDROID Android
SWIFT_MODULE_DEPENDS_LINUX Glibc
SWIFT_MODULE_DEPENDS_LINUX_STATIC Musl
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
SWIFT_MODULE_DEPENDS_FREEBSD FreeBSD
SWIFT_MODULE_DEPENDS_OPENBSD Glibc
SWIFT_MODULE_DEPENDS_CYGWIN Glibc
SWIFT_MODULE_DEPENDS_HAIKU Glibc
Expand Down
2 changes: 1 addition & 1 deletion stdlib/private/StdlibUnittest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ add_swift_target_library(swiftStdlibUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES}
SWIFT_MODULE_DEPENDS_ANDROID Android
SWIFT_MODULE_DEPENDS_LINUX Glibc
SWIFT_MODULE_DEPENDS_LINUX_STATIC Musl
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
SWIFT_MODULE_DEPENDS_FREEBSD FreeBSD
SWIFT_MODULE_DEPENDS_OPENBSD Glibc
SWIFT_MODULE_DEPENDS_CYGWIN Glibc
SWIFT_MODULE_DEPENDS_HAIKU Glibc
Expand Down
2 changes: 2 additions & 0 deletions stdlib/private/StdlibUnittest/RaceTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ internal import WASILibc
#elseif os(Windows)
internal import CRT
internal import WinSDK
#elseif canImport(FreeBSD)
internal import FreeBSD
#endif

#if _runtime(_ObjC)
Expand Down
2 changes: 2 additions & 0 deletions stdlib/private/StdlibUnittest/StdlibCoreExtras.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ internal import Android
internal import WASILibc
#elseif os(Windows)
internal import CRT
#elseif canImport(FreeBSD)
internal import FreeBSD
#endif

#if _runtime(_ObjC)
Expand Down
2 changes: 2 additions & 0 deletions stdlib/private/StdlibUnittest/StdlibUnittest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ internal import WASILibc
#elseif os(Windows)
internal import CRT
internal import WinSDK
#elseif os(FreeBSD)
internal import FreeBSD
#endif

#if _runtime(_ObjC)
Expand Down
2 changes: 1 addition & 1 deletion stdlib/private/SwiftPrivate/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ add_swift_target_library(swiftSwiftPrivate ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} I
SWIFT_MODULE_DEPENDS_ANDROID Android
SWIFT_MODULE_DEPENDS_LINUX Glibc
SWIFT_MODULE_DEPENDS_LINUX_STATIC Musl
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
SWIFT_MODULE_DEPENDS_FREEBSD FreeBSD
SWIFT_MODULE_DEPENDS_OPENBSD Glibc
SWIFT_MODULE_DEPENDS_CYGWIN Glibc
SWIFT_MODULE_DEPENDS_HAIKU Glibc
Expand Down
2 changes: 2 additions & 0 deletions stdlib/private/SwiftPrivate/IO.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ import Musl
import Android
#elseif canImport(WASILibc)
import WASILibc
#elseif canImport(FreeBSD)
import FreeBSD
#endif
let (platform_read, platform_write, platform_close) = (read, write, close)
#endif
Expand Down
2 changes: 1 addition & 1 deletion stdlib/private/SwiftPrivateLibcExtras/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ add_swift_target_library(swiftSwiftPrivateLibcExtras ${SWIFT_STDLIB_LIBRARY_BUIL
SWIFT_MODULE_DEPENDS_ANDROID Android
SWIFT_MODULE_DEPENDS_LINUX Glibc
SWIFT_MODULE_DEPENDS_LINUX_STATIC Musl
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
SWIFT_MODULE_DEPENDS_FREEBSD FreeBSD
SWIFT_MODULE_DEPENDS_OPENBSD Glibc
SWIFT_MODULE_DEPENDS_CYGWIN Glibc
SWIFT_MODULE_DEPENDS_HAIKU Glibc
Expand Down
2 changes: 2 additions & 0 deletions stdlib/private/SwiftPrivateLibcExtras/Subprocess.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ import WASILibc
#elseif os(Windows)
import CRT
import WinSDK
#elseif os(FreeBSD)
import FreeBSD
#endif

#if !os(WASI)
Expand Down
2 changes: 2 additions & 0 deletions stdlib/private/SwiftPrivateLibcExtras/SwiftPrivateLibcExtras.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import Android
import WASILibc
#elseif os(Windows)
import CRT
#elseif canImport(FreeBSD)
import FreeBSD
#endif

public func _stdlib_mkstemps(_ template: inout String, _ suffixlen: CInt) -> CInt {
Expand Down
2 changes: 1 addition & 1 deletion stdlib/private/SwiftPrivateThreadExtras/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ add_swift_target_library(swiftSwiftPrivateThreadExtras ${SWIFT_STDLIB_LIBRARY_BU
SWIFT_MODULE_DEPENDS_ANDROID Android
SWIFT_MODULE_DEPENDS_LINUX Glibc
SWIFT_MODULE_DEPENDS_LINUX_STATIC Musl
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
SWIFT_MODULE_DEPENDS_FREEBSD FreeBSD
SWIFT_MODULE_DEPENDS_OPENBSD Glibc
SWIFT_MODULE_DEPENDS_CYGWIN Glibc
SWIFT_MODULE_DEPENDS_HAIKU Glibc
Expand Down
2 changes: 2 additions & 0 deletions stdlib/private/SwiftPrivateThreadExtras/SwiftPrivateThreadExtras.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ import WASILibc
#elseif os(Windows)
import CRT
import WinSDK
#elseif canImport(FreeBSD)
import FreeBSD
#endif

/// An abstract base class to encapsulate the context necessary to invoke
Expand Down
2 changes: 2 additions & 0 deletions stdlib/private/SwiftPrivateThreadExtras/ThreadBarriers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import WASILibc
#elseif os(Windows)
import CRT
import WinSDK
#elseif canImport(FreeBSD)
import FreeBSD
#endif

//
Expand Down
2 changes: 1 addition & 1 deletion stdlib/private/SwiftReflectionTest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if (SWIFT_INCLUDE_TESTS AND SWIFT_BUILD_DYNAMIC_STDLIB)
SWIFT_MODULE_DEPENDS_ANDROID Android
SWIFT_MODULE_DEPENDS_LINUX Glibc
SWIFT_MODULE_DEPENDS_LINUX_STATIC Musl
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
SWIFT_MODULE_DEPENDS_FREEBSD FreeBSD
SWIFT_MODULE_DEPENDS_OPENBSD Glibc
SWIFT_MODULE_DEPENDS_WINDOWS CRT
INSTALL_IN_COMPONENT stdlib-experimental
Expand Down
2 changes: 2 additions & 0 deletions stdlib/private/SwiftReflectionTest/SwiftReflectionTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,8 @@ import Glibc
import Musl
#elseif canImport(Android)
import Android
#elseif canImport(FreeBSD)
import FreeBSD
#endif

let rtldDefault: UnsafeMutableRawPointer? = nil
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/Concurrency/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ add_swift_target_library(swift_Concurrency ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} I
SWIFT_MODULE_DEPENDS_ANDROID Android
SWIFT_MODULE_DEPENDS_LINUX Glibc
SWIFT_MODULE_DEPENDS_LINUX_STATIC Musl
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
SWIFT_MODULE_DEPENDS_FREEBSD FreeBSD
SWIFT_MODULE_DEPENDS_OPENBSD Glibc
SWIFT_MODULE_DEPENDS_CYGWIN Glibc
SWIFT_MODULE_DEPENDS_HAIKU Glibc
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/Differentiation/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ add_swift_target_library(swift_Differentiation ${SWIFT_STDLIB_LIBRARY_BUILD_TYPE
SWIFT_MODULE_DEPENDS_ANDROID Android
SWIFT_MODULE_DEPENDS_LINUX Glibc
SWIFT_MODULE_DEPENDS_LINUX_STATIC Musl
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
SWIFT_MODULE_DEPENDS_FREEBSD FreeBSD
SWIFT_MODULE_DEPENDS_OPENBSD Glibc
SWIFT_MODULE_DEPENDS_CYGWIN Glibc
SWIFT_MODULE_DEPENDS_HAIKU Glibc
Expand Down
4 changes: 3 additions & 1 deletion stdlib/public/Differentiation/TgmathDerivatives.swift.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,16 @@ import Swift
#endif
#elseif canImport(Musl)
import Musl
#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Cygwin) || os(Haiku)
#elseif os(Linux) || os(OpenBSD) || os(PS4) || os(Cygwin) || os(Haiku)
import Glibc
#elseif os(WASI)
import WASILibc
#elseif os(Windows)
import CRT
#elseif canImport(Android)
import Android
#elseif canImport(FreeBSD)
import FreeBSD
#else
#error("Unsupported platform")
#endif
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/Distributed/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ add_swift_target_library(swiftDistributed ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS
SWIFT_MODULE_DEPENDS_ANDROID Android
SWIFT_MODULE_DEPENDS_LINUX Glibc
SWIFT_MODULE_DEPENDS_LINUX_STATIC Musl
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
SWIFT_MODULE_DEPENDS_FREEBSD FreeBSD
SWIFT_MODULE_DEPENDS_OPENBSD Glibc
SWIFT_MODULE_DEPENDS_CYGWIN Glibc
SWIFT_MODULE_DEPENDS_HAIKU Glibc
Expand Down
2 changes: 2 additions & 0 deletions stdlib/public/Distributed/LocalTestingDistributedActorSystem.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import Musl
import Android
#elseif os(Windows)
import WinSDK
#elseif canImport(FreeBSD)
import FreeBSD
#endif

/// A `DistributedActorSystem` designed for local only testing.
Expand Down
Loading