diff options
| author | Stuart Cook <Zalathar@users.noreply.github.com> | 2025-04-15 15:47:29 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-15 15:47:29 +1000 |
| commit | 5a9455f56042fcbc404d13e9d3d09617bd178ba8 (patch) | |
| tree | e8aeaf0c6904f167f10defd6d5031382470946eb | |
| parent | 9d6c95d146667559822b92a6e9545c42179957ff (diff) | |
| parent | 1ac3d6bba71fce59939e6a4d50de98e289e87b9b (diff) | |
| download | rust-5a9455f56042fcbc404d13e9d3d09617bd178ba8.tar.gz rust-5a9455f56042fcbc404d13e9d3d09617bd178ba8.zip | |
Rollup merge of #139785 - fneddy:fix_test_cstring_merging_alignment, r=Mark-Simulacrum
Let CStrings be either 1 or 2 byte aligned. We see a regression on the `tests/assembly/cstring-merging.rs` test on s390x. Some architectures (like s390x) require strings to be 2 byte aligned. Therefor the section name will be marked with a .2 postfix on this architectures. Allowing a section name with a .1 or .2 postfix will make the test pass on either platform.
| -rw-r--r-- | tests/assembly/cstring-merging.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/assembly/cstring-merging.rs b/tests/assembly/cstring-merging.rs index 07f25d1e1a4..b5c530ac35d 100644 --- a/tests/assembly/cstring-merging.rs +++ b/tests/assembly/cstring-merging.rs @@ -5,7 +5,7 @@ use std::ffi::CStr; -// CHECK: .section .rodata.str1.1,"aMS" +// CHECK: .section .rodata.str1.{{[12]}},"aMS" // CHECK: .Lanon.{{.+}}: // CHECK-NEXT: .asciz "foo" #[unsafe(no_mangle)] |