From 9cab73216151b5422da49ae2829db75a658b2763 Mon Sep 17 00:00:00 2001
From: Aaron Ballman <aaron@aaronballman.com>
Date: Thu, 30 Apr 2015 14:03:12 +0000
Subject: [PATCH] Silencing an "enumeral and non-enumeral type in conditional
 expression" warning; NFC.

llvm-svn: 236234
---
 llvm/lib/MC/ELFObjectWriter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/llvm/lib/MC/ELFObjectWriter.cpp b/llvm/lib/MC/ELFObjectWriter.cpp
index 4d22123..ae57f95 100644
--- a/llvm/lib/MC/ELFObjectWriter.cpp
+++ b/llvm/lib/MC/ELFObjectWriter.cpp
@@ -1586,7 +1586,7 @@ void ELFObjectWriter::WriteObject(MCAssembler &Asm,
   writeSectionHeader(Sections, Asm, Layout, SectionIndexMap, SectionOffsets);
 
   uint16_t NumSections = (Sections.size() + 1 >= ELF::SHN_LORESERVE)
-                             ? ELF::SHN_UNDEF
+                             ? (uint16_t)ELF::SHN_UNDEF
                              : Sections.size() + 1;
   if (sys::IsLittleEndianHost != IsLittleEndian)
     sys::swapByteOrder(NumSections);
-- 
2.7.4