From 9ad9c967556cdb7adb7c61dad694aa67c94e84bc Mon Sep 17 00:00:00 2001 From: Tom Roeder Date: Thu, 26 Jun 2014 20:43:27 +0000 Subject: 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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@211804 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/gold/gold-plugin.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'tools') diff --git a/tools/gold/gold-plugin.cpp b/tools/gold/gold-plugin.cpp index 3c2da94af5..c3ae5a6c30 100644 --- a/tools/gold/gold-plugin.cpp +++ b/tools/gold/gold-plugin.cpp @@ -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); -- cgit v1.2.3