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

Fix the new LTOCodeGenerator setup in gold to parse options before using MAttrs. 

This fixes a regression that made clang -flto -Wl,--plugin-opt=-mattr=+aes not
pass the "+aes" option to the LTOCodeGenerator attributes.

llvm-svn: 211804
This commit is contained in:
Tom Roeder 2014-06-26 20:43:27 +00:00
parent 1530adffdd
commit b508119fb6
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
llvm/tools/gold/gold-plugin.cpp
View File

@ -234,15 +234,6 @@ ld_plugin_status onload(ld_plugin_tv *tv) {
InitializeAllAsmParsers();
InitializeAllAsmPrinters();
CodeGen = new LTOCodeGenerator();
if (MAttrs.size()) {
std::string Attrs;
for (unsigned I = 0; I < MAttrs.size(); ++I) {
if (I > 0)
Attrs.append(",");
Attrs.append(MAttrs[I]);
}
CodeGen->setAttr(Attrs.c_str());
}
// Pass through extra options to the code generator.
if (!options::extra.empty()) {
@ -253,6 +244,16 @@ ld_plugin_status onload(ld_plugin_tv *tv) {
}
CodeGen->parseCodeGenDebugOptions();
if (MAttrs.size()) {
std::string Attrs;
for (unsigned I = 0; I < MAttrs.size(); ++I) {
if (I > 0)
Attrs.append(",");
Attrs.append(MAttrs[I]);
}
CodeGen->setAttr(Attrs.c_str());
}
TargetOpts = InitTargetOptionsFromCodeGenFlags();
CodeGen->setTargetOptions(TargetOpts);