From 3001340c236a0f3f74c5527cd24c7d78aec26286 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 12 Sep 2013 03:18:11 +0000 Subject: [PATCH] Attempt to fix the mingw32 bot. This should hopefully fix http://lab.llvm.org:8011/builders/clang-x86_64-darwin11-self-mingw32 Merged from r182446 Author: Rafael Espindola Date: Wed May 22 02:30:47 2013 +0000 git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_33@190579 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/R600/SIISelLowering.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/Target/R600/SIISelLowering.cpp b/lib/Target/R600/SIISelLowering.cpp index 6bd82a5d774..2ea69fdaa80 100644 --- a/lib/Target/R600/SIISelLowering.cpp +++ b/lib/Target/R600/SIISelLowering.cpp @@ -338,9 +338,8 @@ SDValue SITargetLowering::LowerBRCOND(SDValue BRCOND, return Chain; } -#define RSRC_DATA_FORMAT 0xf00000000000 - SDValue SITargetLowering::LowerSTORE(SDValue Op, SelectionDAG &DAG) const { + const uint64_t RSRC_DATA_FORMAT = 0xf00000000000LL; StoreSDNode *StoreNode = cast(Op); SDValue Chain = Op.getOperand(0); SDValue Value = Op.getOperand(1); @@ -351,9 +350,9 @@ SDValue SITargetLowering::LowerSTORE(SDValue Op, SelectionDAG &DAG) const { return SDValue(); } - SDValue SrcSrc = DAG.getNode(ISD::BUILD_PAIR, DL, MVT::i128, - DAG.getConstant(0, MVT::i64), - DAG.getConstant(RSRC_DATA_FORMAT, MVT::i64)); + SDValue Zero = DAG.getConstant(0, MVT::i64); + SDValue Format = DAG.getConstant(RSRC_DATA_FORMAT, MVT::i64); + SDValue SrcSrc = DAG.getNode(ISD::BUILD_PAIR, DL, MVT::i128, Zero, Format); SDValue Ops[2]; Ops[0] = DAG.getNode(AMDGPUISD::BUFFER_STORE, DL, MVT::Other, Chain,