summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2025-02-26 18:30:03 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-02-28 07:49:18 +0000
commitdfe34c23379f501c65abdde10b7185f0c6b48c02 (patch)
tree61d671fd2b28ca355bcadf18a155450ea1b60e44 /meta
parent7deed33f2c950a0a43b7d2d93e73f7feedc4ab9d (diff)
downloadpoky-dfe34c23379f501c65abdde10b7185f0c6b48c02.tar.gz
rust-llvm: Fix build break found with clang
call and callee have mismatched types, this patch fixes it (From OE-Core rev: 88e5970998fb4c72844056be19e3a9f77de3f4d6) Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Randy MacLeod <Randy.MacLeod@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/rust/rust-llvm/0001-NFC-fix-build-failure-100993.patch30
-rw-r--r--meta/recipes-devtools/rust/rust-llvm_1.82.0.bb4
2 files changed, 33 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rust/rust-llvm/0001-NFC-fix-build-failure-100993.patch b/meta/recipes-devtools/rust/rust-llvm/0001-NFC-fix-build-failure-100993.patch
new file mode 100644
index 0000000000..ed26de73ce
--- /dev/null
+++ b/meta/recipes-devtools/rust/rust-llvm/0001-NFC-fix-build-failure-100993.patch
@@ -0,0 +1,30 @@
1From 40b4fd7a3e81d32b29364a1b15337bcf817659c0 Mon Sep 17 00:00:00 2001
2From: Chen Zheng <czhengsz@cn.ibm.com>
3Date: Tue, 30 Jul 2024 09:02:07 +0800
4Subject: [PATCH] [NFC] fix build failure (#100993)
5
6Fix the build failure caused by
7https://github.com/llvm/llvm-project/pull/94944
8
9Fixes https://github.com/llvm/llvm-project/issues/100296
10Upstream-Status: Backport [https://github.com/llvm/llvm-project/commit/40b4fd7a3e81d32b29364a1b15337bcf817659c0]
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 llvm/lib/Analysis/ConstantFolding.cpp | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/llvm/lib/Analysis/ConstantFolding.cpp b/llvm/lib/Analysis/ConstantFolding.cpp
17index 85ee231675d0..084647b1d9d9 100644
18--- a/llvm/lib/Analysis/ConstantFolding.cpp
19+++ b/llvm/lib/Analysis/ConstantFolding.cpp
20@@ -1782,8 +1782,8 @@ Constant *ConstantFoldFP(double (*NativeFP)(double), const APFloat &V,
21 }
22
23 #if defined(HAS_IEE754_FLOAT128) && defined(HAS_LOGF128)
24-Constant *ConstantFoldFP128(long double (*NativeFP)(long double),
25- const APFloat &V, Type *Ty) {
26+Constant *ConstantFoldFP128(float128 (*NativeFP)(float128), const APFloat &V,
27+ Type *Ty) {
28 llvm_fenv_clearexcept();
29 float128 Result = NativeFP(V.convertToQuad());
30 if (llvm_fenv_testexcept()) {
diff --git a/meta/recipes-devtools/rust/rust-llvm_1.82.0.bb b/meta/recipes-devtools/rust/rust-llvm_1.82.0.bb
index 509b507897..17d49be4ef 100644
--- a/meta/recipes-devtools/rust/rust-llvm_1.82.0.bb
+++ b/meta/recipes-devtools/rust/rust-llvm_1.82.0.bb
@@ -10,7 +10,9 @@ require rust-source.inc
10 10
11SRC_URI += "file://0002-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ 11SRC_URI += "file://0002-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \
12 file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2 \ 12 file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2 \
13 file://0003-llvm-fix-include-benchmarks.patch;striplevel=2" 13 file://0003-llvm-fix-include-benchmarks.patch;striplevel=2 \
14 file://0001-NFC-fix-build-failure-100993.patch;striplevel=2 \
15 "
14 16
15S = "${RUSTSRC}/src/llvm-project/llvm" 17S = "${RUSTSRC}/src/llvm-project/llvm"
16 18