aboutsummaryrefslogtreecommitdiff
path: root/llvm/lib/LTO/LTO.cpp
diff options
context:
space:
mode:
authorEvgeniy Stepanov <eugeni.stepanov@gmail.com>2017-05-22 21:11:35 +0000
committerEvgeniy Stepanov <eugeni.stepanov@gmail.com>2017-05-22 21:11:35 +0000
commitb9f1b014e1aa47550e1e4bb0c0bf143fc01f6c20 (patch)
treebc118e09d2e6bd4199ceff8ed989cca30221d42c /llvm/lib/LTO/LTO.cpp
parentd4136e945ed7d057b4bb376eb6f5299c76d31614 (diff)
downloadllvm-b9f1b014e1aa47550e1e4bb0c0bf143fc01f6c20.zip
llvm-b9f1b014e1aa47550e1e4bb0c0bf143fc01f6c20.tar.gz
llvm-b9f1b014e1aa47550e1e4bb0c0bf143fc01f6c20.tar.bz2
Infer relocation model from module flags in relocatable LTO link.
Fix for PR33096. llvm-svn: 303578
Diffstat (limited to 'llvm/lib/LTO/LTO.cpp')
-rw-r--r--llvm/lib/LTO/LTO.cpp5
1 files changed, 4 insertions, 1 deletions
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 @@ static void computeCacheKey(
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);