package/llvm-project: bump to version 21.1.4
Release notes:
https://discourse.llvm.org/t/llvm-21-1-4-released/88651
https://discourse.llvm.org/t/llvm-21-1-3-released/88525
https://discourse.llvm.org/t/llvm-21-1-2-released/88398
https://discourse.llvm.org/t/llvm-21-1-1-released/88244
https://discourse.llvm.org/t/llvm-21-1-0-released/88066
Update spirv-llvm-translator to align with 21.1.4
Release notes:
https://github.com/KhronosGroup/SPIRV-LLVM-Translator/releases/tag/v21.1.1
Added upstream tarball for third-party code to llvm and compiler-rt due
to upstream commit:
7f3afab918
and added a fix for compiler-rt to make use of the extracted third-party
code.
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
committed by
Julien Olivain
parent
02f5061eb0
commit
d6a7c02263
@@ -1,3 +1,3 @@
|
||||
# locally calculated
|
||||
sha256 b7a1b7b0af7b9c7596af6bd46e36d11321926eaa66a7a7dc957ab0a1375ee4b0 clang-20.1.8.src.tar.xz
|
||||
sha256 3e8e25a7478bfb0ef510fff35d1a43bdfb62c7727bf98bb43ad33deef2f9f1a2 clang-21.1.4.src.tar.xz
|
||||
sha256 ebcd9bbf783a73d05c53ba4d586b8d5813dcdf3bbec50265860ccc885e606f47 LICENSE.TXT
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
From 8fb17d03f8f7cec84dc8d6baebd479c4c34ba74b Mon Sep 17 00:00:00 2001
|
||||
From: Bernd Kuhls <bernd@kuhls.net>
|
||||
Date: Sun, 2 Nov 2025 21:18:24 +0100
|
||||
Subject: [PATCH] compiler-rt: Use LLVM_THIRD_PARTY_DIR for siphash include
|
||||
|
||||
Introduced by https://github.com/llvm/llvm-project/commit/7f3afab9181d83f92771293ad3b6c00ac62800fd
|
||||
but currently unused in compiler-rt leading to build errors with
|
||||
COMPILER_RT_STANDALONE_BUILD=ON
|
||||
|
||||
Upstream: https://github.com/llvm/llvm-project/pull/166097
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
||||
---
|
||||
lib/builtins/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt
|
||||
index 6c226aa7d2d4..7eb5ef487d31 100644
|
||||
--- a/lib/builtins/CMakeLists.txt
|
||||
+++ b/lib/builtins/CMakeLists.txt
|
||||
@@ -64,7 +64,7 @@ include(CMakePushCheckState)
|
||||
option(COMPILER_RT_BUILTINS_HIDE_SYMBOLS
|
||||
"Do not export any symbols from the static library." ON)
|
||||
|
||||
-include_directories(../../../third-party/siphash/include)
|
||||
+include_directories(${LLVM_THIRD_PARTY_DIR}/siphash/include)
|
||||
|
||||
# TODO: Need to add a mechanism for logging errors when builtin source files are
|
||||
# added to a sub-directory and not this CMakeLists file.
|
||||
--
|
||||
2.47.3
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
# Locally computed:
|
||||
sha256 15277402f6fd63397c0917a5c7171cda82d16d226094b828c1ed0f58f73b9c69 compiler-rt-20.1.8.src.tar.xz
|
||||
sha256 84fed7aa95bfac348642a753d332afd303a0847b1fe1e76acf13fe98f8760d5f compiler-rt-21.1.4.src.tar.xz
|
||||
sha256 ae8658390504e08e464f65ecea838a0584df4734c27cecedfe7eb32780e81564 third-party-21.1.4.src.tar.xz
|
||||
sha256 1a8f1058753f1ba890de984e48f0242a3a5c29a6a8f2ed9fd813f36985387e8d LICENSE.TXT
|
||||
|
||||
@@ -16,11 +16,21 @@ COMPILER_RT_SUPPORTS_IN_SOURCE_BUILD = NO
|
||||
COMPILER_RT_INSTALL_STAGING = YES
|
||||
COMPILER_RT_INSTALL_TARGET = NO
|
||||
|
||||
COMPILER_RT_EXTRA_DOWNLOADS = third-party-$(COMPILER_RT_VERSION).src.tar.xz
|
||||
|
||||
define COMPILER_RT_THIRD_PARTY_EXTRACT
|
||||
$(call suitable-extractor,$(notdir $(COMPILER_RT_EXTRA_DOWNLOADS))) \
|
||||
$(COMPILER_RT_DL_DIR)/$(notdir $(COMPILER_RT_EXTRA_DOWNLOADS)) | \
|
||||
$(TAR) -C $(@D) $(TAR_OPTIONS) -
|
||||
endef
|
||||
COMPILER_RT_POST_EXTRACT_HOOKS += COMPILER_RT_THIRD_PARTY_EXTRACT
|
||||
|
||||
COMPILER_RT_CONF_OPTS = \
|
||||
-DCOMPILER_RT_STANDALONE_BUILD=ON \
|
||||
-DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=$(GNU_TARGET_NAME) \
|
||||
-DLLVM_CONFIG_PATH=$(HOST_DIR)/bin/llvm-config \
|
||||
-DCMAKE_MODULE_PATH=$(HOST_DIR)/lib/cmake/llvm \
|
||||
-DLLVM_THIRD_PARTY_DIR=$(@D)/third-party-$(COMPILER_RT_VERSION).src \
|
||||
-DLLVM_COMMON_CMAKE_UTILS=$(HOST_DIR)/lib/cmake/llvm
|
||||
|
||||
# The installation of the target runtime libraries defaults to DESTDIR, however
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# locally calculated
|
||||
sha256 ecd83a52859742f71f4c332538f8bee54a6743374a233b5a85017de22d75c227 libclc-20.1.8.src.tar.xz
|
||||
sha256 2311128b86ae95b4319341671a8ec93950928d0bc4fa13d0e6a97d7a65507aaa libclc-21.1.4.src.tar.xz
|
||||
sha256 3c536c052db9afd997809e38785c9f2a9e54e2892330fa7c5b438e18a7413479 LICENSE.TXT
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# locally calculated
|
||||
sha256 8281462d62cae67dfe5fdbb4da0d82bc62e0a86d4d4f758b0b601d44f09fd987 lld-20.1.8.src.tar.xz
|
||||
sha256 5d62eb36eb76ac9cc9179f31a355d28fc3a1c4096880da2a12090cfe1ccd3dcf lld-21.1.4.src.tar.xz
|
||||
sha256 f7891568956e34643eb6a0db1462db30820d40d7266e2a78063f2fe233ece5a0 LICENSE.TXT
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# locally calculated
|
||||
sha256 3319203cfd1172bbac50f06fa68e318af84dcb5d65353310c0586354069d6634 cmake-20.1.8.src.tar.xz
|
||||
sha256 f4316d84a862ba3023ca1d26bd9c6a995516b4fa028b6fb329d22e24cc6d235e cmake-21.1.4.src.tar.xz
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# locally computed
|
||||
sha256 0bced9d701e300f8fe6599523367e214c1f928ac559afceece58f47018e9c4a7 libunwind-20.1.8.src.tar.xz
|
||||
sha256 fc3ca27e1094b5fd4b7c1879e83705d89e9a2632b9a43426eb96c0536ace5345 libunwind-21.1.4.src.tar.xz
|
||||
sha256 b5efebcaca80879234098e52d1725e6d9eb8fb96a19fce625d39184b705f7b6d LICENSE.TXT
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LLVM_PROJECT_VERSION_MAJOR = 20
|
||||
LLVM_PROJECT_VERSION = $(LLVM_PROJECT_VERSION_MAJOR).1.8
|
||||
LLVM_PROJECT_VERSION_MAJOR = 21
|
||||
LLVM_PROJECT_VERSION = $(LLVM_PROJECT_VERSION_MAJOR).1.4
|
||||
LLVM_PROJECT_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_PROJECT_VERSION)
|
||||
|
||||
include $(sort $(wildcard package/llvm-project/*/*.mk))
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# locally calculated
|
||||
sha256 86b375ab217619d018f6875b7c71106ffab5ab21c425f414a11468c2a8262819 runtimes-20.1.8.src.tar.xz
|
||||
sha256 d84e6d3a28f0c877e4ab6884e8bedb3a1d2094352bba2f0d74073abb817b996a runtimes-21.1.4.src.tar.xz
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
# locally calculated
|
||||
sha256 e1363888216b455184dbb8a74a347bf5612f56a3f982369e1cba6c7e0726cde1 llvm-20.1.8.src.tar.xz
|
||||
sha256 f311681255deb37f74bbf950a653e9434e7d8383a7b46a603a323c46cd4bf50e llvm-21.1.4.src.tar.xz
|
||||
sha256 ae8658390504e08e464f65ecea838a0584df4734c27cecedfe7eb32780e81564 third-party-21.1.4.src.tar.xz
|
||||
sha256 8d85c1057d742e597985c7d4e6320b015a9139385cff4cbae06ffc0ebe89afee LICENSE.TXT
|
||||
|
||||
@@ -13,6 +13,19 @@ LLVM_CPE_ID_VENDOR = llvm
|
||||
LLVM_SUPPORTS_IN_SOURCE_BUILD = NO
|
||||
LLVM_INSTALL_STAGING = YES
|
||||
|
||||
HOST_LLVM_EXTRA_DOWNLOADS = third-party-$(LLVM_VERSION).src.tar.xz
|
||||
|
||||
define HOST_LLVM_THIRD_PARTY_EXTRACT
|
||||
$(call suitable-extractor,$(notdir $(HOST_LLVM_EXTRA_DOWNLOADS))) \
|
||||
$(HOST_LLVM_DL_DIR)/$(notdir $(HOST_LLVM_EXTRA_DOWNLOADS)) | \
|
||||
$(TAR) -C $(@D) $(TAR_OPTIONS) -
|
||||
endef
|
||||
HOST_LLVM_POST_EXTRACT_HOOKS += HOST_LLVM_THIRD_PARTY_EXTRACT
|
||||
LLVM_POST_EXTRACT_HOOKS += HOST_LLVM_THIRD_PARTY_EXTRACT
|
||||
|
||||
HOST_LLVM_CONF_OPTS += -DLLVM_THIRD_PARTY_DIR=$(@D)/third-party-$(LLVM_PROJECT_VERSION).src
|
||||
LLVM_CONF_OPTS += -DLLVM_THIRD_PARTY_DIR=$(@D)/third-party-$(LLVM_PROJECT_VERSION).src
|
||||
|
||||
HOST_LLVM_DEPENDENCIES = host-python3 host-llvm-cmake
|
||||
LLVM_DEPENDENCIES = host-llvm
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# locally calculated
|
||||
sha256 ca89c35cbc55cfe69ab9fa1a2f3ee585d30cb285e01e2cae309fe0e1f1dfd79e spirv-llvm-translator-v20.1.2-7-g834db1a1985ac36d5a3e1b4b34dc1ca3f919ad5b.tar.gz
|
||||
sha256 954ef00a48fc440f3624f78cc80ffa98c961510bf558489ea0a940e397c7a871 spirv-llvm-translator-v21.1.1-2-ga37544fc0bb90b4e8b8d755580119c018891dfa4.tar.gz
|
||||
sha256 e3bc36440fc927c62d5cc24efeefe225a14d4e34ffeb0c92e430625cce9ee444 LICENSE.TXT
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
################################################################################
|
||||
|
||||
# Generate version string using:
|
||||
# git describe --tags --match 'v20*' --abbrev=40 origin/llvm_release_200
|
||||
SPIRV_LLVM_TRANSLATOR_VERSION = v20.1.2-7-g834db1a1985ac36d5a3e1b4b34dc1ca3f919ad5b
|
||||
# git describe --tags --match 'v21*' --abbrev=40 origin/llvm_release_210
|
||||
SPIRV_LLVM_TRANSLATOR_VERSION = v21.1.1-2-ga37544fc0bb90b4e8b8d755580119c018891dfa4
|
||||
SPIRV_LLVM_TRANSLATOR_SITE = $(call github,KhronosGroup,SPIRV-LLVM-Translator,$(SPIRV_LLVM_TRANSLATOR_VERSION))
|
||||
SPIRV_LLVM_TRANSLATOR_LICENSE = NCSA
|
||||
SPIRV_LLVM_TRANSLATOR_LICENSE_FILES = LICENSE.TXT
|
||||
|
||||
Reference in New Issue
Block a user