summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-01-05 14:06:38 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-08 10:10:15 +0000
commit65a8b7b38e98cf53f7868d7070ff0b107b725ad0 (patch)
treea29b8212a870c4e1134b55bac54b30f80bdfa4de /meta/recipes-devtools
parentcdf2be3746ce54141a761bda6fdc9ae9c44d5964 (diff)
downloadpoky-65a8b7b38e98cf53f7868d7070ff0b107b725ad0.tar.gz
ccache: Fix build on aarch64/clang
asm option checks in cmake gets it wrong to just check compiler options to decide if SSE/AVX is supported, this accidentally then succeeds on aarch64 and ends up compiler failures on aarch64 with clang (From OE-Core rev: 0dea25b4296a66ec5c6d7bf5250ae0090e9b4016) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/ccache/ccache/0001-blake3-Remove-asm-checks-for-sse-avx.patch35
-rw-r--r--meta/recipes-devtools/ccache/ccache_4.1.bb1
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-devtools/ccache/ccache/0001-blake3-Remove-asm-checks-for-sse-avx.patch b/meta/recipes-devtools/ccache/ccache/0001-blake3-Remove-asm-checks-for-sse-avx.patch
new file mode 100644
index 0000000000..bdabb381aa
--- /dev/null
+++ b/meta/recipes-devtools/ccache/ccache/0001-blake3-Remove-asm-checks-for-sse-avx.patch
@@ -0,0 +1,35 @@
1From 0448eddcf2863ebf911e7dd445bca1c7eee2a239 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 5 Jan 2021 13:55:34 -0800
4Subject: [PATCH] blake3: Remove asm checks for sse/avx
5
6This ends up passing on clang/linux wrongly when building for aarch64
7the check in else part is good to detect the feature support and this
8check can be removed, it was setting
9
10HAVE_ASM_AVX* and HAVE_ASM_SSE* macros which are not used in the build
11anyway
12
13Upstream-Status: Submitted [https://github.com/ccache/ccache/pull/768]
14
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16---
17 src/third_party/blake3/CMakeLists.txt | 2 --
18 1 file changed, 2 deletions(-)
19
20diff --git a/src/third_party/blake3/CMakeLists.txt b/src/third_party/blake3/CMakeLists.txt
21index cc24253c..856b5721 100644
22--- a/src/third_party/blake3/CMakeLists.txt
23+++ b/src/third_party/blake3/CMakeLists.txt
24@@ -25,8 +25,6 @@ function(add_source_if_enabled feature compile_flags intrinsic)
25 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
26 message(STATUS "Detected unsupported compiler for ${have_feature} - disabled")
27 set(${have_feature} FALSE)
28- elseif(${blake_source_type} STREQUAL "asm")
29- check_asm_compiler_flag(${compile_flags} ${have_feature})
30 else()
31 set(CMAKE_REQUIRED_FLAGS ${compile_flags})
32 check_c_source_compiles(
33--
342.30.0
35
diff --git a/meta/recipes-devtools/ccache/ccache_4.1.bb b/meta/recipes-devtools/ccache/ccache_4.1.bb
index 96254a3875..551b4c7e5c 100644
--- a/meta/recipes-devtools/ccache/ccache_4.1.bb
+++ b/meta/recipes-devtools/ccache/ccache_4.1.bb
@@ -14,6 +14,7 @@ DEPENDS = "zstd"
14SRC_URI = "https://github.com/ccache/ccache/releases/download/v${PV}/${BP}.tar.gz \ 14SRC_URI = "https://github.com/ccache/ccache/releases/download/v${PV}/${BP}.tar.gz \
15 file://0001-Improve-SIMD-detection-735.patch \ 15 file://0001-Improve-SIMD-detection-735.patch \
16 file://0002-Always-use-64bit-to-print-time_t.patch \ 16 file://0002-Always-use-64bit-to-print-time_t.patch \
17 file://0001-blake3-Remove-asm-checks-for-sse-avx.patch \
17 " 18 "
18SRC_URI[sha256sum] = "cdeefb827b3eef3b42b5454858123881a4a90abbd46cc72cf8c20b3bd039deb7" 19SRC_URI[sha256sum] = "cdeefb827b3eef3b42b5454858123881a4a90abbd46cc72cf8c20b3bd039deb7"
19 20