Skip to content

Commit

Permalink
Auto merge of rust-lang#7109 - ctennis:ct/asm_syntax_aarch64, r=flip1995
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bors committed Apr 21, 2021
2 parents ec38ea1 + 42d0702 commit 926286a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
5 changes: 4 additions & 1 deletion tests/ui/asm_syntax.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#![feature(asm)]
// only-x86_64
// ignore-aarch64

#![feature(asm)]

#[warn(clippy::inline_asm_x86_intel_syntax)]
mod warn_intel {
Expand All @@ -23,6 +25,7 @@ mod warn_att {
}
}

#[cfg(target_arch = "x86_64")]
fn main() {
unsafe {
warn_att::use_asm();
Expand Down
10 changes: 5 additions & 5 deletions tests/ui/asm_syntax.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: Intel x86 assembly syntax used
--> $DIR/asm_syntax.rs:7:9
--> $DIR/asm_syntax.rs:9:9
|
LL | asm!("");
| ^^^^^^^^^
Expand All @@ -8,23 +8,23 @@ LL | asm!("");
= help: use AT&T x86 assembly syntax

error: Intel x86 assembly syntax used
--> $DIR/asm_syntax.rs:8:9
--> $DIR/asm_syntax.rs:10:9
|
LL | asm!("", options());
| ^^^^^^^^^^^^^^^^^^^^
|
= help: use AT&T x86 assembly syntax

error: Intel x86 assembly syntax used
--> $DIR/asm_syntax.rs:9:9
--> $DIR/asm_syntax.rs:11:9
|
LL | asm!("", options(nostack));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= help: use AT&T x86 assembly syntax

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

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

0 comments on commit 926286a

Please sign in to comment.