Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 27 deletions

diff --git a/src/test/ui/asm/aarch64/duplicate-options.rs b/src/test/ui/asm/aarch64/duplicate-options.rs
deleted file mode 100644
index b2d3fe7d9..000000000
--- a/src/test/ui/asm/aarch64/duplicate-options.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-// only-aarch64
-// needs-asm-support
-// run-rustfix
-
-use std::arch::asm;
-
-fn main() {
-    unsafe {
-        asm!("", options(nomem, nomem));
-        //~^ ERROR the `nomem` option was already provided
-        asm!("", options(preserves_flags, preserves_flags));
-        //~^ ERROR the `preserves_flags` option was already provided
-        asm!("", options(nostack, preserves_flags), options(nostack));
-        //~^ ERROR the `nostack` option was already provided
-        asm!("", options(nostack, nostack), options(nostack), options(nostack));
-        //~^ ERROR the `nostack` option was already provided
-        //~| ERROR the `nostack` option was already provided
-        //~| ERROR the `nostack` option was already provided
-        asm!(
-            "",
-            options(nomem, noreturn),
-            options(preserves_flags, noreturn), //~ ERROR the `noreturn` option was already provided
-            options(nomem, nostack),            //~ ERROR the `nomem` option was already provided
-            options(noreturn),                  //~ ERROR the `noreturn` option was already provided
-        );
-    }
-}