svn commit: r326284 - in head/devel/llvm33: . files

[Brooks Davis]

Author: brooks
Date: Wed Sep  4 15:23:52 2013
New Revision: 326284
URL: http://svnweb.freebsd.org/changeset/ports/326284

Log:
  Fix the build on i386 9 with a patch from upstream the.   This was
  broken by the enabling of R600 support.
  
  Tested by:	mat

Added:
  head/devel/llvm33/files/patch-svn-182446   (contents, props changed)
Modified:
  head/devel/llvm33/Makefile

Modified: head/devel/llvm33/Makefile
==============================================================================
--- head/devel/llvm33/Makefile	Wed Sep  4 15:16:50 2013	(r326283)
+++ head/devel/llvm33/Makefile	Wed Sep  4 15:23:52 2013	(r326284)
@@ -2,7 +2,7 @@
 
 PORTNAME=	llvm
 PORTVERSION=	3.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel lang
 MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src

Added: head/devel/llvm33/files/patch-svn-182446
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/llvm33/files/patch-svn-182446	Wed Sep  4 15:23:52 2013	(r326284)
@@ -0,0 +1,35 @@
+$FreeBSD$
+------------------------------------------------------------------------
+r182446 | rafael | 2013-05-22 03:30:47 +0100 (Wed, 22 May 2013) | 4 lines
+
+Attempt to fix the mingw32 bot.
+
+This should hopefully fix
+http://lab.llvm.org:8011/builders/clang-x86_64-darwin11-self-mingw32
+------------------------------------------------------------------------
+Index: lib/Target/R600/SIISelLowering.cpp
+===================================================================
+--- lib/Target/R600/SIISelLowering.cpp	(revision 182445)
++++ lib/Target/R600/SIISelLowering.cpp	(revision 182446)
+@@ -338,7 +338,7 @@
+   return Chain;
+ }
+ 
+-#define RSRC_DATA_FORMAT 0xf00000000000
++const uint64_t RSRC_DATA_FORMAT = 0xf00000000000LL;
+ 
+ SDValue SITargetLowering::LowerSTORE(SDValue Op, SelectionDAG &DAG) const {
+   StoreSDNode *StoreNode = cast<StoreSDNode>(Op);
+@@ -351,9 +351,9 @@
+     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,