diff options
| author | Simon Atanasyan <simon@atanasyan.com> | 2015-01-28 06:23:15 +0000 |
|---|---|---|
| committer | Simon Atanasyan <simon@atanasyan.com> | 2015-01-28 06:23:15 +0000 |
| commit | 24ea09c20cb30715ad4e144b8368439515e903d0 (patch) | |
| tree | c15225e24710b07c69da1ed0b3352dff4c9804c4 | |
| parent | d312c374df32072f347061d0bac99f32ccce435d (diff) | |
| download | bcm5719-llvm-24ea09c20cb30715ad4e144b8368439515e903d0.tar.gz bcm5719-llvm-24ea09c20cb30715ad4e144b8368439515e903d0.zip | |
[Mips] Fix enumeral and non-enumeral type in conditional expression warning
No functional changes.
llvm-svn: 227297
| -rw-r--r-- | lld/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp b/lld/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp index 595f9c2777d..3ae66fedb4b 100644 --- a/lld/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp +++ b/lld/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp @@ -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")); |
