From a197b90801a4e2ba33712642c212bf21716cf88d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 15 May 2021 08:41:06 -0700 Subject: spirv-llvm-translator: Upgrade to 13.0.0/trunk This is in sync with clang trunk (upcoming 13.0.0) release Signed-off-by: Khem Raj (cherry picked from commit 79dc9a07e919bbcadb137a9d4cb0f857a672d67e) --- .../0001-Use-12.0.0-for-base-llvm-version.patch | 26 ------------------ ...0001-cmake-allow-to-enable-disable-ccache.patch | 32 ---------------------- .../spirv-llvm-translator_git.bb | 8 ++---- 3 files changed, 3 insertions(+), 63 deletions(-) delete mode 100644 recipes-devtools/spirv-llvm-translator/spirv-llvm-translator/0001-Use-12.0.0-for-base-llvm-version.patch delete mode 100644 recipes-devtools/spirv-llvm-translator/spirv-llvm-translator/0001-cmake-allow-to-enable-disable-ccache.patch diff --git a/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator/0001-Use-12.0.0-for-base-llvm-version.patch b/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator/0001-Use-12.0.0-for-base-llvm-version.patch deleted file mode 100644 index b52d97b..0000000 --- a/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator/0001-Use-12.0.0-for-base-llvm-version.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 1e38777c321605d13f9ad254880e73459877d7da Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 14 Feb 2021 18:43:21 -0800 -Subject: [PATCH] Use 12.0.0 for base llvm version - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0ddb55ce..a9cd1978 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,6 +1,6 @@ - cmake_minimum_required(VERSION 3.3) - --set (BASE_LLVM_VERSION 13.0.0) -+set (BASE_LLVM_VERSION 12.0.0) - set(LLVM_SPIRV_VERSION ${BASE_LLVM_VERSION}.0) - - option(LLVM_SPIRV_INCLUDE_TESTS --- -2.30.1 - diff --git a/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator/0001-cmake-allow-to-enable-disable-ccache.patch b/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator/0001-cmake-allow-to-enable-disable-ccache.patch deleted file mode 100644 index 68cdda4..0000000 --- a/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator/0001-cmake-allow-to-enable-disable-ccache.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 13b679eb76e6877b40fd41b91e71cb172bcf7b26 Mon Sep 17 00:00:00 2001 -From: Naveen Saini -Date: Thu, 4 Mar 2021 11:23:20 +0800 -Subject: [PATCH] cmake: allow to enable/disable ccache - -By default ccache is enabled. - -Upstream-Status: Submitted [https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/930] - -Signed-off-by: Naveen Saini ---- - CMakeLists.txt | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0ddb55c..c7d0498 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -50,8 +50,9 @@ if(LLVM_SPIRV_BUILD_EXTERNAL) - - message(STATUS "Found LLVM: ${LLVM_VERSION}") - -+ option(CCACHE_ALLOWED "allow use of ccache" TRUE) - find_program(CCACHE_EXE_FOUND ccache) -- if(CCACHE_EXE_FOUND) -+ if(CCACHE_EXE_FOUND AND CCACHE_ALLOWED) - message(STATUS "Found ccache: ${CCACHE_EXE_FOUND}") - set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) - set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) --- -2.17.1 - diff --git a/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator_git.bb b/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator_git.bb index 171d54f..d6da4e8 100644 --- a/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator_git.bb +++ b/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator_git.bb @@ -1,14 +1,12 @@ LICENSE = "NCSA" LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=47e311aa9caedd1b3abf098bd7814d1d" -BRANCH = "llvm_release_120" +BRANCH = "master" SRC_URI = "git://github.com/KhronosGroup/SPIRV-LLVM-Translator/;protocol=https;branch=${BRANCH} \ - file://0001-Use-12.0.0-for-base-llvm-version.patch \ - file://0001-cmake-allow-to-enable-disable-ccache.patch \ " -PV = "12.0.0" -SRCREV = "c65388fcd4eac9ce070fc330d5fe263ba2c72d66" +PV = "13.0.0" +SRCREV = "76c76efeb8bcb3414dcd26ef938de43eb1beb516" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf