mesa/trunk/swr-llvm13-patch1.patch

   1 From a20dc1dd150a6c31153197ceda01827daab4203e Mon Sep 17 00:00:00 2001
   2 From: Vinson Lee <vlee@freedesktop.org>
   3 Date: Wed, 23 Jun 2021 21:58:08 -0700
   4 Subject: [PATCH] swr: Fix build with llvm-13.
   5
   6 Fix build after llvm-13 commit 3302af9d4c39 ("Support: Remove
   7 F_{None,Text,Append} compatibility synonyms, NFC").
   8
   9 Signed-off-by: Vinson Lee <vlee@freedesktop.org>
  10 ---
  11  .../swr/rasterizer/jitter/JitManager.cpp      | 24 +++++++++++++++++++
  12  1 file changed, 24 insertions(+)
  13
  14 diff --git a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
  15 index 44482939c76..2487f754dc1 100644
  16 --- a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
  17 +++ b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
  18 @@ -437,7 +437,11 @@ void JitManager::DumpAsm(Function* pFunction, const char* fileName)
  19          sprintf(fName, "%s.%s.asm", funcName, fileName);
  20  #endif
  21
  22 +#if LLVM_VERSION_MAJOR >= 13
  23 +        raw_fd_ostream filestream(fName, EC, llvm::sys::fs::OF_None);
  24 +#else
  25          raw_fd_ostream filestream(fName, EC, llvm::sys::fs::F_None);
  26 +#endif
  27
  28          legacy::PassManager* pMPasses         = new legacy::PassManager();
  29          auto*                pTarget          = mpExec->getTargetMachine();
  30 @@ -490,7 +494,11 @@ void JitManager::DumpToFile(Module*                         M,
  31  #else
  32          sprintf(fName, "%s.%s.ll", funcName, fileName);
  33  #endif
  34 +#if LLVM_VERSION_MAJOR >= 13
  35 +        raw_fd_ostream fd(fName, EC, llvm::sys::fs::OF_None);
  36 +#else
  37          raw_fd_ostream fd(fName, EC, llvm::sys::fs::F_None);
  38 +#endif
  39          M->print(fd, annotater);
  40          fd.flush();
  41      }
  42 @@ -512,7 +520,11 @@ void JitManager::DumpToFile(Function* f, const char* fileName)
  43  #else
  44          sprintf(fName, "%s.%s.ll", funcName, fileName);
  45  #endif
  46 +#if LLVM_VERSION_MAJOR >= 13
  47 +        raw_fd_ostream fd(fName, EC, llvm::sys::fs::OF_None);
  48 +#else
  49          raw_fd_ostream fd(fName, EC, llvm::sys::fs::F_None);
  50 +#endif
  51          f->print(fd, nullptr);
  52
  53  #if defined(_WIN32)
  54 @@ -522,7 +534,11 @@ void JitManager::DumpToFile(Function* f, const char* fileName)
  55  #endif
  56          fd.flush();
  57
  58 +#if LLVM_VERSION_MAJOR >= 13
  59 +        raw_fd_ostream fd_cfg(fName, EC, llvm::sys::fs::OF_Text);
  60 +#else
  61          raw_fd_ostream fd_cfg(fName, EC, llvm::sys::fs::F_Text);
  62 +#endif
  63          WriteGraph(fd_cfg, (const Function*)f);
  64
  65          fd_cfg.flush();
  66 @@ -726,7 +742,11 @@ void JitCache::notifyObjectCompiled(const llvm::Module* M, llvm::MemoryBufferRef
  67
  68      {
  69          std::error_code      err;
  70 +#if LLVM_VERSION_MAJOR >= 13
  71 +        llvm::raw_fd_ostream fileObj(objPath.c_str(), err, llvm::sys::fs::OF_None);
  72 +#else
  73          llvm::raw_fd_ostream fileObj(objPath.c_str(), err, llvm::sys::fs::F_None);
  74 +#endif
  75          fileObj << Obj.getBuffer();
  76          fileObj.flush();
  77      }
  78 @@ -734,7 +754,11 @@ void JitCache::notifyObjectCompiled(const llvm::Module* M, llvm::MemoryBufferRef
  79
  80      {
  81          std::error_code      err;
  82 +#if LLVM_VERSION_MAJOR >= 13
  83 +        llvm::raw_fd_ostream fileObj(filePath.c_str(), err, llvm::sys::fs::OF_None);
  84 +#else
  85          llvm::raw_fd_ostream fileObj(filePath.c_str(), err, llvm::sys::fs::F_None);
  86 +#endif
  87
  88          uint32_t objcrc = ComputeCRC(0, Obj.getBufferStart(), Obj.getBufferSize());
  89
  90 --
  91 GitLab
  92