From: Jacques Pienaar <jpienaar@google.com>
Date: Tue, 23 Aug 2016 14:36:53 +0000 (+0000)
Subject: [lanai] Use const instead of constexpr
X-Git-Tag: llvmorg-4.0.0-rc1~11686
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8ed1cd291d0d0ddf4100e1a90e6886845e75ab87;p=platform%2Fupstream%2Fllvm.git

[lanai] Use const instead of constexpr

The windows build bot did not like constexpr.

llvm-svn: 279517
---

diff --git a/llvm/lib/Target/Lanai/LanaiAluCode.h b/llvm/lib/Target/Lanai/LanaiAluCode.h
index b6ceede..d514569 100644
--- a/llvm/lib/Target/Lanai/LanaiAluCode.h
+++ b/llvm/lib/Target/Lanai/LanaiAluCode.h
@@ -43,8 +43,8 @@ enum AluCode {
 
 // Bits indicating post- and pre-operators should be tested and set using Is*
 // and Make* utility functions
-constexpr int Lanai_PRE_OP = 0x40;
-constexpr int Lanai_POST_OP = 0x80;
+const int Lanai_PRE_OP = 0x40;
+const int Lanai_POST_OP = 0x80;
 
 inline static unsigned encodeLanaiAluCode(unsigned AluOp) {
   unsigned const OP_ENCODING_MASK = 0x07;