summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Beaumont-Gay <matthewbg@google.com>2010-12-22 18:25:55 +0000
committerMatt Beaumont-Gay <matthewbg@google.com>2010-12-22 18:25:55 +0000
commit6b5d2519b3929e0b0aa1ae27a90b8f682366446e (patch)
treec681ac1c7327590d9f2c9a517c870e5790787956
parent7baabefa030a9d9fbc9766f2229877b09e03cc2d (diff)
downloadbcm5719-llvm-6b5d2519b3929e0b0aa1ae27a90b8f682366446e.tar.gz
bcm5719-llvm-6b5d2519b3929e0b0aa1ae27a90b8f682366446e.zip
Fix another conditional expression mismatched enum type warning.
llvm-svn: 122419
-rw-r--r--llvm/lib/MC/MachObjectWriter.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/lib/MC/MachObjectWriter.cpp b/llvm/lib/MC/MachObjectWriter.cpp
index cab64521afb..1347427741c 100644
--- a/llvm/lib/MC/MachObjectWriter.cpp
+++ b/llvm/lib/MC/MachObjectWriter.cpp
@@ -1007,7 +1007,8 @@ public:
FixedValue -= getSectionAddress(Fragment->getParent());
// Determine the appropriate type based on the fixup kind.
- Type = Is24BitBranch ? macho::RIT_ARM_Branch24Bit : macho::RIT_Vanilla;
+ Type = Is24BitBranch ? (unsigned)macho::RIT_ARM_Branch24Bit :
+ (unsigned)macho::RIT_Vanilla;
}
// struct relocation_info (8 bytes)
OpenPOWER on IntegriCloud