CC support for wasm32-wali-linux-musl Tier-3 Linux target
#1373
Conversation
arjunr2
changed the title
wasm32-wali-linux-musl Tier-3 Linux target
| @@ -1363,6 +1363,12 @@ impl Build { | |||
| target | |||
| )); | |||
| } | |||
| } else if target.contains("wasm32") && target.contains("linux") { | |||
There was a problem hiding this comment.
Would it be better to do an exact match?
| } else if target.contains("wasm32") && target.contains("linux") { | |
| } else if target == "wasm32-wali-linux-musl" { |
There was a problem hiding this comment.
I'd prefer to avoid .contains, and use target.arch == "wasm32" && target.os == "linux" (or similar)
| @@ -2178,6 +2184,25 @@ impl Build { | |||
| } | |||
|
|
|||
| cmd.push_cc_arg(format!("--target={}", target).into()); | |||
| } else if target.contains("wasm32") && target.contains("linux") { | |||
| // wasm32-linux currently uses the LLVM-18 wasi threads target | ||
| cmd.push_cc_arg("--target=wasm32-wasi-threads".into()); | ||
| for x in &[ | ||
| "atomics", | ||
| "bulk-memory", | ||
| "mutable-globals", | ||
| "sign-ext", | ||
| "exception-handling", | ||
| ] { | ||
| cmd.push_cc_arg(format!("-m{}", x).into()); | ||
| } | ||
| for x in &["wasm-exceptions", "declspec"] { | ||
| cmd.push_cc_arg(format!("-f{}", x).into()); | ||
| } | ||
| let musl_sysroot = self.wasm_musl_sysroot().unwrap(); | ||
| cmd.push_cc_arg( | ||
| format!("--sysroot={}", Path::new(&musl_sysroot).display()).into(), | ||
| ); |
There was a problem hiding this comment.
cc @madsmtm do you think we can use gen-target-info to auto generate this information?
There was a problem hiding this comment.
Hmm, the EDIT: Wrote this in other review comments.--target at least definitely looks odd?
But yeah, we should definitely look into taking atomics/buld-memory/... from rustc's target data instead of hardcoding it here.
|
Having these conditions rely on just |
|
I'd also really rather prefer not using the full target if we can. |
| @@ -2178,6 +2184,25 @@ impl Build { | |||
| } | |||
|
|
|||
| cmd.push_cc_arg(format!("--target={}", target).into()); | |||
| } else if target.contains("wasm32") && target.contains("linux") { | |||
| // wasm32-linux currently uses the LLVM-18 wasi threads target | |||
| cmd.push_cc_arg("--target=wasm32-wasi-threads".into()); | |||
There was a problem hiding this comment.
The use of --target seems odd? It is not clear why we are passing a different target here than the llvm_target in rustc's Target, which is set to wasm32-wasi?
There was a problem hiding this comment.
This configuration is similar to wasm32-wasip1-threads, which uses the wasm32-wasi llvm target. I am not sure using llvm_target as wasm32-wasi-threads breaks any pattern matching within rustc, so I stuck to what the former currently does.
To support the new Tier-3 target
wasm32-wali-linux-muslwithin the rust compiler: rust-lang/rust#135651Minimally, this just supports providing appropriate musl library linking and flags for the target