From owner-svn-ports-head@freebsd.org  Mon Jun 13 18:54:14 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A11CEAF2711;
 Mon, 13 Jun 2016 18:54:14 +0000 (UTC)
 (envelope-from grembo@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 737912AC9;
 Mon, 13 Jun 2016 18:54:14 +0000 (UTC)
 (envelope-from grembo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5DIsDmY037030;
 Mon, 13 Jun 2016 18:54:13 GMT (envelope-from grembo@FreeBSD.org)
Received: (from grembo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5DIsD5X037029;
 Mon, 13 Jun 2016 18:54:13 GMT (envelope-from grembo@FreeBSD.org)
Message-Id: <201606131854.u5DIsD5X037029@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: grembo set sender to
 grembo@FreeBSD.org using -f
From: Michael Gmelin <grembo@FreeBSD.org>
Date: Mon, 13 Jun 2016 18:54:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r416855 - head/lang/beignet/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Jun 2016 18:54:14 -0000

Author: grembo
Date: Mon Jun 13 18:54:13 2016
New Revision: 416855
URL: https://svnweb.freebsd.org/changeset/ports/416855

Log:
  Fix build on CURRENT.
  
  This is a bit defensive, static_cast<int> might've cut it as well.
  
  Approved by:	mentors (implicit)

Modified:
  head/lang/beignet/files/patch-backend_src_backend_gen-insn-selection.cpp

Modified: head/lang/beignet/files/patch-backend_src_backend_gen-insn-selection.cpp
==============================================================================
--- head/lang/beignet/files/patch-backend_src_backend_gen-insn-selection.cpp	Mon Jun 13 16:50:13 2016	(r416854)
+++ head/lang/beignet/files/patch-backend_src_backend_gen-insn-selection.cpp	Mon Jun 13 18:54:13 2016	(r416855)
@@ -1,6 +1,16 @@
---- backend/src/backend/gen_insn_selection.cpp.orig	2015-08-26 11:57:48.961363000 +0200
-+++ backend/src/backend/gen_insn_selection.cpp	2015-08-26 11:58:15.326657000 +0200
-@@ -1752,11 +1752,11 @@ namespace gbe
+Error: No word lists can be found for the language "en_US".
+--- backend/src/backend/gen_insn_selection.cpp.orig	2015-12-18 07:34:19.000000000 +0000
++++ backend/src/backend/gen_insn_selection.cpp	2016-06-13 17:37:52.540024000 +0000
+@@ -1153,7 +1153,7 @@
+     SelectionInstruction *insn = this->appendInsn(SEL_OP_JMPI, 0, 1);
+     insn->src(0) = src;
+     insn->index = index.value();
+-    insn->extra.longjmp = abs(index - origin) > 800;
++    insn->extra.longjmp = index.value() > origin.value() ? (index - origin) > 800 : (origin - index) > 800;
+     return insn->extra.longjmp ? 2 : 1;
+   }
+ 
+@@ -1752,11 +1752,11 @@
  
    // Boiler plate to initialize the selection library at c++ pre-main
    static SelectionLibrary *selLib = NULL;