File u_swr-rast-Fix-addPassesToEmitFile-usage-with-l... of Package Mesa

Overview Repositories Revisions Requests Users Attributes Meta

File u_swr-rast-Fix-addPassesToEmitFile-usage-with-llvm-7.0.patch of Package Mesa (Revision 1f867a012a20e2659b5a97a31a983bdf)

Currently displaying revision 1f867a012a20e2659b5a97a31a983bdf , Show latest

From f90a60fe7951c7cd063581770e7a3860c253ced3 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@freedesktop.org>
Date: Mon, 25 Jun 2018 09:52:19 -0500
Subject: [PATCH] swr/rast: Fix addPassesToEmitFile usage with llvm-7.0.

Fix build error after llvm-7.0svn r332881 ("CodeGen: Add a dwo output
file argument to addPassesToEmitFile and hook it up to dwo output.").

CXX      rasterizer/jitter/libmesaswr_la-JitManager.lo
rasterizer/jitter/JitManager.cpp:368:93: error: too few arguments to function call, expected at least 4, have 3
        pTarget->addPassesToEmitFile(*pMPasses, filestream, TargetMachine::CGFT_AssemblyFile);
        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~                                                        ^

Reviewed-by: Bruce Cherniak <bruce.cherniak@intel.com>
---
 src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp | 4 ++++
 1 file changed, 4 insertions(+)

Index: mesa-18.0.2/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
===================================================================
--- mesa-18.0.2.orig/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
+++ mesa-18.0.2/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
@@ -360,7 +360,11 @@ void JitManager::DumpAsm(Function* pFunc
         legacy::PassManager* pMPasses = new legacy::PassManager();
         auto* pTarget = mpExec->getTargetMachine();
         pTarget->Options.MCOptions.AsmVerbose = true;
+#if LLVM_VERSION_MAJOR >= 7
+        pTarget->addPassesToEmitFile(*pMPasses, filestream, nullptr, TargetMachine::CGFT_AssemblyFile);
+#else
         pTarget->addPassesToEmitFile(*pMPasses, filestream, TargetMachine::CGFT_AssemblyFile);
+#endif
         pMPasses->run(*pModule);
         delete pMPasses;
         pTarget->Options.MCOptions.AsmVerbose = false;

Places

File u_swr-rast-Fix-addPassesToEmitFile-usage-with-llvm-7.0.patch of Package Mesa (Revision 1f867a012a20e2659b5a97a31a983bdf)

Places