summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
diff options
context:
space:
mode:
authorDaniel Sanders <daniel.sanders@imgtec.com>2016-05-09 15:50:15 +0000
committerDaniel Sanders <daniel.sanders@imgtec.com>2016-05-09 15:50:15 +0000
commit108823bc355e985c11655fc21bb27c48b6e3473b (patch)
tree8de33940ab14ed56f30d0cc491878c8e3cc3a184 /llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
parentcc9a2cf7ee983949527a4caede2fb403d5ebaea4 (diff)
downloadbcm5719-llvm-108823bc355e985c11655fc21bb27c48b6e3473b.tar.gz
bcm5719-llvm-108823bc355e985c11655fc21bb27c48b6e3473b.zip
[mips] Try to fix 'truncation from FindBestPredicateResult to bool' reported by MSVC
llvm-svn: 268928
Diffstat (limited to 'llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp')
-rw-r--r--llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp b/llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
index fb184bb3807..9b7f645b135 100644
--- a/llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
+++ b/llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
@@ -167,9 +167,9 @@ static unsigned getMatchingLoType(const ELFRelocationEntry &Reloc) {
/// A matching relocation is unbeatable if:
/// - It is not already involved in a match.
/// - It's offset is exactly that of the one given in R.
-static bool isMatchingReloc(const MipsRelocationEntry &X,
- const ELFRelocationEntry &R,
- unsigned MatchingType) {
+static FindBestPredicateResult isMatchingReloc(const MipsRelocationEntry &X,
+ const ELFRelocationEntry &R,
+ unsigned MatchingType) {
if (X.R.Type == MatchingType && X.R.OriginalSymbol == R.OriginalSymbol) {
if (!X.Matched &&
X.R.OriginalAddend == R.OriginalAddend)
OpenPOWER on IntegriCloud