From owner-svn-src-head@FreeBSD.ORG  Sat Jun 28 09:53:45 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1271794D;
 Sat, 28 Jun 2014 09:53:45 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id F397A2787;
 Sat, 28 Jun 2014 09:53:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5S9riAS067585;
 Sat, 28 Jun 2014 09:53:44 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5S9ri9e067583;
 Sat, 28 Jun 2014 09:53:44 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201406280953.s5S9ri9e067583@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 28 Jun 2014 09:53:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r268003 - in head/contrib/llvm: lib/Target/PowerPC patches
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Jun 2014 09:53:45 -0000

Author: dim
Date: Sat Jun 28 09:53:44 2014
New Revision: 268003
URL: http://svnweb.freebsd.org/changeset/base/268003

Log:
  Fix breakage after r267981.
  
  Pointy hat to:	dim
  MFC after:	3 days
  X-MFC-With:	r267981

Modified:
  head/contrib/llvm/lib/Target/PowerPC/PPCFastISel.cpp
  head/contrib/llvm/patches/patch-r267981-llvm-r211435-fix-ppc-fctiduz.diff

Modified: head/contrib/llvm/lib/Target/PowerPC/PPCFastISel.cpp
==============================================================================
--- head/contrib/llvm/lib/Target/PowerPC/PPCFastISel.cpp	Sat Jun 28 05:51:45 2014	(r268002)
+++ head/contrib/llvm/lib/Target/PowerPC/PPCFastISel.cpp	Sat Jun 28 09:53:44 2014	(r268003)
@@ -1027,7 +1027,7 @@ bool PPCFastISel::SelectFPToI(const Inst
     return false;
 
   // If we don't have FCTIDUZ and we need it, punt to SelectionDAG.
-  if (DstVT == MVT::i64 && !IsSigned && !PPCSubTarget->hasFPCVT())
+  if (DstVT == MVT::i64 && !IsSigned && !PPCSubTarget.hasFPCVT())
     return false;
 
   Value *Src = I->getOperand(0);

Modified: head/contrib/llvm/patches/patch-r267981-llvm-r211435-fix-ppc-fctiduz.diff
==============================================================================
--- head/contrib/llvm/patches/patch-r267981-llvm-r211435-fix-ppc-fctiduz.diff	Sat Jun 28 05:51:45 2014	(r268002)
+++ head/contrib/llvm/patches/patch-r267981-llvm-r211435-fix-ppc-fctiduz.diff	Sat Jun 28 09:53:44 2014	(r268003)
@@ -32,7 +32,7 @@ Index: lib/Target/PowerPC/PPCFastISel.cp
      return false;
  
 +  // If we don't have FCTIDUZ and we need it, punt to SelectionDAG.
-+  if (DstVT == MVT::i64 && !IsSigned && !PPCSubTarget->hasFPCVT())
++  if (DstVT == MVT::i64 && !IsSigned && !PPCSubTarget.hasFPCVT())
 +    return false;
 +
    Value *Src = I->getOperand(0);