[Mips] Fix enumeral and non-enumeral type in conditional expression warning
authorSimon Atanasyan <simon@atanasyan.com>
Wed, 28 Jan 2015 06:23:15 +0000 (06:23 +0000)
committerSimon Atanasyan <simon@atanasyan.com>
Wed, 28 Jan 2015 06:23:15 +0000 (06:23 +0000)
No functional changes.

llvm-svn: 227297

lld/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp

index 595f9c2..3ae66fe 100644 (file)
@@ -71,7 +71,7 @@ std::error_code MipsELFFlagsMerger::merge(uint8_t newClass, uint32_t newFlags) {
   // We support two ABI: O32 and N64. The last one does not have
   // the corresponding ELF flag.
   uint32_t inAbi = newFlags & EF_MIPS_ABI;
-  uint32_t supportedAbi = _is64Bit ? 0 : EF_MIPS_ABI_O32;
+  uint32_t supportedAbi = _is64Bit ? 0 : uint32_t(EF_MIPS_ABI_O32);
   if (inAbi != supportedAbi)
     return make_dynamic_error_code(Twine("Unsupported ABI"));