Skip to content

Rollback part of pr 104137 that broke wasm linker overriding #108996

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 4 commits into from
Mar 29, 2023
Merged

Rollback part of pr 104137 that broke wasm linker overriding #108996

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e919f0f
the fix
pnkfelix Mar 10, 2023
568b722
Test using pattern established in run-make/wasm-stringify-ints-small.
pnkfelix Mar 10, 2023
cda130f
Delete Makefile
pnkfelix Mar 29, 2023
167623a
Delete foo.rs
pnkfelix Mar 29, 2023
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: 8 additions & 0 deletions compiler/rustc_target/src/spec/wasm_base.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use super::crt_objects::LinkSelfContainedDefault;
use super::{cvs, Cc, LinkerFlavor, PanicStrategy, RelocModel, TargetOptions, TlsModel};

pub fn options() -> TargetOptions {
Expand Down Expand Up @@ -94,6 +95,13 @@ pub fn options() -> TargetOptions {

pre_link_args,

// FIXME: Figure out cases in which WASM needs to link with a native toolchain.
//
// rust-lang/rust#104137: cannot blindly remove this without putting in
// some other way to compensate for lack of `-nostartfiles` in linker
// invocation.
link_self_contained: LinkSelfContainedDefault::True,

// This has no effect in LLVM 8 or prior, but in LLVM 9 and later when
// PIC code is implemented this has quite a drastic effect if it stays
// at the default, `pic`. In an effort to keep wasm binaries as minimal
Expand Down