summaryrefslogtreecommitdiff
path: root/lib/MC
diff options
context:
space:
mode:
authorPatrik Hagglund <patrik.h.hagglund@ericsson.com>2014-06-09 07:35:07 +0000
committerPatrik Hagglund <patrik.h.hagglund@ericsson.com>2014-06-09 07:35:07 +0000
commitcbbf570823322c28c9bd258418cd2333b0078c36 (patch)
tree26897429adfa212d3170b5d607459e376d4a1052 /lib/MC
parent451cc566c10b1e057ad8b3c1d1308e8f4b6fb685 (diff)
downloadllvm-cbbf570823322c28c9bd258418cd2333b0078c36.tar.gz
llvm-cbbf570823322c28c9bd258418cd2333b0078c36.tar.bz2
llvm-cbbf570823322c28c9bd258418cd2333b0078c36.tar.xz
Fix gcc warning (enumeral and non-enumeral type in conditional expression)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210450 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/MC')
-rw-r--r--lib/MC/MCObjectFileInfo.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/MC/MCObjectFileInfo.cpp b/lib/MC/MCObjectFileInfo.cpp
index 715dc844c7..d12f60c099 100644
--- a/lib/MC/MCObjectFileInfo.cpp
+++ b/lib/MC/MCObjectFileInfo.cpp
@@ -584,7 +584,8 @@ void MCObjectFileInfo::InitCOFFMCObjectFileInfo(Triple T) {
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,