commit b9f1b014e1aa47550e1e4bb0c0bf143fc01f6c20
author Evgeniy Stepanov <eugeni.stepanov@gmail.com> Mon May 22 21:11:35 2017 +0000
committer Evgeniy Stepanov <eugeni.stepanov@gmail.com> Mon May 22 21:11:35 2017 +0000
tree bc118e09d2e6bd4199ceff8ed989cca30221d42c
parent d4136e945ed7d057b4bb376eb6f5299c76d31614

Infer relocation model from module flags in relocatable LTO link.

Fix for PR33096.

llvm-svn: 303578

llvm/lib/LTO/LTO.cpp

diff --git a/llvm/lib/LTO/LTO.cpp b/llvm/lib/LTO/LTO.cpp
index c73b6b6..c69f385 100644
--- a/llvm/lib/LTO/LTO.cpp
+++ b/llvm/lib/LTO/LTO.cpp
@@ -114,7 +114,10 @@
   AddUnsigned((unsigned)Conf.Options.DebuggerTuning);
   for (auto &A : Conf.MAttrs)
     AddString(A);
-  AddUnsigned(Conf.RelocModel);
+  if (Conf.RelocModel)
+    AddUnsigned(*Conf.RelocModel);
+  else
+    AddUnsigned(-1);
   AddUnsigned(Conf.CodeModel);
   AddUnsigned(Conf.CGOptLevel);
   AddUnsigned(Conf.CGFileType);