This is an archive of the discontinued LLVM Phabricator instance.

Differential D41923

[WebAssembly] Remove `-allow-undefined-file wasm.syms` from linker args
ClosedPublic

Authored by sbc100 on Jan 10 2018, 3:34 PM.

Details

Reviewers
dschuff
Commits
rG9bbca8c24070: [WebAssembly] Remove `-allow-undefined-file wasm.syms` from linker args
rC322321: [WebAssembly] Remove `-allow-undefined-file wasm.syms` from linker args
rL322321: [WebAssembly] Remove `-allow-undefined-file wasm.syms` from linker args
Summary

See: https://github.com/WebAssembly/tool-conventions/issues/35

Diff Detail

Repository
rL LLVM

Event Timeline

sbc100 created this revision.Jan 10 2018, 3:34 PM
Herald added subscribers: cfe-commits, sunfish, aheejin and 3 others. · View Herald TranscriptJan 10 2018, 3:34 PM
sbc100 updated this revision to Diff 129352.Jan 10 2018, 3:35 PM

update tests

dschuff accepted this revision.Jan 10 2018, 4:30 PM

The code LGTM. If there are objections to the scheme overall they can go in tool-conventions.

This revision is now accepted and ready to land.Jan 10 2018, 4:30 PM
Closed by commit rL322321: [WebAssembly] Remove `-allow-undefined-file wasm.syms` from linker args (authored by sbc). · Explain WhyJan 11 2018, 2:35 PM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: llvm-commits. · View Herald TranscriptJan 11 2018, 2:35 PM

Revision Contents

PathSize
cfe/
trunk/
lib/
Driver/
ToolChains/
2 lines
test/
Driver/
4 lines

Diff 129530

cfe/trunk/lib/Driver/ToolChains/WebAssembly.cpp

Show First 20 Lines • Show All 56 Lines • ▼ Show 20 Linesvoid wasm::Linker::ConstructJob(Compilation &C, const JobAction &JA,
if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) { if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
if (ToolChain.ShouldLinkCXXStdlib(Args)) if (ToolChain.ShouldLinkCXXStdlib(Args))
ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs); ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs);
if (Args.hasArg(options::OPT_pthread)) if (Args.hasArg(options::OPT_pthread))
CmdArgs.push_back("-lpthread"); CmdArgs.push_back("-lpthread");
CmdArgs.push_back("-allow-undefined-file");
CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("wasm.syms")));
CmdArgs.push_back("-lc"); CmdArgs.push_back("-lc");
AddRunTimeLibs(ToolChain, ToolChain.getDriver(), CmdArgs, Args); AddRunTimeLibs(ToolChain, ToolChain.getDriver(), CmdArgs, Args);
} }
CmdArgs.push_back("-o"); CmdArgs.push_back("-o");
CmdArgs.push_back(Output.getFilename()); CmdArgs.push_back(Output.getFilename());
C.addCommand(llvm::make_unique<Command>(JA, *this, Linker, CmdArgs, Inputs)); C.addCommand(llvm::make_unique<Command>(JA, *this, Linker, CmdArgs, Inputs));
▲ Show 20 Lines • Show All 75 Lines • Show Last 20 Lines

cfe/trunk/test/Driver/wasm-toolchain.c

Show All 21 Lines
// RUN: %clang %s -### -target wasm32-unknown-unknown -fvisibility=default 2>&1 | FileCheck -check-prefix=FVISIBILITY_DEFAULT %s // RUN: %clang %s -### -target wasm32-unknown-unknown -fvisibility=default 2>&1 | FileCheck -check-prefix=FVISIBILITY_DEFAULT %s
// FVISIBILITY_DEFAULT-NOT: hidden // FVISIBILITY_DEFAULT-NOT: hidden
// A basic C link command-line. // A basic C link command-line.
// RUN: %clang -### -no-canonical-prefixes -target wasm32-unknown-unknown --sysroot=/foo %s 2>&1 | FileCheck -check-prefix=LINK %s // RUN: %clang -### -no-canonical-prefixes -target wasm32-unknown-unknown --sysroot=/foo %s 2>&1 | FileCheck -check-prefix=LINK %s
// LINK: clang{{.*}}" "-cc1" {{.*}} "-o" "[[temp:[^"]*]]" // LINK: clang{{.*}}" "-cc1" {{.*}} "-o" "[[temp:[^"]*]]"
// LINK: lld{{.*}}" "-flavor" "wasm" "-L/foo/lib" "crt1.o" "[[temp]]" "-allow-undefined-file" "wasm.syms" "-lc" "{{.*[/\\]}}libclang_rt.builtins-wasm32.a" "-o" "a.out" // LINK: lld{{.*}}" "-flavor" "wasm" "-L/foo/lib" "crt1.o" "[[temp]]" "-lc" "{{.*[/\\]}}libclang_rt.builtins-wasm32.a" "-o" "a.out"
// A basic C link command-line with optimization. // A basic C link command-line with optimization.
// RUN: %clang -### -O2 -no-canonical-prefixes -target wasm32-unknown-unknown --sysroot=/foo %s 2>&1 | FileCheck -check-prefix=LINK_OPT %s // RUN: %clang -### -O2 -no-canonical-prefixes -target wasm32-unknown-unknown --sysroot=/foo %s 2>&1 | FileCheck -check-prefix=LINK_OPT %s
// LINK_OPT: clang{{.*}}" "-cc1" {{.*}} "-o" "[[temp:[^"]*]]" // LINK_OPT: clang{{.*}}" "-cc1" {{.*}} "-o" "[[temp:[^"]*]]"
// LINK_OPT: lld{{.*}}" "-flavor" "wasm" "-L/foo/lib" "crt1.o" "[[temp]]" "-allow-undefined-file" "wasm.syms" "-lc" "{{.*[/\\]}}libclang_rt.builtins-wasm32.a" "-o" "a.out" // LINK_OPT: lld{{.*}}" "-flavor" "wasm" "-L/foo/lib" "crt1.o" "[[temp]]" "-lc" "{{.*[/\\]}}libclang_rt.builtins-wasm32.a" "-o" "a.out"