Mesa (master): radeon: fix r600 builds when old version of llvm is present

Timothy Arceri tarceri at kemper.freedesktop.org
Thu Feb 23 03:06:24 UTC 2017


Module: Mesa
Branch: master
Commit: 4711e5433662ceb80ba62ae949934c6019dc1b17
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4711e5433662ceb80ba62ae949934c6019dc1b17

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Thu Feb 23 13:35:03 2017 +1100

radeon: fix r600 builds when old version of llvm is present

Reviewed-by: Edward O'Callaghan <funfunctor at folklore1984.net>

---

 src/gallium/drivers/radeon/r600_pipe_common.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c
index bae6d6f..9a514e3 100644
--- a/src/gallium/drivers/radeon/r600_pipe_common.c
+++ b/src/gallium/drivers/radeon/r600_pipe_common.c
@@ -43,7 +43,7 @@
 #define HAVE_LLVM 0
 #endif
 
-#if HAVE_LLVM
+#if HAVE_LLVM >= 0x0306
 #include <llvm-c/TargetMachine.h>
 #endif
 
@@ -793,7 +793,7 @@ static void r600_disk_cache_create(struct r600_common_screen *rscreen)
 		if (rscreen->chip_class < SI) {
 			res = asprintf(&timestamp_str, "%u",mesa_timestamp);
 		}
-#if HAVE_LLVM
+#if HAVE_LLVM >= 0x0306
 		else {
 			uint32_t llvm_timestamp;
 			if (disk_cache_get_function_timestamp(LLVMInitializeAMDGPUTargetInfo,




More information about the mesa-commit mailing list