summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-05-15 08:41:06 -0700
committerKhem Raj <raj.khem@gmail.com>2023-09-08 09:08:54 -0700
commita197b90801a4e2ba33712642c212bf21716cf88d (patch)
tree0570a8057768502bdd0edbade22fe33cf25cf2d3
parent3ea4838be87f748d11e98997068efa9b98d849db (diff)
downloadmeta-clang-a197b90801a4e2ba33712642c212bf21716cf88d.tar.gz
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 <raj.khem@gmail.com> (cherry picked from commit 79dc9a07e919bbcadb137a9d4cb0f857a672d67e)
-rw-r--r--recipes-devtools/spirv-llvm-translator/spirv-llvm-translator/0001-Use-12.0.0-for-base-llvm-version.patch26
-rw-r--r--recipes-devtools/spirv-llvm-translator/spirv-llvm-translator/0001-cmake-allow-to-enable-disable-ccache.patch32
-rw-r--r--recipes-devtools/spirv-llvm-translator/spirv-llvm-translator_git.bb8
3 files changed, 3 insertions, 63 deletions
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 @@
1From 1e38777c321605d13f9ad254880e73459877d7da Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 14 Feb 2021 18:43:21 -0800
4Subject: [PATCH] Use 12.0.0 for base llvm version
5
6Upstream-Status: Pending
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8---
9 CMakeLists.txt | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/CMakeLists.txt b/CMakeLists.txt
13index 0ddb55ce..a9cd1978 100644
14--- a/CMakeLists.txt
15+++ b/CMakeLists.txt
16@@ -1,6 +1,6 @@
17 cmake_minimum_required(VERSION 3.3)
18
19-set (BASE_LLVM_VERSION 13.0.0)
20+set (BASE_LLVM_VERSION 12.0.0)
21 set(LLVM_SPIRV_VERSION ${BASE_LLVM_VERSION}.0)
22
23 option(LLVM_SPIRV_INCLUDE_TESTS
24--
252.30.1
26
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 @@
1From 13b679eb76e6877b40fd41b91e71cb172bcf7b26 Mon Sep 17 00:00:00 2001
2From: Naveen Saini <naveen.kumar.saini@intel.com>
3Date: Thu, 4 Mar 2021 11:23:20 +0800
4Subject: [PATCH] cmake: allow to enable/disable ccache
5
6By default ccache is enabled.
7
8Upstream-Status: Submitted [https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/930]
9
10Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
11---
12 CMakeLists.txt | 3 ++-
13 1 file changed, 2 insertions(+), 1 deletion(-)
14
15diff --git a/CMakeLists.txt b/CMakeLists.txt
16index 0ddb55c..c7d0498 100644
17--- a/CMakeLists.txt
18+++ b/CMakeLists.txt
19@@ -50,8 +50,9 @@ if(LLVM_SPIRV_BUILD_EXTERNAL)
20
21 message(STATUS "Found LLVM: ${LLVM_VERSION}")
22
23+ option(CCACHE_ALLOWED "allow use of ccache" TRUE)
24 find_program(CCACHE_EXE_FOUND ccache)
25- if(CCACHE_EXE_FOUND)
26+ if(CCACHE_EXE_FOUND AND CCACHE_ALLOWED)
27 message(STATUS "Found ccache: ${CCACHE_EXE_FOUND}")
28 set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
29 set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
30--
312.17.1
32
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 @@
1LICENSE = "NCSA" 1LICENSE = "NCSA"
2LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=47e311aa9caedd1b3abf098bd7814d1d" 2LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=47e311aa9caedd1b3abf098bd7814d1d"
3 3
4BRANCH = "llvm_release_120" 4BRANCH = "master"
5SRC_URI = "git://github.com/KhronosGroup/SPIRV-LLVM-Translator/;protocol=https;branch=${BRANCH} \ 5SRC_URI = "git://github.com/KhronosGroup/SPIRV-LLVM-Translator/;protocol=https;branch=${BRANCH} \
6 file://0001-Use-12.0.0-for-base-llvm-version.patch \
7 file://0001-cmake-allow-to-enable-disable-ccache.patch \
8 " 6 "
9 7
10PV = "12.0.0" 8PV = "13.0.0"
11SRCREV = "c65388fcd4eac9ce070fc330d5fe263ba2c72d66" 9SRCREV = "76c76efeb8bcb3414dcd26ef938de43eb1beb516"
12 10
13S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
14 12