summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Greg Kaiser <gkaiser@google.com> 2016-06-16 15:55:15 -0700
committer Greg Kaiser <gkaiser@google.com> 2016-06-16 15:55:15 -0700
commit81a1899f5defbc841af346d2d5d1ee2c11e40369 (patch)
treeceb35171c7830dd6b17f3579c49f3b73a46c36e6
parent8651203072621fa03f62bc3d1149f53deb022501 (diff)
elf_builder: Fix Mips header flags
Bitwise OR has a higher precendence than ternary conditional, so we need to use parentheses around our ternary conditional to get the behavior we desire. Bug: 28320822 Change-Id: I4b95ab88e688176939f16f8586d45784c9d92a42
-rw-r--r--compiler/elf_builder.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/elf_builder.h b/compiler/elf_builder.h
index 26ab281741..7f2e1931d0 100644
--- a/compiler/elf_builder.h
+++ b/compiler/elf_builder.h
@@ -780,9 +780,9 @@ class ElfBuilder FINAL {
EF_MIPS_PIC |
EF_MIPS_CPIC |
EF_MIPS_ABI_O32 |
- features->AsMipsInstructionSetFeatures()->IsR6()
- ? EF_MIPS_ARCH_32R6
- : EF_MIPS_ARCH_32R2);
+ (features->AsMipsInstructionSetFeatures()->IsR6()
+ ? EF_MIPS_ARCH_32R6
+ : EF_MIPS_ARCH_32R2));
break;
}
case kMips64: {