commit aad35e7fc43eee90b174c8e00c785ec4991a38b7
author Patrik Hagglund <patrik.h.hagglund@ericsson.com> Mon Jun 09 07:35:07 2014 +0000
committer Patrik Hagglund <patrik.h.hagglund@ericsson.com> Mon Jun 09 07:35:07 2014 +0000
tree 1be88dbda6abd6385a6e9d6899fc6eb3df58eaa5
parent 7f6596bb13e85cd11f16c997c9aa62ad5a09376f

Fix gcc warning (enumeral and non-enumeral type in conditional expression)

llvm-svn: 210450

llvm/lib/MC/MCObjectFileInfo.cpp

diff --git a/llvm/lib/MC/MCObjectFileInfo.cpp b/llvm/lib/MC/MCObjectFileInfo.cpp
index 715dc84..d12f60c 100644
--- a/llvm/lib/MC/MCObjectFileInfo.cpp
+++ b/llvm/lib/MC/MCObjectFileInfo.cpp
@@ -584,7 +584,8 @@
                         SectionKind::getBSS());
   TextSection =
     Ctx->getCOFFSection(".text",
-                        (IsWoA ? COFF::IMAGE_SCN_MEM_16BIT : 0) |
+                        (IsWoA ? COFF::IMAGE_SCN_MEM_16BIT
+                               : (COFF::SectionCharacteristics)0) |
                         COFF::IMAGE_SCN_CNT_CODE |
                         COFF::IMAGE_SCN_MEM_EXECUTE |
                         COFF::IMAGE_SCN_MEM_READ,