Skip to content

Fix support for building with --static-swift-stdlib for armv7 #194

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

Merged
merged 3 commits into from
Mar 3, 2025
Merged

Fix support for building with --static-swift-stdlib for armv7 #194

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9094785
Add latomic for armv7 toolset.json file
xtremekforever Mar 2, 2025
49f9a66
Add test case to verify tool options for armv7
xtremekforever Mar 2, 2025
6a224fd
Use arch.is32Bit to determine if latomic should be added to toolset.json
xtremekforever Mar 3, 2025
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
5 changes: 5 additions & 0 deletions Sources/SwiftSDKGenerator/SwiftSDKRecipes/LinuxRecipe.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,11 @@ public struct LinuxRecipe: SwiftSDKRecipe {
} else {
swiftCompilerOptions.append("-use-ld=lld")

// 32-bit architectures require libatomic
if targetTriple.archName == "armv7" {
swiftCompilerOptions.append("-latomic")
}

if self.hostSwiftSource != .preinstalled {
toolset.linker = Toolset.ToolProperties(path: "ld.lld")
}
Expand Down
14 changes: 13 additions & 1 deletion Tests/SwiftSDKGeneratorTests/SwiftSDKRecipes/LinuxRecipeTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ final class LinuxRecipeTests: XCTestCase {
let testCases = [
(
swiftVersion: "5.9.2",
targetTriple: Triple("x86_64-unknown-linux-gnu"),
expectedSwiftCompilerOptions: [
"-Xlinker", "-R/usr/lib/swift/linux/",
"-Xclang-linker", "--ld-path=ld.lld"
Expand All @@ -53,19 +54,30 @@ final class LinuxRecipeTests: XCTestCase {
),
(
swiftVersion: "6.0.2",
targetTriple: Triple("aarch64-unknown-linux-gnu"),
expectedSwiftCompilerOptions: [
"-Xlinker", "-R/usr/lib/swift/linux/",
"-use-ld=lld"
],
expectedLinkerPath: "ld.lld"
),
(
swiftVersion: "6.0.3",
targetTriple: Triple("armv7-unknown-linux-gnueabihf"),
expectedSwiftCompilerOptions: [
"-Xlinker", "-R/usr/lib/swift/linux/",
"-use-ld=lld",
"-latomic"
],
expectedLinkerPath: "ld.lld"
)
]

for testCase in testCases {
let recipe = try self.createRecipe(swiftVersion: testCase.swiftVersion)
var toolset = Toolset(rootPath: nil)
recipe.applyPlatformOptions(
toolset: &toolset, targetTriple: Triple("aarch64-unknown-linux-gnu")
toolset: &toolset, targetTriple: testCase.targetTriple
)
XCTAssertEqual(toolset.swiftCompiler?.extraCLIOptions, testCase.expectedSwiftCompilerOptions)
XCTAssertEqual(toolset.linker?.path, testCase.expectedLinkerPath)
Expand Down