[llvm] 8d019cd - Fix ac1d23ed7de01fb3 interaction with gold plugin

[via llvm-commits]

Author: serge-sans-paille
Date: 2020-03-18T11:44:17+01:00
New Revision: 8d019cda851a1031fbce3c50be0975438147f11d

URL: https://github.com/llvm/llvm-project/commit/8d019cda851a1031fbce3c50be0975438147f11d
DIFF: https://github.com/llvm/llvm-project/commit/8d019cda851a1031fbce3c50be0975438147f11d.diff

LOG: Fix ac1d23ed7de01fb3 interaction with gold plugin

Correctly set RelocationModel, thanks @modocache for spotting this.

Related to differential revision: https://reviews.llvm.org/D75579

Added: 
    

Modified: 
    llvm/tools/gold/gold-plugin.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/tools/gold/gold-plugin.cpp b/llvm/tools/gold/gold-plugin.cpp
index 4a491ea921b6..2db571617181 100644
--- a/llvm/tools/gold/gold-plugin.cpp
+++ b/llvm/tools/gold/gold-plugin.cpp
@@ -869,7 +869,7 @@ static std::unique_ptr<LTO> createLTO(IndexWriteCallback OnIndexWrite,
     Conf.Options.DataSections = SplitSections;
 
   Conf.MAttrs = codegen::getMAttrs();
-  Conf.RelocModel = codegen::getExplicitRelocModel();
+  Conf.RelocModel = RelocationModel;
   Conf.CodeModel = codegen::getExplicitCodeModel();
   Conf.CGOptLevel = getCGOptLevel();
   Conf.DisableVerify = options::DisableVerify;