5 files changed, 3 insertions, 36 deletions
diff --git a/gcc/testsuite/rust/compile/inline_asm_faulty_clobber.rs b/gcc/testsuite/rust/compile/inline_asm_faulty_clobber.rs
index 1358b5e..ea3dac7 100644
--- a/gcc/testsuite/rust/compile/inline_asm_faulty_clobber.rs
+++ b/gcc/testsuite/rust/compile/inline_asm_faulty_clobber.rs
@@ -8,5 +8,7 @@ macro_rules! asm {
 fn main() {
     unsafe {
         asm!("nop", clobber_abi());  // { dg-error "at least one abi must be provided as an argument to 'clobber_abi'" }
+        asm!("nop", clobber_abi+);  // { dg-error "expected '\\(', found '\\+'" }
+        asm!("nop", clobber_abi);  // { dg-error "expected '\\(', found end of macro arguments" }
     }
 }
 \ No newline at end of file
diff --git a/gcc/testsuite/rust/compile/inline_asm_faulty_clobber_1.rs b/gcc/testsuite/rust/compile/inline_asm_faulty_clobber_1.rs
deleted file mode 100644
index 5688992..0000000
--- a/gcc/testsuite/rust/compile/inline_asm_faulty_clobber_1.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-#![feature(rustc_attrs)]
-
-#[rustc_builtin_macro]
-macro_rules! asm {
-    () => {}
-}
-
-fn main() {
-    unsafe {
-        asm!("nop", clobber_abi);  // { dg-error "expected '\\(', found end of macro arguments" }
-    }
-}
-\ No newline at end of file
diff --git a/gcc/testsuite/rust/compile/inline_asm_faulty_clobber_2.rs b/gcc/testsuite/rust/compile/inline_asm_faulty_clobber_2.rs
deleted file mode 100644
index 98cd052..0000000
--- a/gcc/testsuite/rust/compile/inline_asm_faulty_clobber_2.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-#![feature(rustc_attrs)]
-
-#[rustc_builtin_macro]
-macro_rules! asm {
-    () => {}
-}
-
-fn main() {
-    unsafe {
-        asm!("nop", clobber_abi+);  // { dg-error "expected '\\(', found '\\+'" }
-    }
-}
-\ No newline at end of file
diff --git a/gcc/testsuite/rust/compile/inline_asm_nop.rs b/gcc/testsuite/rust/compile/inline_asm_nop.rs
index 7da9bef..ba21d02 100644
--- a/gcc/testsuite/rust/compile/inline_asm_nop.rs
+++ b/gcc/testsuite/rust/compile/inline_asm_nop.rs
@@ -8,5 +8,6 @@ macro_rules! asm {
 fn main() {
     unsafe {
         asm!("nop");
+        asm!("nop",);
     }
 }
diff --git a/gcc/testsuite/rust/compile/inline_asm_nop_2.rs b/gcc/testsuite/rust/compile/inline_asm_nop_2.rs
deleted file mode 100644
index 76f53fa..0000000
--- a/gcc/testsuite/rust/compile/inline_asm_nop_2.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-#![feature(rustc_attrs)]
-
-#[rustc_builtin_macro]
-macro_rules! asm {
-    () => {}
-}
-
-fn main() {
-    unsafe {
-        asm!("nop",);
-    }
-}