Date: Sun, 4 Feb 2018 03:52:30 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460868 - head/lang/beignet/files Message-ID: <201802040352.w143qU1n033993@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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<DiagnosticHandler>' 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<DiagnosticHandler> &&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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802040352.w143qU1n033993>