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

[clang][WebAssembly] Link crt2-command.o if available #104755

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −1
Open

[clang][WebAssembly] Link crt2-command.o if available #104755

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
11 changes: 10 additions & 1 deletion clang/lib/Driver/ToolChains/WebAssembly.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ void wasm::Linker::ConstructJob(Compilation &C, const JobAction &JA,

bool IsCommand = true;
const char *Crt1;
const char *Crt2 = nullptr;
const char *Entry = nullptr;

// When -shared is specified, use the reactor exec model unless
Expand Down Expand Up @@ -132,13 +133,21 @@ void wasm::Linker::ConstructJob(Compilation &C, const JobAction &JA,
Crt1 = "crt1.o";
if (ToolChain.GetFilePath("crt1-command.o") != "crt1-command.o")
Crt1 = "crt1-command.o";
// Link another object as well if it's provided. It's planned to
// be used to fix https://github.com/WebAssembly/wasi-libc/issues/485
if (ToolChain.GetFilePath("crt2-command.o") != "crt2-command.o") {
Crt2 = "crt2-command.o";
}
} else {
Crt1 = "crt1-reactor.o";
Entry = "_initialize";
}

if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles))
if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles)) {
CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(Crt1)));
if (Crt2)
CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(Crt2)));
}
if (Entry) {
CmdArgs.push_back(Args.MakeArgString("--entry"));
CmdArgs.push_back(Args.MakeArgString(Entry));
Expand Down
Loading