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

Jump to bottom

Don't link with --export-dynamic on wasm32-wasi #81255

Merged
merged 1 commit into from
Feb 1, 2021
Merged

Don't link with --export-dynamic on wasm32-wasi #81255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 0 additions & 9 deletions compiler/rustc_target/src/spec/wasm32_base.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,6 @@ pub fn options() -> TargetOptions {
// to do so.
arg("--no-demangle");

// The symbol visibility story is a bit in flux right now with LLD.
// It's... not entirely clear to me what's going on, but this looks to
// make everything work when `export_symbols` isn't otherwise called for
// things like executables.
//
// This is really only here to get things working. If it can be removed and
// basic tests still work, then sounds like it should be removed!
arg("--export-dynamic");

let mut pre_link_args = BTreeMap::new();
pre_link_args.insert(LinkerFlavor::Lld(LldFlavor::Wasm), lld_args);
pre_link_args.insert(LinkerFlavor::Gcc, clang_args);
Expand Down
13 changes: 12 additions & 1 deletion compiler/rustc_target/src/spec/wasm32_unknown_emscripten.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@ use super::wasm32_base;
use super::{LinkArgs, LinkerFlavor, PanicStrategy, Target, TargetOptions};

pub fn target() -> Target {
let mut options = wasm32_base::options();

let clang_args = options.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap();

// Rust really needs a way for users to specify exports and imports in
// the source code. --export-dynamic isn't the right tool for this job,
// however it does have the side effect of automatically exporting a lot
// of symbols, which approximates what people want when compiling for
// wasm32-unknown-unknown expect, so use it for now.
clang_args.push("--export-dynamic".to_string());

let mut post_link_args = LinkArgs::new();
post_link_args.insert(
LinkerFlavor::Em,
Expand All @@ -28,7 +39,7 @@ pub fn target() -> Target {
panic_strategy: PanicStrategy::Unwind,
post_link_args,
os_family: Some("unix".to_string()),
..wasm32_base::options()
..options
};
Target {
llvm_target: "wasm32-unknown-emscripten".to_string(),
Expand Down
17 changes: 12 additions & 5 deletions compiler/rustc_target/src/spec/wasm32_unknown_unknown.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,18 @@ pub fn target() -> Target {
// For now this target just never has an entry symbol no matter the output
// type, so unconditionally pass this.
clang_args.push("-Wl,--no-entry".to_string());
options
.pre_link_args
.get_mut(&LinkerFlavor::Lld(LldFlavor::Wasm))
.unwrap()
.push("--no-entry".to_string());

// Rust really needs a way for users to specify exports and imports in
// the source code. --export-dynamic isn't the right tool for this job,
// however it does have the side effect of automatically exporting a lot
// of symbols, which approximates what people want when compiling for
// wasm32-unknown-unknown expect, so use it for now.
clang_args.push("-Wl,--export-dynamic".to_string());

// Add the flags to wasm-ld's args too.
let lld_args = options.pre_link_args.get_mut(&LinkerFlavor::Lld(LldFlavor::Wasm)).unwrap();
lld_args.push("--no-entry".to_string());
lld_args.push("--export-dynamic".to_string());

Target {
llvm_target: "wasm32-unknown-unknown".to_string(),
Expand Down