Skip to content

Commit e2f17e6

Browse files
authored
Rollup merge of rust-lang#130267 - TimNN:patch-2, r=nikic
small_data_threshold.rs: Adapt to LLVM head changes When compiled against LLVM head, `small_data_threshold.rs` [fails with](https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/31051#0191e508-f11d-437b-a4a0-5e18247debc9): ``` /.../small_data_threshold.rs:61:12: error: RISCV: expected string not found in input --   | //@ RISCV: .section .sdata,   | ^   | /.../small_data_threshold.s:1:1: note: scanning from here   | .text   | ^   | /.../small_data_threshold.s:6:2: note: possible intended match here   | .section .sdata.U,"aw",`@progbits`   | ^ ``` I don't know how exactly the current output looks like, or if there was a specific reason for including the trailing comma on the first line. I only saw a failure for RISCV, but it seemed sensible to adjust MIPS as well. CI passes with this patch applied: https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/31053 `@rustbot` label: +llvm-main cc `@paulmenage`
2 parents c992f97 + cf006f3 commit e2f17e6

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Diff for: tests/assembly/small_data_threshold.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ static mut Z: u64 = 0;
5858
// Currently, only MIPS and RISCV successfully put any objects in the small data
5959
// sections so the U/V/W/X tests are skipped on Hexagon and M68K
6060

61-
//@ RISCV: .section .sdata,
61+
//@ RISCV: .section .sdata
6262
//@ RISCV-NOT: .section
6363
//@ RISCV: U:
6464
//@ RISCV: .section .sbss
@@ -71,7 +71,7 @@ static mut Z: u64 = 0;
7171
//@ RISCV-NOT: .section
7272
//@ RISCV: X:
7373

74-
//@ MIPS: .section .sdata,
74+
//@ MIPS: .section .sdata
7575
//@ MIPS-NOT: .section
7676
//@ MIPS: U:
7777
//@ MIPS: .section .sbss

0 commit comments

Comments
 (0)