Skip to content

Commit dda67df

Browse files
committed
auto merge of #10314 : ksh8281/rust/fix_some_cfail_test_cases_for_arm, r=yichoi
adding #[cfg(target_arch = "arm")] for asm of cfail test cases
2 parents a66b372 + 65d35ac commit dda67df

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

src/test/compile-fail/asm-in-bad-modifier.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ fn foo(x: int) { info!("{}", x); }
1515

1616
#[cfg(target_arch = "x86")]
1717
#[cfg(target_arch = "x86_64")]
18+
#[cfg(target_arch = "arm")]
19+
1820
pub fn main() {
1921
let x: int;
2022
let y: int;
@@ -26,5 +28,5 @@ pub fn main() {
2628
foo(y);
2729
}
2830

29-
#[cfg(not(target_arch = "x86"), not(target_arch = "x86_64"))]
31+
#[cfg(not(target_arch = "x86"), not(target_arch = "x86_64"), not(target_arch = "arm"))]
3032
pub fn main() {}

src/test/compile-fail/asm-out-assign-imm.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ fn foo(x: int) { info!("{}", x); }
1515

1616
#[cfg(target_arch = "x86")]
1717
#[cfg(target_arch = "x86_64")]
18+
#[cfg(target_arch = "arm")]
1819
pub fn main() {
1920
let x: int;
2021
x = 1; //~ NOTE prior assignment occurs here
@@ -25,5 +26,5 @@ pub fn main() {
2526
foo(x);
2627
}
2728

28-
#[cfg(not(target_arch = "x86"), not(target_arch = "x86_64"))]
29+
#[cfg(not(target_arch = "x86"), not(target_arch = "x86_64"), not(target_arch = "arm"))]
2930
pub fn main() {}

src/test/compile-fail/asm-out-no-modifier.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ fn foo(x: int) { info!("{}", x); }
1515

1616
#[cfg(target_arch = "x86")]
1717
#[cfg(target_arch = "x86_64")]
18+
#[cfg(target_arch = "arm")]
1819
pub fn main() {
1920
let x: int;
2021
unsafe {
@@ -23,5 +24,5 @@ pub fn main() {
2324
foo(x);
2425
}
2526

26-
#[cfg(not(target_arch = "x86"), not(target_arch = "x86_64"))]
27+
#[cfg(not(target_arch = "x86"), not(target_arch = "x86_64"), not(target_arch = "arm"))]
2728
pub fn main() {}

src/test/compile-fail/asm-out-read-uninit.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ fn foo(x: int) { info!("{}", x); }
1515

1616
#[cfg(target_arch = "x86")]
1717
#[cfg(target_arch = "x86_64")]
18+
#[cfg(target_arch = "arm")]
1819
pub fn main() {
1920
let x: int;
2021
unsafe {
@@ -23,5 +24,5 @@ pub fn main() {
2324
foo(x);
2425
}
2526

26-
#[cfg(not(target_arch = "x86"), not(target_arch = "x86_64"))]
27+
#[cfg(not(target_arch = "x86"), not(target_arch = "x86_64"), not(target_arch = "arm"))]
2728
pub fn main() {}

0 commit comments

Comments
 (0)