Skip to content

Embedded: don't link swiftrt.o for bare metal #1533

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 1 commit into from
Jan 29, 2024
Merged

Embedded: don't link swiftrt.o for bare metal #1533

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: 1 addition & 1 deletion Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ extension GenericUnixToolchain {
}
}

if !parsedOptions.hasArgument(.nostartfiles) {
if !isEmbeddedEnabled && !parsedOptions.hasArgument(.nostartfiles) {
let swiftrtPath = VirtualPath.lookup(targetInfo.runtimeResourcePath.path)
.appending(
components: targetTriple.platformName() ?? "",
Expand Down
18 changes: 17 additions & 1 deletion Tests/SwiftDriverTests/SwiftDriverTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6549,10 +6549,12 @@ final class SwiftDriverTests: XCTestCase {
let invalidPath = try VirtualPath(path: "/Tools/swift.xctoolchain/usr/lib/swift")
let invalid = linkJob.commandLine.contains(.responseFilePath(invalidPath))
XCTAssertFalse(invalid) // ensure the driver does not emit invalid responseFilePaths to the clang invocation
XCTAssertFalse(linkJob.commandLine.joinedUnresolvedArguments.contains("swiftrt.o"))
}

// Embedded Wasm compile job
do {
var driver = try Driver(args: ["swiftc", "-target", "wasm32-none-none-wasm", "test.swift", "-enable-experimental-feature", "Embedded", "-wmo", "-o", "a.wasm"], env: env)
var driver = try Driver(args: ["swiftc", "-target", "wasm32-none-none-wasm", "test.swift", "-enable-experimental-feature", "Embedded", "-wmo", "-o", "a.wasm"], env: env)
let plannedJobs = try driver.planBuild()
XCTAssertEqual(plannedJobs.count, 3)
let compileJob = plannedJobs[0]
Expand All @@ -6563,6 +6565,20 @@ final class SwiftDriverTests: XCTestCase {
XCTAssertFalse(linkJob.commandLine.contains(.flag("-rpath")))
XCTAssertFalse(linkJob.commandLine.contains(.flag("-lswiftCore")))
}

// Embedded Wasm link job
do {
var driver = try Driver(args: ["swiftc", "-target", "wasm32-none-none-wasm", "test.o", "-enable-experimental-feature", "Embedded", "-wmo", "-o", "a.wasm"], env: env)
let plannedJobs = try driver.planBuild()
XCTAssertEqual(plannedJobs.count, 2)
let _ /*autolinkJob*/ = plannedJobs[0]
let linkJob = plannedJobs[1]
XCTAssertFalse(linkJob.commandLine.contains(.flag("-force_load")))
XCTAssertFalse(linkJob.commandLine.contains(.flag("-rpath")))
XCTAssertFalse(linkJob.commandLine.contains(.flag("-lswiftCore")))
XCTAssertFalse(linkJob.commandLine.joinedUnresolvedArguments.contains("swiftrt.o"))
}

do {
let diags = DiagnosticsEngine()
var driver = try Driver(args: ["swiftc", "-target", "arm64-apple-macosx10.13", "test.swift", "-enable-experimental-feature", "Embedded", "-parse-as-library", "-wmo", "-o", "a.out", "-module-name", "main", "-enable-library-evolution"], diagnosticsEngine: diags)
Expand Down