Date: Mon, 20 Aug 2018 23:38:06 +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: r477691 - head/graphics/mesa-dri/files Message-ID: <201808202338.w7KNc6SF005412@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Aug 20 23:38:06 2018 New Revision: 477691 URL: https://svnweb.freebsd.org/changeset/ports/477691 Log: lang/clover: unbreak with llvm70 llvm/codegen/native.cpp:135:49: error: too few arguments to function call, expected at least 4, have 3 if (tm->addPassesToEmitFile(pm, fos, ft)) ~~~~~~~~~~~~~~~~~~~~~~~ ^ /usr/local/llvm70/include/llvm/Target/TargetMachine.h:260:3: note: 'addPassesToEmitFile' declared here virtual bool addPassesToEmitFile(PassManagerBase &, raw_pwrite_stream &, ^ Obtained from: upstream Approved by: portmgr blanket Added: head/graphics/mesa-dri/files/patch-llvm7 (contents, props changed) Added: head/graphics/mesa-dri/files/patch-llvm7 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/mesa-dri/files/patch-llvm7 Mon Aug 20 23:38:06 2018 (r477691) @@ -0,0 +1,52 @@ +commit d424be0feda5 +Author: Jan Vesely <jan.vesely@rutgers.edu> +Date: Tue May 22 17:52:30 2018 -0400 + + clover: Fix build after llvm r332881. + + v2: fix whitespace and indentation + + r332881 added an extra parameter to the emit function. + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106619 + Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu> + Reviewed-By: Aaron Watry <awatry@gmail.com> + Tested-By: Aaron Watry <awatry@gmail.com> + Tested-by: Kai Wasserbäch <kai@dev.carbon-project.org> + +--- src/gallium/state_trackers/clover/llvm/codegen/native.cpp.orig 2018-07-27 13:52:17 UTC ++++ src/gallium/state_trackers/clover/llvm/codegen/native.cpp +@@ -126,13 +126,12 @@ namespace { + { + compat::pass_manager pm; + ::llvm::raw_svector_ostream os { data }; +- compat::raw_ostream_to_emit_file fos(os); + + mod.setDataLayout(compat::get_data_layout(*tm)); + tm->Options.MCOptions.AsmVerbose = + (ft == TargetMachine::CGFT_AssemblyFile); + +- if (tm->addPassesToEmitFile(pm, fos, ft)) ++ if (compat::add_passes_to_emit_file(*tm, pm, os, ft)) + fail(r_log, build_error(), "TargetMachine can't emit this file"); + + pm.run(mod); +--- src/gallium/state_trackers/clover/llvm/compat.hpp.orig 2018-07-27 13:52:17 UTC ++++ src/gallium/state_trackers/clover/llvm/compat.hpp +@@ -247,6 +247,17 @@ namespace clover { + ::llvm::WriteBitcodeToFile(&mod, os); + #endif + } ++ ++ template<typename TM, typename PM, typename OS, typename FT> ++ bool add_passes_to_emit_file(TM &tm, PM &pm, OS &os, FT &ft) ++ { ++ compat::raw_ostream_to_emit_file fos(os); ++#if HAVE_LLVM >= 0x0700 ++ return tm.addPassesToEmitFile(pm, fos, nullptr, ft); ++#else ++ return tm.addPassesToEmitFile(pm, fos, ft); ++#endif ++ } + } + } + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808202338.w7KNc6SF005412>