diff options
Diffstat (limited to 'meta/recipes-devtools/rust/files/backport-fix-test-string-merging.patch')
-rw-r--r-- | meta/recipes-devtools/rust/files/backport-fix-test-string-merging.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/meta/recipes-devtools/rust/files/backport-fix-test-string-merging.patch b/meta/recipes-devtools/rust/files/backport-fix-test-string-merging.patch deleted file mode 100644 index 1e72c100bb..0000000000 --- a/meta/recipes-devtools/rust/files/backport-fix-test-string-merging.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From 2d51acd2fbcbadb6f30709c5dd305494d413d388 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jens Reidel <adrian@travitia.xyz> | ||
3 | Date: Fri, 18 Jul 2025 19:44:20 +0200 | ||
4 | Subject: [PATCH] tests: assembly: cstring-merging: Disable GlobalMerge pass | ||
5 | |||
6 | The test relies on LLVM not merging all the globals into one and would | ||
7 | currently otherwise fail on powerpc64le. | ||
8 | |||
9 | Signed-off-by: Peter Tatrai <Peter.Tatrai@siemens.com> | ||
10 | Upstream-Status: Backport [https://github.com/rust-lang/rust/commit/2d51acd2fbcbadb6f30709c5dd305494d413d388] | ||
11 | --- | ||
12 | tests/assembly/cstring-merging.rs | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/tests/assembly/cstring-merging.rs b/tests/assembly/cstring-merging.rs | ||
16 | index f7d0775f7affd..03688e0068b79 100644 | ||
17 | --- a/tests/assembly/cstring-merging.rs | ||
18 | +++ b/tests/assembly/cstring-merging.rs | ||
19 | @@ -2,7 +2,7 @@ | ||
20 | // other architectures (including ARM and x86-64) use the prefix `.Lanon.` | ||
21 | //@ only-linux | ||
22 | //@ assembly-output: emit-asm | ||
23 | -//@ compile-flags: --crate-type=lib -Copt-level=3 | ||
24 | +//@ compile-flags: --crate-type=lib -Copt-level=3 -Cllvm-args=-enable-global-merge=0 | ||
25 | //@ edition: 2024 | ||
26 | |||
27 | use std::ffi::CStr; | ||