Skip to content
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

rustc: Some small changes for the wasm32-wasip2 target #124858

Merged
merged 3 commits into from
May 8, 2024
Merged

rustc: Some small changes for the wasm32-wasip2 target #124858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a77108
rustc: Change LLVM target for the wasm32-wasip2 Rust target
alexcrichton May 3, 2024
400e754
rustc: Don't pass `-fuse-ld=lld` on wasm targets
alexcrichton May 4, 2024
38b2bd7
rustc: Change wasm32-wasip2 to PIC-by-default
alexcrichton May 7, 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
8 changes: 7 additions & 1 deletion compiler/rustc_codegen_ssa/src/back/link.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3127,7 +3127,13 @@ fn add_lld_args(

// 2. Implement the "linker flavor" part of this feature by asking `cc` to use some kind of
// `lld` as the linker.
cmd.arg("-fuse-ld=lld");
//
// Note that wasm targets skip this step since the only option there anyway
// is to use LLD but the `wasm32-wasip2` target relies on a wrapper around
// this, `wasm-component-ld`, which is overridden if this option is passed.
if !sess.target.is_like_wasm {
cmd.arg("-fuse-ld=lld");
}

if !flavor.is_gnu() {
// Tell clang to use a non-default LLD flavor.
Expand Down
9 changes: 7 additions & 2 deletions compiler/rustc_target/src/spec/targets/wasm32_wasip2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

use crate::spec::crt_objects;
use crate::spec::LinkSelfContainedDefault;
use crate::spec::{base, Target};
use crate::spec::{base, RelocModel, Target};

pub fn target() -> Target {
let mut options = base::wasm::options();
Expand Down Expand Up @@ -54,8 +54,13 @@ pub fn target() -> Target {
// signatures.
options.entry_name = "__main_void".into();

// Default to PIC unlike base wasm. This makes precompiled objects such as
// the standard library more suitable to be used with shared libaries a la
// emscripten's dynamic linking convention.
options.relocation_model = RelocModel::Pic;

Target {
llvm_target: "wasm32-unknown-unknown".into(),
llvm_target: "wasm32-wasip2".into(),
metadata: crate::spec::TargetMetadata {
description: None,
tier: None,
Expand Down
Loading