Signed-off-by: Philipp Zabel <[email protected]>
---
rules/host-llvm.make | 3 +++
rules/llvm.make | 10 ++++++----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/rules/host-llvm.make b/rules/host-llvm.make
index c701b6a579f8..32dcaf453832 100644
--- a/rules/host-llvm.make
+++ b/rules/host-llvm.make
@@ -35,6 +35,7 @@ HOST_LLVM_CONF_OPT := \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-G Ninja \
+ -DLIBC_GPU_BUILD=OFF \
-DLLVM_BUILD_BENCHMARKS=OFF \
-DLLVM_BUILD_DOCS=OFF \
-DLLVM_BUILD_EXAMPLES=OFF \
@@ -43,6 +44,7 @@ HOST_LLVM_CONF_OPT := \
-DLLVM_BUILD_LLVM_DYLIB=ON \
-DLLVM_BUILD_RUNTIME=OFF \
-DLLVM_BUILD_RUNTIMES=OFF \
+ -DLLVM_BUILD_TELEMETRY=OFF \
-DLLVM_BUILD_TESTS=OFF \
-DLLVM_BUILD_TOOLS=ON \
-DLLVM_BUILD_UTILS=OFF \
@@ -57,6 +59,7 @@ HOST_LLVM_CONF_OPT := \
-DLLVM_ENABLE_CRASH_OVERRIDES=ON \
-DLLVM_ENABLE_CURL=OFF \
-DLLVM_ENABLE_DAGISEL_COV=OFF \
+ -DLLVM_ENABLE_DEBUGLOC_COVERAGE_TRACKING=DISABLED \
-DLLVM_ENABLE_DOXYGEN=OFF \
-DLLVM_ENABLE_DUMP=OFF \
-DLLVM_ENABLE_EH=OFF \
diff --git a/rules/llvm.make b/rules/llvm.make
index 44e1478150bd..f76c22234e2b 100644
--- a/rules/llvm.make
+++ b/rules/llvm.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LLVM) += llvm
#
# Paths and names
#
-LLVM_VERSION := 19.1.7
-LLVM_MD5 := 45229744809103ad151e3757a0f21d3d
+LLVM_VERSION := 20.1.2
+LLVM_MD5 := 965dac265bf6c97b630d310b5f76c269
LLVM := llvm-$(LLVM_VERSION)
LLVM_SUFFIX := src.tar.xz
LLVM_URL := \
@@ -27,7 +27,7 @@ LLVM_STRIP_LEVEL := 0
LLVM_LICENSE := Apache-2.0 WITH LLVM-exception AND NCSA
LLVM_LICENSE_FILES :=
file://$(LLVM_SUBDIR)/LICENSE.TXT;md5=8a15a0759ef07f2682d2ba4b893c9afe
-LLVM_CMAKE_MD5 := 52b5249a06305e19c3bdae2e972c99c3
+LLVM_CMAKE_MD5 := a56549b987f3c4b51ee7c7cb21d26f32
LLVM_CMAKE_URL := \
https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_VERSION)/cmake-$(LLVM_VERSION).$(LLVM_SUFFIX)
LLVM_CMAKE_SOURCE := $(SRCDIR)/cmake-$(LLVM_VERSION).$(LLVM_SUFFIX)
@@ -78,6 +78,7 @@ LLVM_CONF_TOOL := cmake
define LLVM_SHARED_CONF_OPT
-G Ninja \
-DBUILD_SHARED_LIBS=OFF \
+ -DLIBC_GPU_BUILD=OFF \
-DLLVM_ABI_BREAKING_CHECKS=WITH_ASSERTS \
-DLLVM_ADDITIONAL_BUILD_TYPES=OFF \
-DLLVM_ALLOW_PROBLEMATIC_CONFIGURATIONS=OFF \
@@ -92,6 +93,7 @@ define LLVM_SHARED_CONF_OPT
-DLLVM_BUILD_LLVM_DYLIB=ON \
-DLLVM_BUILD_RUNTIME=ON \
-DLLVM_BUILD_RUNTIMES=ON \
+ -DLLVM_BUILD_TELEMETRY=OFF \
-DLLVM_BUILD_TESTS=OFF \
-DLLVM_BUILD_TOOLS=$(1) \
-DLLVM_BUILD_UTILS=OFF \
@@ -99,7 +101,6 @@ define LLVM_SHARED_CONF_OPT
-DLLVM_CODESIGNING_IDENTITY= \
-DLLVM_DEFAULT_TARGET_TRIPLE= \
-DLLVM_DEPENDENCY_DEBUGGING=OFF \
- -DLLVM_DYLIB_COMPONENTS=all \
-DLLVM_ENABLE_ASSERTIONS=OFF \
-DLLVM_ENABLE_BACKTRACES=ON \
-DLLVM_ENABLE_BINDINGS=OFF \
@@ -107,6 +108,7 @@ define LLVM_SHARED_CONF_OPT
-DLLVM_ENABLE_CRASH_OVERRIDES=ON \
-DLLVM_ENABLE_CURL=OFF \
-DLLVM_ENABLE_DAGISEL_COV=OFF \
+ -DLLVM_ENABLE_DEBUGLOC_COVERAGE_TRACKING=DISABLED \
-DLLVM_ENABLE_DOXYGEN=OFF \
-DLLVM_ENABLE_DUMP=OFF \
-DLLVM_ENABLE_EH=OFF \
--
2.39.5
