Skip to content

Commit 22807ff

Browse files
authored
Merge pull request #2027 from swiftlang/maxd/wasm-stack-size
Wasm: fix stack size flag (no double dash, add `-z`)
2 parents 778208a + 8f2621c commit 22807ff

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Sources/SwiftDriver/Jobs/WebAssemblyToolchain+LinkerSupport.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,9 @@ extension WebAssemblyToolchain {
170170
// workflows like Swift Testing can run within this limited stack space.
171171
let SWIFT_WASM_DEFAULT_STACK_SIZE = 1024 * 128
172172
commandLine.appendFlag(.Xlinker)
173-
commandLine.appendFlag("--stack-size=\(SWIFT_WASM_DEFAULT_STACK_SIZE)")
173+
commandLine.appendFlag("-z")
174+
commandLine.appendFlag(.Xlinker)
175+
commandLine.appendFlag("stack-size=\(SWIFT_WASM_DEFAULT_STACK_SIZE)")
174176

175177
// Delegate to Clang for sanitizers. It will figure out the correct linker
176178
// options.

Tests/SwiftDriverTests/SwiftDriverTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2766,7 +2766,7 @@ final class SwiftDriverTests: XCTestCase {
27662766
XCTAssertTrue(cmd.contains(.responseFilePath(.absolute(path.appending(components: "wasi", "static-executable-args.lnk")))))
27672767
XCTAssertTrue(cmd.contains(subsequence: [.flag("-Xlinker"), .flag("--global-base=4096")]))
27682768
XCTAssertTrue(cmd.contains(subsequence: [.flag("-Xlinker"), .flag("--table-base=4096")]))
2769-
XCTAssertTrue(cmd.contains(subsequence: [.flag("-Xlinker"), .flag("--stack-size=\(128 * 1024)")]))
2769+
XCTAssertTrue(cmd.contains(subsequence: [.flag("-Xlinker"), .flag("-z"), .flag("-Xlinker"), .flag("stack-size=\(128 * 1024)")]))
27702770
XCTAssertTrue(cmd.contains(.flag("-O3")))
27712771
XCTAssertEqual(linkJob.outputs[0].file, try toPath("Test"))
27722772

0 commit comments

Comments
 (0)