From owner-svn-ports-all@freebsd.org Sun Feb 4 03:52:31 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 41B67EE459A; Sun, 4 Feb 2018 03:52:31 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E85136B517; Sun, 4 Feb 2018 03:52:30 +0000 (UTC) (envelope-from jbeich@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E352B14D49; Sun, 4 Feb 2018 03:52:30 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w143qURt033994; Sun, 4 Feb 2018 03:52:30 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w143qU1n033993; Sun, 4 Feb 2018 03:52:30 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201802040352.w143qU1n033993@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 4 Feb 2018 03:52:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460868 - head/lang/beignet/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/lang/beignet/files X-SVN-Commit-Revision: 460868 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Feb 2018 03:52:31 -0000 Author: jbeich Date: Sun Feb 4 03:52:30 2018 New Revision: 460868 URL: https://svnweb.freebsd.org/changeset/ports/460868 Log: lang/beignet: unbreak with llvm60 Added: head/lang/beignet/files/patch-llvm6 (contents, props changed) Added: head/lang/beignet/files/patch-llvm6 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/beignet/files/patch-llvm6 Sun Feb 4 03:52:30 2018 (r460868) @@ -0,0 +1,37 @@ +backend/src/llvm/llvm_unroll.cpp:209:22: error: no member named 'markAsRemoved' in 'llvm::LoopInfo' + loopInfo.markAsRemoved(parentL); + ~~~~~~~~ ^ +backend/src/llvm/llvm_to_gen.cpp:325:43: error: reference to type 'std::unique_ptr' could not bind to an rvalue of type 'void (*)(const llvm::DiagnosticInfo &, void *)' + mod.getContext().setDiagnosticHandler(&gbeDiagnosticHandler,&dc); + ^~~~~~~~~~~~~~~~~~~~~ +/usr/local/llvm60/include/llvm/IR/LLVMContext.h:213:66: note: passing argument to parameter 'DH' here + void setDiagnosticHandler(std::unique_ptr &&DH, + ^ + +--- backend/src/llvm/llvm_to_gen.cpp.orig 2017-10-24 06:04:48 UTC ++++ backend/src/llvm/llvm_to_gen.cpp +@@ -322,7 +322,11 @@ namespace gbe + DataLayout DL(&mod); + + gbeDiagnosticContext dc; ++#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 60 ++ mod.getContext().setDiagnosticHandlerCallBack(&gbeDiagnosticHandler,&dc); ++#else + mod.getContext().setDiagnosticHandler(&gbeDiagnosticHandler,&dc); ++#endif + + #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 37 + mod.setDataLayout(DL); +--- backend/src/llvm/llvm_unroll.cpp.orig 2017-10-24 06:04:48 UTC ++++ backend/src/llvm/llvm_unroll.cpp +@@ -205,7 +205,9 @@ namespace gbe { + if (parentTripCount != 0 && currTripCount * parentTripCount > 32) { + //Don't change the unrollID if doesn't force unroll. + //setUnrollID(parentL, false); +-#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 38 ++#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 60 ++ loopInfo.erase(parentL); ++#elif LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 38 + loopInfo.markAsRemoved(parentL); + #else + LPM.deleteLoopFromQueue(parentL);