Skip to content

[test] Pass wasi-sysroot to the %target-clang #72945

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 2 commits into from
Apr 10, 2024
Merged

[test] Pass wasi-sysroot to the %target-clang #72945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
670c731
[test] Pass wasi-sysroot to the `%target-clang`
kateinoigakukun Apr 10, 2024
37f29f3
[test] Fix IRGen/sensitive.swift test for 32-bit platforms
kateinoigakukun Apr 10, 2024
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
12 changes: 6 additions & 6 deletions test/IRGen/sensitive.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,17 +98,17 @@ protocol P {}

@sensitive
struct SensitiveStruct {
var a = 0xdeadbeaf
var b = 0xdeadbeaf
var c = 0xdeadbeaf
var a: UInt32 = 0xdeadbeaf
var b: UInt32 = 0xdeadbeaf
var c: UInt32 = 0xdeadbeaf
}

// A struct which would be address-only also without @sensitive
@sensitive
struct NonLoadableSensitiveStruct {
var a = 0xdeadbeaf
var b = 0xdeadbeaf
var c = 0xdeadbeaf
var a: UInt32 = 0xdeadbeaf
var b: UInt32 = 0xdeadbeaf
var c: UInt32 = 0xdeadbeaf
let p: P
}

Expand Down
4 changes: 2 additions & 2 deletions test/lit.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1939,8 +1939,8 @@ elif run_os == 'wasi':
'%s -emit-pcm -target %s' %
(config.swiftc, config.variant_triple))
config.target_clang = (
"%s -target %s %s -fobjc-runtime=ios-5.0" %
(config.clang, config.variant_triple, clang_mcp_opt))
"%s -target %s %s -fobjc-runtime=ios-5.0 --sysroot %s" %
(config.clang, config.variant_triple, clang_mcp_opt, config.variant_sdk))
config.target_ld = (
"%s -L%r" %
(config.wasm_ld, make_path(test_resource_dir, config.target_sdk_name)))
Expand Down