wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert r324322 "[ELF] - Use InitTargetOptionsFromCodeGenFlags/ParseCommandLineOptions for parsing LTO options." 

It broke BB:
http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux/builds/8162

llvm-svn: 324332
This commit is contained in:
George Rimar 2018-02-06 10:31:01 +00:00
parent 6805004cb1
commit bc08aa7d97
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lld/ELF/Driver.cpp
View File

@ -42,7 +42,6 @@
#include "lld/Common/Driver.h" #include "lld/Common/Driver.h"
#include "lld/Common/ErrorHandler.h" #include "lld/Common/ErrorHandler.h"
#include "lld/Common/Memory.h" #include "lld/Common/Memory.h"
#include "lld/Common/TargetOptionsCommandFlags.h"
#include "lld/Common/Threads.h" #include "lld/Common/Threads.h"
#include "lld/Common/Version.h" #include "lld/Common/Version.h"
#include "llvm/ADT/StringExtras.h" #include "llvm/ADT/StringExtras.h"
@ -253,11 +252,18 @@ void LinkerDriver::addLibrary(StringRef Name) {
// LTO calls LLVM functions to compile bitcode files to native code. // LTO calls LLVM functions to compile bitcode files to native code.
// Technically this can be delayed until we read bitcode files, but // Technically this can be delayed until we read bitcode files, but
// we don't bother to do lazily because the initialization is fast. // we don't bother to do lazily because the initialization is fast.
static void initLLVM() { static void initLLVM(opt::InputArgList &Args) {
InitializeAllTargets(); InitializeAllTargets();
InitializeAllTargetMCs(); InitializeAllTargetMCs();
InitializeAllAsmPrinters(); InitializeAllAsmPrinters();
InitializeAllAsmParsers(); InitializeAllAsmParsers();
// Parse and evaluate -mllvm options.
std::vector<const char *> V;
V.push_back("lld (LLVM option parsing)");
for (auto *Arg : Args.filtered(OPT_mllvm))
V.push_back(Arg->getValue());
cl::ParseCommandLineOptions(V.size(), V.data());
} }
// Some command line options or some combinations of them are not allowed. // Some command line options or some combinations of them are not allowed.
@ -366,7 +372,7 @@ void LinkerDriver::main(ArrayRef<const char *> ArgsArr, bool CanExitEarly) {
} }
readConfigs(Args); readConfigs(Args);
initLLVM(); initLLVM(Args);
createFiles(Args); createFiles(Args);
inferMachineType(); inferMachineType();
setConfigs(Args); setConfigs(Args);
@ -690,7 +696,6 @@ void LinkerDriver::readConfigs(opt::InputArgList &Args) {
Config->ZWxneeded = hasZOption(Args, "wxneeded"); Config->ZWxneeded = hasZOption(Args, "wxneeded");
// Parse LTO plugin-related options for compatibility with gold. // Parse LTO plugin-related options for compatibility with gold.
std::vector<const char *> LTOOptions({Config->Argv[0].data()});
for (auto *Arg : Args.filtered(OPT_plugin_opt)) { for (auto *Arg : Args.filtered(OPT_plugin_opt)) {
StringRef S = Arg->getValue(); StringRef S = Arg->getValue();
if (S == "disable-verify") if (S == "disable-verify")
@ -704,13 +709,11 @@ void LinkerDriver::readConfigs(opt::InputArgList &Args) {
else if (S.startswith("jobs=")) else if (S.startswith("jobs="))
Config->ThinLTOJobs = parseInt(S.substr(5), Arg); Config->ThinLTOJobs = parseInt(S.substr(5), Arg);
else if (!S.startswith("/") && !S.startswith("-fresolution=") && else if (!S.startswith("/") && !S.startswith("-fresolution=") &&
!S.startswith("-pass-through=")) !S.startswith("-pass-through=") && !S.startswith("mcpu=") &&
LTOOptions.push_back(S.data()); !S.startswith("thinlto") && S != "-function-sections" &&
S != "-data-sections")
error(Arg->getSpelling() + ": unknown option: " + S);
} }
// Parse and evaluate -mllvm options.
for (auto *Arg : Args.filtered(OPT_mllvm))
LTOOptions.push_back(Arg->getValue());
cl::ParseCommandLineOptions(LTOOptions.size(), LTOOptions.data());
if (Config->LTOO > 3) if (Config->LTOO > 3)
error("invalid optimization level for LTO: " + Twine(Config->LTOO)); error("invalid optimization level for LTO: " + Twine(Config->LTOO));

8
lld/test/ELF/lto-plugin-ignore.s
View File

@ -5,7 +5,7 @@
# RUN: -plugin-opt=-pass-through=-lgcc -plugin-opt=-function-sections \ # RUN: -plugin-opt=-pass-through=-lgcc -plugin-opt=-function-sections \
# RUN: -plugin-opt=-data-sections -o /dev/null # RUN: -plugin-opt=-data-sections -o /dev/null
# RUN: not ld.lld %t -plugin-opt=-data-sectionxxx \ # RUN: not ld.lld %t -plugin-opt=-data-sectionssss \
# RUN: -plugin-opt=-function-sectionxxx 2>&1 | FileCheck %s # RUN: -plugin-opt=-function-sectionsss 2>&1 | FileCheck %s
# CHECK: Unknown command line argument '-data-sectionxxx' # CHECK: unknown option: -data-sectionsss
# CHECK: Unknown command line argument '-function-sectionxxx' # CHECK: unknown option: -function-sectionsss