From ae4f2c849a426c63b149ca5c8f4a293ee5ba751e Mon Sep 17 00:00:00 2001 From: Tim Rowley Date: Wed, 6 Jul 2016 16:26:16 -0500 Subject: [PATCH] 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 --- src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp index 6e00a70..c6cbccf 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) -- 2.7.4