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.

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

Don't override target passed on command-line with target from sysimg for processor_fallback #38883

Merged
merged 1 commit into from
Dec 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/codegen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7712,7 +7712,7 @@ extern "C" void jl_init_llvm(void)
std::unique_ptr<MCSubtargetInfo> MSTI(
TheTarget->createMCSubtargetInfo(TheTriple.str(), "", ""));
if (!MSTI->isCPUStringValid(TheCPU))
jl_errorf("Invalid CPU name %s.", TheCPU.c_str());
jl_errorf("Invalid CPU name \"%s\".", TheCPU.c_str());
if (jl_processor_print_help) {
// This is the only way I can find to print the help message once.
// It'll be nice if we can iterate through the features and print our own help
Expand Down
1 change: 0 additions & 1 deletion src/processor_fallback.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ static uint32_t sysimg_init_cb(const void *id)
best_idx = i;
}
}
target = sysimg[best_idx];
jit_targets.push_back(std::move(target));
return best_idx;
}
Expand Down