From: Tim Rowley <timothy.o.rowley@intel.com>
Date: Wed, 6 Jul 2016 21:26:16 +0000 (-0500)
Subject: swr: [rasterizer jitter] fix llvm-3.7 compile
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ae4f2c849a426c63b149ca5c8f4a293ee5ba751e;p=mesa.git

swr: [rasterizer jitter] fix llvm-3.7 compile

d3d97f8 broke llvm-3.7, which has a mismatched API for
setDataLayout/getDataLayout.

Signed-off-by: Tim Rowley <timothy.o.rowley@intel.com>
---

diff --git a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
index 6e00a70c887..c6cbccf094a 100644
--- a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
+++ b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
@@ -241,7 +241,12 @@ bool JitManager::SetupModuleFromIR(const uint8_t *pIR)
         return false;
     }
 
+#if HAVE_LLVM == 0x307
+    // llvm-3.7 has mismatched setDataLyout/getDataLayout APIs
+    newModule->setDataLayout(*mpExec->getDataLayout());
+#else
     newModule->setDataLayout(mpExec->getDataLayout());
+#endif
 
     mpCurrentModule = newModule.get();
 #if defined(_WIN32)