[llvm-branch-commits] [llvm-branch] r190579 - Attempt to fix the mingw32 bot.

[Tom Stellard]

Author: tstellar
Date: Wed Sep 11 22:18:11 2013
New Revision: 190579

URL: http://llvm.org/viewvc/llvm-project?rev=190579&view=rev
Log:
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 <rafael.espindola at gmail.com>
Date:   Wed May 22 02:30:47 2013 +0000

Modified:
    llvm/branches/release_33/lib/Target/R600/SIISelLowering.cpp

Modified: llvm/branches/release_33/lib/Target/R600/SIISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_33/lib/Target/R600/SIISelLowering.cpp?rev=190579&r1=190578&r2=190579&view=diff
==============================================================================
--- llvm/branches/release_33/lib/Target/R600/SIISelLowering.cpp (original)
+++ llvm/branches/release_33/lib/Target/R600/SIISelLowering.cpp Wed Sep 11 22:18:11 2013
@@ -338,9 +338,8 @@ SDValue SITargetLowering::LowerBRCOND(SD
   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<StoreSDNode>(Op);
   SDValue Chain = Op.getOperand(0);
   SDValue Value = Op.getOperand(1);
@@ -351,9 +350,9 @@ SDValue SITargetLowering::LowerSTORE(SDV
     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,