65 lines
2.4 KiB
Diff
65 lines
2.4 KiB
Diff
|
From bb2db56ffec6e527d88751f75117ae690227cd6c Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Kai=20Wasserb=C3=A4ch?= <kai@dev.carbon-project.org>
|
||
|
|
Date: Sat, 11 Feb 2023 18:38:01 +0100
|
||
|
|
Subject: [PATCH] fix: gallivm: fix LLVM #include of Host.h, moved to
|
||
|
|
TargetParser
|
||
|
|
|
||
|
|
Upstream moved Host.h from Support to TargetParser in LLVM 17.
|
||
|
|
|
||
|
|
This shouldn't lead to a FTBFS, since there is a forwarding include left
|
||
|
|
behind. Sadly the added deprecation warning #pragma is invalid and thus
|
||
|
|
causes a build failure right away. But since we would have to follow the
|
||
|
|
move anyway in the future, just do it right away.
|
||
|
|
|
||
|
|
Reference: https://github.com/llvm/llvm-project/commit/d768bf994f508d7eaf9541a568be3d71096febf5
|
||
|
|
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
|
||
|
|
Closes: #8275
|
||
|
|
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21263>
|
||
|
|
|
||
|
|
Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/commit/bb2db56ffec6e527d88751f75117ae690227cd6c]
|
||
|
|
|
||
|
|
---
|
||
|
|
src/gallium/auxiliary/gallivm/lp_bld_debug.cpp | 7 ++++++-
|
||
|
|
src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 4 +++-
|
||
|
|
2 files changed, 9 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
|
||
|
|
index 54bc5d5ada36c..f78f04f042be8 100644
|
||
|
|
--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
|
||
|
|
+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
|
||
|
|
@@ -35,9 +35,14 @@
|
||
|
|
#include <llvm-c/Disassembler.h>
|
||
|
|
#include <llvm/Support/raw_ostream.h>
|
||
|
|
#include <llvm/Support/Format.h>
|
||
|
|
-#include <llvm/Support/Host.h>
|
||
|
|
#include <llvm/IR/Module.h>
|
||
|
|
|
||
|
|
+#if LLVM_VERSION_MAJOR >= 17
|
||
|
|
+#include <llvm/TargetParser/Host.h>
|
||
|
|
+#else
|
||
|
|
+#include <llvm/Support/Host.h>
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
#include "util/u_math.h"
|
||
|
|
#include "util/u_debug.h"
|
||
|
|
|
||
|
|
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
|
||
|
|
index 334c13530394b..5e7a30a6cc2e3 100644
|
||
|
|
--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
|
||
|
|
+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
|
||
|
|
@@ -60,7 +60,11 @@
|
||
|
|
#include <llvm/Analysis/TargetLibraryInfo.h>
|
||
|
|
#include <llvm/ExecutionEngine/SectionMemoryManager.h>
|
||
|
|
#include <llvm/Support/CommandLine.h>
|
||
|
|
+#if LLVM_VERSION_MAJOR >= 17
|
||
|
|
+#include <llvm/TargetParser/Host.h>
|
||
|
|
+#else
|
||
|
|
#include <llvm/Support/Host.h>
|
||
|
|
+#endif
|
||
|
|
#include <llvm/Support/PrettyStackTrace.h>
|
||
|
|
#include <llvm/ExecutionEngine/ObjectCache.h>
|
||
|
|
#include <llvm/Support/TargetSelect.h>
|
||
|
|
|
||
|
|
--
|
||
|
|
GitLab
|