Skip to content

Commit 3ad76f6

Browse files
committed
[LDC] LLD: Avoid parsing -mllvm* command-line options if there aren't any
When invoking the integrated LLD from LDC, it somehow uses a different global LLVM command-line parser, one with no registered options, so parsing is guaranteed to fail, even if there are no args. [It's only needed for LTO codegen options anyway.]
1 parent 176249b commit 3ad76f6

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

lld/COFF/Driver.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1134,7 +1134,8 @@ void LinkerDriver::link(ArrayRef<const char *> argsArr) {
11341134
v.push_back("lld-link (LLVM option parsing)");
11351135
for (auto *arg : args.filtered(OPT_mllvm))
11361136
v.push_back(arg->getValue());
1137-
cl::ParseCommandLineOptions(v.size(), v.data());
1137+
if (v.size() > 1)
1138+
cl::ParseCommandLineOptions(v.size(), v.data());
11381139

11391140
// Handle /errorlimit early, because error() depends on it.
11401141
if (auto *arg = args.getLastArg(OPT_errorlimit)) {

lld/wasm/Driver.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,8 @@ void LinkerDriver::link(ArrayRef<const char *> argsArr) {
771771
v.push_back("wasm-ld (LLVM option parsing)");
772772
for (auto *arg : args.filtered(OPT_mllvm))
773773
v.push_back(arg->getValue());
774-
cl::ParseCommandLineOptions(v.size(), v.data());
774+
if (v.size() > 1)
775+
cl::ParseCommandLineOptions(v.size(), v.data());
775776

776777
errorHandler().errorLimit = args::getInteger(args, OPT_error_limit, 20);
777778

0 commit comments

Comments
 (0)