Skip to content

Commit 926286a

Browse files
committed
Auto merge of rust-lang#7109 - ctennis:ct/asm_syntax_aarch64, r=flip1995
Ignore aarch64 for this test as it's x86 assembly only. Fixes rust-lang#7091 fixes rust-lang#7091 - asm_syntax lint test will not compile on aarch64 changelog: none
2 parents ec38ea1 + 42d0702 commit 926286a

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

tests/ui/asm_syntax.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
#![feature(asm)]
21
// only-x86_64
2+
// ignore-aarch64
3+
4+
#![feature(asm)]
35

46
#[warn(clippy::inline_asm_x86_intel_syntax)]
57
mod warn_intel {
@@ -23,6 +25,7 @@ mod warn_att {
2325
}
2426
}
2527

28+
#[cfg(target_arch = "x86_64")]
2629
fn main() {
2730
unsafe {
2831
warn_att::use_asm();

tests/ui/asm_syntax.stderr

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: Intel x86 assembly syntax used
2-
--> $DIR/asm_syntax.rs:7:9
2+
--> $DIR/asm_syntax.rs:9:9
33
|
44
LL | asm!("");
55
| ^^^^^^^^^
@@ -8,23 +8,23 @@ LL | asm!("");
88
= help: use AT&T x86 assembly syntax
99

1010
error: Intel x86 assembly syntax used
11-
--> $DIR/asm_syntax.rs:8:9
11+
--> $DIR/asm_syntax.rs:10:9
1212
|
1313
LL | asm!("", options());
1414
| ^^^^^^^^^^^^^^^^^^^^
1515
|
1616
= help: use AT&T x86 assembly syntax
1717

1818
error: Intel x86 assembly syntax used
19-
--> $DIR/asm_syntax.rs:9:9
19+
--> $DIR/asm_syntax.rs:11:9
2020
|
2121
LL | asm!("", options(nostack));
2222
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
2323
|
2424
= help: use AT&T x86 assembly syntax
2525

2626
error: AT&T x86 assembly syntax used
27-
--> $DIR/asm_syntax.rs:21:9
27+
--> $DIR/asm_syntax.rs:23:9
2828
|
2929
LL | asm!("", options(att_syntax));
3030
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -33,7 +33,7 @@ LL | asm!("", options(att_syntax));
3333
= help: use Intel x86 assembly syntax
3434

3535
error: AT&T x86 assembly syntax used
36-
--> $DIR/asm_syntax.rs:22:9
36+
--> $DIR/asm_syntax.rs:24:9
3737
|
3838
LL | asm!("", options(nostack, att_syntax));
3939
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)