diff --git a/compiler/rustc_ast_passes/src/ast_validation.rs b/compiler/rustc_ast_passes/src/ast_validation.rs
index c8dbba006f6db..2308502df0703 100644
--- a/compiler/rustc_ast_passes/src/ast_validation.rs
+++ b/compiler/rustc_ast_passes/src/ast_validation.rs
@@ -1371,11 +1371,16 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
             ItemKind::Struct(ident, generics, vdata) => {
                 self.with_tilde_const(Some(TildeConstReason::Struct { span: item.span }), |this| {
                     // Scalable vectors can only be tuple structs
-                    let is_scalable_vector =
-                        item.attrs.iter().any(|attr| attr.has_name(sym::rustc_scalable_vector));
-                    if is_scalable_vector && !matches!(vdata, VariantData::Tuple(..)) {
-                        this.dcx()
-                            .emit_err(errors::ScalableVectorNotTupleStruct { span: item.span });
+                    let scalable_vector_attr =
+                        item.attrs.iter().find(|attr| attr.has_name(sym::rustc_scalable_vector));
+                    if let Some(attr) = scalable_vector_attr {
+                        if !matches!(vdata, VariantData::Tuple(..)) {
+                            this.dcx()
+                                .emit_err(errors::ScalableVectorNotTupleStruct { span: item.span });
+                        }
+                        if !self.sess.target.arch.supports_scalable_vectors() {
+                            this.dcx().emit_err(errors::ScalableVectorBadArch { span: attr.span });
+                        }
                     }
 
                     match vdata {
diff --git a/compiler/rustc_ast_passes/src/errors.rs b/compiler/rustc_ast_passes/src/errors.rs
index edc175b990885..4a39e22ac220d 100644
--- a/compiler/rustc_ast_passes/src/errors.rs
+++ b/compiler/rustc_ast_passes/src/errors.rs
@@ -1133,3 +1133,10 @@ pub(crate) struct ScalableVectorNotTupleStruct {
     #[primary_span]
     pub span: Span,
 }
+
+#[derive(Diagnostic)]
+#[diag("scalable vectors are not supported on this architecture")]
+pub(crate) struct ScalableVectorBadArch {
+    #[primary_span]
+    pub span: Span,
+}
diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
index a4460a3725174..77cc6dd1036c8 100644
--- a/compiler/rustc_target/src/spec/mod.rs
+++ b/compiler/rustc_target/src/spec/mod.rs
@@ -1956,6 +1956,19 @@ impl Arch {
             | X86_64 | Xtensa => true,
         }
     }
+
+    /// Whether `#[rustc_scalable_vector]` is supported for a target architecture
+    pub fn supports_scalable_vectors(&self) -> bool {
+        use Arch::*;
+
+        match self {
+            AArch64 | RiscV32 | RiscV64 => true,
+            AmdGpu | Arm | Arm64EC | Avr | Bpf | CSky | Hexagon | LoongArch32 | LoongArch64
+            | M68k | Mips | Mips32r6 | Mips64 | Mips64r6 | Msp430 | Nvptx64 | PowerPC
+            | PowerPC64 | S390x | Sparc | Sparc64 | SpirV | Wasm32 | Wasm64 | X86 | X86_64
+            | Xtensa | Other(_) => false,
+        }
+    }
 }
 
 crate::target_spec_enum! {
diff --git a/src/tools/compiletest/src/directives/directive_names.rs b/src/tools/compiletest/src/directives/directive_names.rs
index d2a71a42e076d..2fc5c0e8ec1ee 100644
--- a/src/tools/compiletest/src/directives/directive_names.rs
+++ b/src/tools/compiletest/src/directives/directive_names.rs
@@ -105,6 +105,7 @@ pub(crate) const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
     "ignore-powerpc",
     "ignore-powerpc64",
     "ignore-remote",
+    "ignore-riscv32",
     "ignore-riscv64",
     "ignore-rustc-debug-assertions",
     "ignore-rustc_abi-x86-sse2",
diff --git a/tests/ui/scalable-vectors/bad-architectures.rs b/tests/ui/scalable-vectors/bad-architectures.rs
new file mode 100644
index 0000000000000..3323423316bf6
--- /dev/null
+++ b/tests/ui/scalable-vectors/bad-architectures.rs
@@ -0,0 +1,13 @@
+//@ ignore-aarch64
+//@ ignore-riscv32
+//@ ignore-riscv64
+
+// Confirm that non-AArch64 and non-RISC-V targets error when compiling scalable vectors
+// (see #153593)
+
+#![crate_type = "lib"]
+#![feature(rustc_attrs)]
+
+#[rustc_scalable_vector(4)]
+//~^ ERROR: scalable vectors are not supported on this architecture
+struct ScalableVec(i32);
diff --git a/tests/ui/scalable-vectors/bad-architectures.stderr b/tests/ui/scalable-vectors/bad-architectures.stderr
new file mode 100644
index 0000000000000..94308a40e77d9
--- /dev/null
+++ b/tests/ui/scalable-vectors/bad-architectures.stderr
@@ -0,0 +1,8 @@
+error: scalable vectors are not supported on this architecture
+  --> $DIR/bad-architectures.rs:11:1
+   |
+LL | #[rustc_scalable_vector(4)]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 1 previous error
+
diff --git a/tests/ui/scalable-vectors/fn-trait.rs b/tests/ui/scalable-vectors/fn-trait.rs
index 5203b5fa0efd7..47b29202a6716 100644
--- a/tests/ui/scalable-vectors/fn-trait.rs
+++ b/tests/ui/scalable-vectors/fn-trait.rs
@@ -1,3 +1,4 @@
+//@ only-aarch64
 #![allow(internal_features)]
 #![feature(rustc_attrs)]
 
diff --git a/tests/ui/scalable-vectors/fn-trait.stderr b/tests/ui/scalable-vectors/fn-trait.stderr
index 4d00272dd1b5a..8945069b10f8c 100644
--- a/tests/ui/scalable-vectors/fn-trait.stderr
+++ b/tests/ui/scalable-vectors/fn-trait.stderr
@@ -1,5 +1,5 @@
 error: scalable vectors cannot be tuple fields
-  --> $DIR/fn-trait.rs:9:8
+  --> $DIR/fn-trait.rs:10:8
    |
 LL |     T: Fn(ScalableSimdFloat),
    |        ^^^^^^^^^^^^^^^^^^^^^
diff --git a/tests/ui/scalable-vectors/illegal_init.rs b/tests/ui/scalable-vectors/illegal-init.rs
similarity index 94%
rename from tests/ui/scalable-vectors/illegal_init.rs
rename to tests/ui/scalable-vectors/illegal-init.rs
index e8c0447fea422..c37a10b3f8866 100644
--- a/tests/ui/scalable-vectors/illegal_init.rs
+++ b/tests/ui/scalable-vectors/illegal-init.rs
@@ -1,3 +1,4 @@
+//@ only-aarch64
 #![allow(incomplete_features, internal_features)]
 #![feature(rustc_attrs)]
 
diff --git a/tests/ui/scalable-vectors/illegal_init.stderr b/tests/ui/scalable-vectors/illegal-init.stderr
similarity index 87%
rename from tests/ui/scalable-vectors/illegal_init.stderr
rename to tests/ui/scalable-vectors/illegal-init.stderr
index db0fffcf3b772..0cd99cf52d50f 100644
--- a/tests/ui/scalable-vectors/illegal_init.stderr
+++ b/tests/ui/scalable-vectors/illegal-init.stderr
@@ -1,5 +1,5 @@
 error: scalable vector types cannot be initialised using their constructor
-  --> $DIR/illegal_init.rs:8:15
+  --> $DIR/illegal-init.rs:9:15
    |
 LL |     let foo = svint32_t(1);
    |               ^^^^^^^^^ you can create scalable vectors using intrinsics
diff --git a/tests/ui/scalable-vectors/illformed-element-type.rs b/tests/ui/scalable-vectors/illformed-element-type.rs
index 469ca006f5e9b..8461b0a067ff8 100644
--- a/tests/ui/scalable-vectors/illformed-element-type.rs
+++ b/tests/ui/scalable-vectors/illformed-element-type.rs
@@ -1,4 +1,5 @@
 //@ compile-flags: --crate-type=lib
+//@ only-aarch64
 #![allow(internal_features)]
 #![feature(extern_types)]
 #![feature(never_type)]
diff --git a/tests/ui/scalable-vectors/illformed-element-type.stderr b/tests/ui/scalable-vectors/illformed-element-type.stderr
index f8ca8b76215f7..52a4346570702 100644
--- a/tests/ui/scalable-vectors/illformed-element-type.stderr
+++ b/tests/ui/scalable-vectors/illformed-element-type.stderr
@@ -1,5 +1,5 @@
 error: element type of a scalable vector must be a primitive scalar
-  --> $DIR/illformed-element-type.rs:15:1
+  --> $DIR/illformed-element-type.rs:16:1
    |
 LL | struct TyChar(char);
    | ^^^^^^^^^^^^^
@@ -7,7 +7,7 @@ LL | struct TyChar(char);
    = help: only `u*`, `i*`, `f*` and `bool` types are accepted
 
 error: element type of a scalable vector must be a primitive scalar
-  --> $DIR/illformed-element-type.rs:19:1
+  --> $DIR/illformed-element-type.rs:20:1
    |
 LL | struct TyConstPtr(*const u8);
    | ^^^^^^^^^^^^^^^^^
@@ -15,7 +15,7 @@ LL | struct TyConstPtr(*const u8);
    = help: only `u*`, `i*`, `f*` and `bool` types are accepted
 
 error: element type of a scalable vector must be a primitive scalar
-  --> $DIR/illformed-element-type.rs:23:1
+  --> $DIR/illformed-element-type.rs:24:1
    |
 LL | struct TyMutPtr(*mut u8);
    | ^^^^^^^^^^^^^^^
@@ -23,7 +23,7 @@ LL | struct TyMutPtr(*mut u8);
    = help: only `u*`, `i*`, `f*` and `bool` types are accepted
 
 error: element type of a scalable vector must be a primitive scalar
-  --> $DIR/illformed-element-type.rs:27:1
+  --> $DIR/illformed-element-type.rs:28:1
    |
 LL | struct TyStruct(Foo);
    | ^^^^^^^^^^^^^^^
@@ -31,7 +31,7 @@ LL | struct TyStruct(Foo);
    = help: only `u*`, `i*`, `f*` and `bool` types are accepted
 
 error: element type of a scalable vector must be a primitive scalar
-  --> $DIR/illformed-element-type.rs:31:1
+  --> $DIR/illformed-element-type.rs:32:1
    |
 LL | struct TyEnum(Bar);
    | ^^^^^^^^^^^^^
@@ -39,7 +39,7 @@ LL | struct TyEnum(Bar);
    = help: only `u*`, `i*`, `f*` and `bool` types are accepted
 
 error: element type of a scalable vector must be a primitive scalar
-  --> $DIR/illformed-element-type.rs:35:1
+  --> $DIR/illformed-element-type.rs:36:1
    |
 LL | struct TyUnion(Baz);
    | ^^^^^^^^^^^^^^
@@ -47,7 +47,7 @@ LL | struct TyUnion(Baz);
    = help: only `u*`, `i*`, `f*` and `bool` types are accepted
 
 error: element type of a scalable vector must be a primitive scalar
-  --> $DIR/illformed-element-type.rs:39:1
+  --> $DIR/illformed-element-type.rs:40:1
    |
 LL | struct TyForeign(Qux);
    | ^^^^^^^^^^^^^^^^
@@ -55,7 +55,7 @@ LL | struct TyForeign(Qux);
    = help: only `u*`, `i*`, `f*` and `bool` types are accepted
 
 error: element type of a scalable vector must be a primitive scalar
-  --> $DIR/illformed-element-type.rs:43:1
+  --> $DIR/illformed-element-type.rs:44:1
    |
 LL | struct TyArray([u32; 4]);
    | ^^^^^^^^^^^^^^
@@ -63,7 +63,7 @@ LL | struct TyArray([u32; 4]);
    = help: only `u*`, `i*`, `f*` and `bool` types are accepted
 
 error: element type of a scalable vector must be a primitive scalar
-  --> $DIR/illformed-element-type.rs:47:1
+  --> $DIR/illformed-element-type.rs:48:1
    |
 LL | struct TySlice([u32]);
    | ^^^^^^^^^^^^^^
@@ -71,7 +71,7 @@ LL | struct TySlice([u32]);
    = help: only `u*`, `i*`, `f*` and `bool` types are accepted
 
 error: element type of a scalable vector must be a primitive scalar
-  --> $DIR/illformed-element-type.rs:51:1
+  --> $DIR/illformed-element-type.rs:52:1
    |
 LL | struct TyRef<'a>(&'a u32);
    | ^^^^^^^^^^^^^^^^
@@ -79,7 +79,7 @@ LL | struct TyRef<'a>(&'a u32);
    = help: only `u*`, `i*`, `f*` and `bool` types are accepted
 
 error: element type of a scalable vector must be a primitive scalar
-  --> $DIR/illformed-element-type.rs:55:1
+  --> $DIR/illformed-element-type.rs:56:1
    |
 LL | struct TyFnPtr(fn(u32) -> u32);
    | ^^^^^^^^^^^^^^
@@ -87,7 +87,7 @@ LL | struct TyFnPtr(fn(u32) -> u32);
    = help: only `u*`, `i*`, `f*` and `bool` types are accepted
 
 error: element type of a scalable vector must be a primitive scalar
-  --> $DIR/illformed-element-type.rs:59:1
+  --> $DIR/illformed-element-type.rs:60:1
    |
 LL | struct TyDyn(dyn std::io::Write);
    | ^^^^^^^^^^^^
@@ -95,7 +95,7 @@ LL | struct TyDyn(dyn std::io::Write);
    = help: only `u*`, `i*`, `f*` and `bool` types are accepted
 
 error: element type of a scalable vector must be a primitive scalar
-  --> $DIR/illformed-element-type.rs:63:1
+  --> $DIR/illformed-element-type.rs:64:1
    |
 LL | struct TyNever(!);
    | ^^^^^^^^^^^^^^
@@ -103,7 +103,7 @@ LL | struct TyNever(!);
    = help: only `u*`, `i*`, `f*` and `bool` types are accepted
 
 error: element type of a scalable vector must be a primitive scalar
-  --> $DIR/illformed-element-type.rs:67:1
+  --> $DIR/illformed-element-type.rs:68:1
    |
 LL | struct TyTuple((u32, u32));
    | ^^^^^^^^^^^^^^
@@ -111,7 +111,7 @@ LL | struct TyTuple((u32, u32));
    = help: only `u*`, `i*`, `f*` and `bool` types are accepted
 
 error: element type of a scalable vector must be a primitive scalar
-  --> $DIR/illformed-element-type.rs:77:1
+  --> $DIR/illformed-element-type.rs:78:1
    |
 LL | struct TyInvalidAlias(InvalidAlias);
    | ^^^^^^^^^^^^^^^^^^^^^
diff --git a/tests/ui/scalable-vectors/illformed-tuples-of-scalable-vectors.rs b/tests/ui/scalable-vectors/illformed-tuples-of-scalable-vectors.rs
index 4f89a8f9055e1..37d516144ca3a 100644
--- a/tests/ui/scalable-vectors/illformed-tuples-of-scalable-vectors.rs
+++ b/tests/ui/scalable-vectors/illformed-tuples-of-scalable-vectors.rs
@@ -1,4 +1,5 @@
 //@ compile-flags: --crate-type=lib
+//@ only-aarch64
 #![allow(internal_features)]
 #![feature(rustc_attrs)]
 
diff --git a/tests/ui/scalable-vectors/illformed-tuples-of-scalable-vectors.stderr b/tests/ui/scalable-vectors/illformed-tuples-of-scalable-vectors.stderr
index f5fd963204a2d..6cf1394471f37 100644
--- a/tests/ui/scalable-vectors/illformed-tuples-of-scalable-vectors.stderr
+++ b/tests/ui/scalable-vectors/illformed-tuples-of-scalable-vectors.stderr
@@ -1,35 +1,35 @@
 error: scalable vectors must be tuple structs
-  --> $DIR/illformed-tuples-of-scalable-vectors.rs:15:1
+  --> $DIR/illformed-tuples-of-scalable-vectors.rs:16:1
    |
 LL | struct Struct { x: ValidI64, y: ValidI64 }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: all fields in a scalable vector struct must be the same type
-  --> $DIR/illformed-tuples-of-scalable-vectors.rs:19:39
+  --> $DIR/illformed-tuples-of-scalable-vectors.rs:20:39
    |
 LL | struct DifferentVectorTypes(ValidI64, ValidI32);
    |                                       ^^^^^^^^
 
 error: scalable vector structs can only have scalable vector fields
-  --> $DIR/illformed-tuples-of-scalable-vectors.rs:23:23
+  --> $DIR/illformed-tuples-of-scalable-vectors.rs:24:23
    |
 LL | struct NonVectorTypes(u32, u64);
    |                       ^^^
 
 error: scalable vector structs can only have scalable vector fields
-  --> $DIR/illformed-tuples-of-scalable-vectors.rs:27:32
+  --> $DIR/illformed-tuples-of-scalable-vectors.rs:28:32
    |
 LL | struct DifferentNonVectorTypes(u32, u64);
    |                                ^^^
 
 error: scalable vector structs can only have scalable vector fields
-  --> $DIR/illformed-tuples-of-scalable-vectors.rs:31:34
+  --> $DIR/illformed-tuples-of-scalable-vectors.rs:32:34
    |
 LL | struct SomeVectorTypes(ValidI64, u64);
    |                                  ^^^
 
 error: scalable vector structs cannot contain other scalable vector structs
-  --> $DIR/illformed-tuples-of-scalable-vectors.rs:35:20
+  --> $DIR/illformed-tuples-of-scalable-vectors.rs:36:20
    |
 LL | struct NestedTuple(ValidTuple, ValidTuple);
    |                    ^^^^^^^^^^
diff --git a/tests/ui/scalable-vectors/illformed-within-types.rs b/tests/ui/scalable-vectors/illformed-within-types.rs
index 81d960e4d4e1a..d34d1ba2d7eb0 100644
--- a/tests/ui/scalable-vectors/illformed-within-types.rs
+++ b/tests/ui/scalable-vectors/illformed-within-types.rs
@@ -1,4 +1,5 @@
 //@ compile-flags: --crate-type=lib
+//@ only-aarch64
 #![allow(internal_features)]
 #![feature(rustc_attrs)]
 
diff --git a/tests/ui/scalable-vectors/illformed-within-types.stderr b/tests/ui/scalable-vectors/illformed-within-types.stderr
index e76ef26f2aa4b..b95452779f601 100644
--- a/tests/ui/scalable-vectors/illformed-within-types.stderr
+++ b/tests/ui/scalable-vectors/illformed-within-types.stderr
@@ -1,29 +1,29 @@
 error: scalable vectors cannot be fields of a struct
-  --> $DIR/illformed-within-types.rs:9:8
+  --> $DIR/illformed-within-types.rs:10:8
    |
 LL |     x: ValidI64,
    |        ^^^^^^^^
 
 error: scalable vectors cannot be tuple fields
-  --> $DIR/illformed-within-types.rs:11:15
+  --> $DIR/illformed-within-types.rs:12:15
    |
 LL |     in_tuple: (ValidI64,),
    |               ^^^^^^^^^^^
 
 error: scalable vectors cannot be fields of a struct
-  --> $DIR/illformed-within-types.rs:15:20
+  --> $DIR/illformed-within-types.rs:16:20
    |
 LL | struct TupleStruct(ValidI64);
    |                    ^^^^^^^^
 
 error: scalable vectors cannot be fields of a variant
-  --> $DIR/illformed-within-types.rs:19:26
+  --> $DIR/illformed-within-types.rs:20:26
    |
 LL |     StructVariant { _ty: ValidI64 },
    |                          ^^^^^^^^
 
 error: scalable vectors cannot be fields of a variant
-  --> $DIR/illformed-within-types.rs:21:18
+  --> $DIR/illformed-within-types.rs:22:18
    |
 LL |     TupleVariant(ValidI64),
    |                  ^^^^^^^^
diff --git a/tests/ui/scalable-vectors/illformed.rs b/tests/ui/scalable-vectors/illformed.rs
index de135413a9f2c..d8730f40e1029 100644
--- a/tests/ui/scalable-vectors/illformed.rs
+++ b/tests/ui/scalable-vectors/illformed.rs
@@ -1,4 +1,5 @@
 //@ compile-flags: --crate-type=lib
+//@ only-aarch64
 #![allow(internal_features)]
 #![feature(rustc_attrs)]
 
diff --git a/tests/ui/scalable-vectors/illformed.stderr b/tests/ui/scalable-vectors/illformed.stderr
index bdf519c910580..ba584a4ad4d59 100644
--- a/tests/ui/scalable-vectors/illformed.stderr
+++ b/tests/ui/scalable-vectors/illformed.stderr
@@ -1,29 +1,29 @@
 error: scalable vectors must be tuple structs
-  --> $DIR/illformed.rs:6:1
+  --> $DIR/illformed.rs:7:1
    |
 LL | struct NoFieldsStructWithElementCount {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: scalable vectors must be tuple structs
-  --> $DIR/illformed.rs:15:1
+  --> $DIR/illformed.rs:16:1
    |
 LL | struct NoFieldsUnitWithElementCount;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: scalable vectors must be tuple structs
-  --> $DIR/illformed.rs:20:1
+  --> $DIR/illformed.rs:21:1
    |
 LL | struct NoFieldsStructWithoutElementCount {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: scalable vectors must be tuple structs
-  --> $DIR/illformed.rs:29:1
+  --> $DIR/illformed.rs:30:1
    |
 LL | struct NoFieldsUnitWithoutElementCount;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: scalable vectors must be tuple structs
-  --> $DIR/illformed.rs:34:1
+  --> $DIR/illformed.rs:35:1
    |
 LL | / struct MultipleFieldsStructWithElementCount {
 LL | |
@@ -34,7 +34,7 @@ LL | | }
    | |_^
 
 error: scalable vectors must be tuple structs
-  --> $DIR/illformed.rs:46:1
+  --> $DIR/illformed.rs:47:1
    |
 LL | / struct MultipleFieldsStructWithoutElementCount {
 LL | |
@@ -44,13 +44,13 @@ LL | | }
    | |_^
 
 error: scalable vectors must be tuple structs
-  --> $DIR/illformed.rs:58:1
+  --> $DIR/illformed.rs:59:1
    |
 LL | struct SingleFieldStruct { _ty: f64 }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: scalable vectors must have a single field
-  --> $DIR/illformed.rs:6:1
+  --> $DIR/illformed.rs:7:1
    |
 LL | struct NoFieldsStructWithElementCount {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -58,7 +58,7 @@ LL | struct NoFieldsStructWithElementCount {}
    = help: scalable vector types' only field must be a primitive scalar type
 
 error: scalable vectors must have a single field
-  --> $DIR/illformed.rs:11:1
+  --> $DIR/illformed.rs:12:1
    |
 LL | struct NoFieldsTupleWithElementCount();
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -66,7 +66,7 @@ LL | struct NoFieldsTupleWithElementCount();
    = help: scalable vector types' only field must be a primitive scalar type
 
 error: scalable vectors must have a single field
-  --> $DIR/illformed.rs:15:1
+  --> $DIR/illformed.rs:16:1
    |
 LL | struct NoFieldsUnitWithElementCount;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -74,7 +74,7 @@ LL | struct NoFieldsUnitWithElementCount;
    = help: scalable vector types' only field must be a primitive scalar type
 
 error: scalable vectors must have a single field
-  --> $DIR/illformed.rs:20:1
+  --> $DIR/illformed.rs:21:1
    |
 LL | struct NoFieldsStructWithoutElementCount {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -82,7 +82,7 @@ LL | struct NoFieldsStructWithoutElementCount {}
    = help: tuples of scalable vectors can only contain multiple of the same scalable vector type
 
 error: scalable vectors must have a single field
-  --> $DIR/illformed.rs:25:1
+  --> $DIR/illformed.rs:26:1
    |
 LL | struct NoFieldsTupleWithoutElementCount();
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -90,7 +90,7 @@ LL | struct NoFieldsTupleWithoutElementCount();
    = help: tuples of scalable vectors can only contain multiple of the same scalable vector type
 
 error: scalable vectors must have a single field
-  --> $DIR/illformed.rs:29:1
+  --> $DIR/illformed.rs:30:1
    |
 LL | struct NoFieldsUnitWithoutElementCount;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -98,25 +98,25 @@ LL | struct NoFieldsUnitWithoutElementCount;
    = help: tuples of scalable vectors can only contain multiple of the same scalable vector type
 
 error: scalable vectors cannot have multiple fields
-  --> $DIR/illformed.rs:34:1
+  --> $DIR/illformed.rs:35:1
    |
 LL | struct MultipleFieldsStructWithElementCount {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: scalable vectors cannot have multiple fields
-  --> $DIR/illformed.rs:42:1
+  --> $DIR/illformed.rs:43:1
    |
 LL | struct MultipleFieldsTupleWithElementCount(f32, u32);
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: scalable vector structs can only have scalable vector fields
-  --> $DIR/illformed.rs:48:5
+  --> $DIR/illformed.rs:49:5
    |
 LL |     _ty: f32,
    |     ^^^^^^^^
 
 error: scalable vector structs can only have scalable vector fields
-  --> $DIR/illformed.rs:54:47
+  --> $DIR/illformed.rs:55:47
    |
 LL | struct MultipleFieldsTupleWithoutElementCount(f32, u32);
    |                                               ^^^
diff --git a/tests/ui/scalable-vectors/invalid.rs b/tests/ui/scalable-vectors/invalid.rs
index 90e9839c9e116..0b6a915e5ccd2 100644
--- a/tests/ui/scalable-vectors/invalid.rs
+++ b/tests/ui/scalable-vectors/invalid.rs
@@ -1,4 +1,5 @@
 //@ edition: 2024
+//@ only-aarch64
 #![allow(internal_features, unused_imports, unused_macros)]
 #![feature(extern_types)]
 #![feature(gen_blocks)]
diff --git a/tests/ui/scalable-vectors/invalid.stderr b/tests/ui/scalable-vectors/invalid.stderr
index d73b5abf7030f..a8ef99e2f8bc5 100644
--- a/tests/ui/scalable-vectors/invalid.stderr
+++ b/tests/ui/scalable-vectors/invalid.stderr
@@ -1,11 +1,11 @@
 error: allow, cfg, cfg_attr, deny, expect, forbid, and warn are the only allowed built-in attributes in function parameters
-  --> $DIR/invalid.rs:109:11
+  --> $DIR/invalid.rs:110:11
    |
 LL | fn barqux(#[rustc_scalable_vector(4)] _x: u32) {}
    |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on extern crates
-  --> $DIR/invalid.rs:9:1
+  --> $DIR/invalid.rs:10:1
    |
 LL | #[rustc_scalable_vector(4)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -13,7 +13,7 @@ LL | #[rustc_scalable_vector(4)]
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on use statements
-  --> $DIR/invalid.rs:13:1
+  --> $DIR/invalid.rs:14:1
    |
 LL | #[rustc_scalable_vector(4)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -21,7 +21,7 @@ LL | #[rustc_scalable_vector(4)]
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on statics
-  --> $DIR/invalid.rs:17:1
+  --> $DIR/invalid.rs:18:1
    |
 LL | #[rustc_scalable_vector(4)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -29,7 +29,7 @@ LL | #[rustc_scalable_vector(4)]
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on constants
-  --> $DIR/invalid.rs:21:1
+  --> $DIR/invalid.rs:22:1
    |
 LL | #[rustc_scalable_vector(4)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -37,7 +37,7 @@ LL | #[rustc_scalable_vector(4)]
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on modules
-  --> $DIR/invalid.rs:25:1
+  --> $DIR/invalid.rs:26:1
    |
 LL | #[rustc_scalable_vector(4)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -45,7 +45,7 @@ LL | #[rustc_scalable_vector(4)]
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on foreign modules
-  --> $DIR/invalid.rs:30:1
+  --> $DIR/invalid.rs:31:1
    |
 LL | #[rustc_scalable_vector(4)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -53,7 +53,7 @@ LL | #[rustc_scalable_vector(4)]
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on foreign statics
-  --> $DIR/invalid.rs:33:5
+  --> $DIR/invalid.rs:34:5
    |
 LL |     #[rustc_scalable_vector(4)]
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -61,7 +61,7 @@ LL |     #[rustc_scalable_vector(4)]
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on foreign types
-  --> $DIR/invalid.rs:36:5
+  --> $DIR/invalid.rs:37:5
    |
 LL |     #[rustc_scalable_vector(4)]
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -69,7 +69,7 @@ LL |     #[rustc_scalable_vector(4)]
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on foreign functions
-  --> $DIR/invalid.rs:39:5
+  --> $DIR/invalid.rs:40:5
    |
 LL |     #[rustc_scalable_vector(4)]
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -77,7 +77,7 @@ LL |     #[rustc_scalable_vector(4)]
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on type aliases
-  --> $DIR/invalid.rs:44:1
+  --> $DIR/invalid.rs:45:1
    |
 LL | #[rustc_scalable_vector(4)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -85,7 +85,7 @@ LL | #[rustc_scalable_vector(4)]
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on enums
-  --> $DIR/invalid.rs:48:1
+  --> $DIR/invalid.rs:49:1
    |
 LL | #[rustc_scalable_vector(4)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -93,7 +93,7 @@ LL | #[rustc_scalable_vector(4)]
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on type parameters
-  --> $DIR/invalid.rs:50:10
+  --> $DIR/invalid.rs:51:10
    |
 LL | enum Bar<#[rustc_scalable_vector(4)] T> {
    |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -101,7 +101,7 @@ LL | enum Bar<#[rustc_scalable_vector(4)] T> {
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on enum variants
-  --> $DIR/invalid.rs:52:5
+  --> $DIR/invalid.rs:53:5
    |
 LL |     #[rustc_scalable_vector(4)]
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -109,7 +109,7 @@ LL |     #[rustc_scalable_vector(4)]
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on struct fields
-  --> $DIR/invalid.rs:58:5
+  --> $DIR/invalid.rs:59:5
    |
 LL |     #[rustc_scalable_vector(4)]
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -117,7 +117,7 @@ LL |     #[rustc_scalable_vector(4)]
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on unions
-  --> $DIR/invalid.rs:63:1
+  --> $DIR/invalid.rs:64:1
    |
 LL | #[rustc_scalable_vector(4)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -125,7 +125,7 @@ LL | #[rustc_scalable_vector(4)]
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on traits
-  --> $DIR/invalid.rs:70:1
+  --> $DIR/invalid.rs:71:1
    |
 LL | #[rustc_scalable_vector(4)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -133,7 +133,7 @@ LL | #[rustc_scalable_vector(4)]
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on associated types
-  --> $DIR/invalid.rs:73:5
+  --> $DIR/invalid.rs:74:5
    |
 LL |     #[rustc_scalable_vector(4)]
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -141,7 +141,7 @@ LL |     #[rustc_scalable_vector(4)]
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on associated consts
-  --> $DIR/invalid.rs:76:5
+  --> $DIR/invalid.rs:77:5
    |
 LL |     #[rustc_scalable_vector(4)]
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -149,7 +149,7 @@ LL |     #[rustc_scalable_vector(4)]
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on provided trait methods
-  --> $DIR/invalid.rs:79:5
+  --> $DIR/invalid.rs:80:5
    |
 LL |     #[rustc_scalable_vector(4)]
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -157,7 +157,7 @@ LL |     #[rustc_scalable_vector(4)]
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on trait aliases
-  --> $DIR/invalid.rs:84:1
+  --> $DIR/invalid.rs:85:1
    |
 LL | #[rustc_scalable_vector(4)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -165,7 +165,7 @@ LL | #[rustc_scalable_vector(4)]
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on inherent impl blocks
-  --> $DIR/invalid.rs:88:1
+  --> $DIR/invalid.rs:89:1
    |
 LL | #[rustc_scalable_vector(4)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -173,7 +173,7 @@ LL | #[rustc_scalable_vector(4)]
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on inherent methods
-  --> $DIR/invalid.rs:91:5
+  --> $DIR/invalid.rs:92:5
    |
 LL |     #[rustc_scalable_vector(4)]
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -181,7 +181,7 @@ LL |     #[rustc_scalable_vector(4)]
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on trait impl blocks
-  --> $DIR/invalid.rs:96:1
+  --> $DIR/invalid.rs:97:1
    |
 LL | #[rustc_scalable_vector(4)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -189,7 +189,7 @@ LL | #[rustc_scalable_vector(4)]
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on macro defs
-  --> $DIR/invalid.rs:103:1
+  --> $DIR/invalid.rs:104:1
    |
 LL | #[rustc_scalable_vector(4)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -197,7 +197,7 @@ LL | #[rustc_scalable_vector(4)]
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on functions
-  --> $DIR/invalid.rs:107:1
+  --> $DIR/invalid.rs:108:1
    |
 LL | #[rustc_scalable_vector(4)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -205,7 +205,7 @@ LL | #[rustc_scalable_vector(4)]
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on function params
-  --> $DIR/invalid.rs:109:11
+  --> $DIR/invalid.rs:110:11
    |
 LL | fn barqux(#[rustc_scalable_vector(4)] _x: u32) {}
    |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -213,7 +213,7 @@ LL | fn barqux(#[rustc_scalable_vector(4)] _x: u32) {}
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on functions
-  --> $DIR/invalid.rs:113:1
+  --> $DIR/invalid.rs:114:1
    |
 LL | #[rustc_scalable_vector(4)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -221,7 +221,7 @@ LL | #[rustc_scalable_vector(4)]
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on functions
-  --> $DIR/invalid.rs:117:1
+  --> $DIR/invalid.rs:118:1
    |
 LL | #[rustc_scalable_vector(4)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -229,7 +229,7 @@ LL | #[rustc_scalable_vector(4)]
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on functions
-  --> $DIR/invalid.rs:121:1
+  --> $DIR/invalid.rs:122:1
    |
 LL | #[rustc_scalable_vector(4)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -237,7 +237,7 @@ LL | #[rustc_scalable_vector(4)]
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on closures
-  --> $DIR/invalid.rs:126:14
+  --> $DIR/invalid.rs:127:14
    |
 LL |     let _x = #[rustc_scalable_vector(4)] || { };
    |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -245,7 +245,7 @@ LL |     let _x = #[rustc_scalable_vector(4)] || { };
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on expressions
-  --> $DIR/invalid.rs:128:14
+  --> $DIR/invalid.rs:129:14
    |
 LL |     let _y = #[rustc_scalable_vector(4)] 3 + 4;
    |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -253,7 +253,7 @@ LL |     let _y = #[rustc_scalable_vector(4)] 3 + 4;
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on statements
-  --> $DIR/invalid.rs:130:5
+  --> $DIR/invalid.rs:131:5
    |
 LL |     #[rustc_scalable_vector(4)]
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -261,7 +261,7 @@ LL |     #[rustc_scalable_vector(4)]
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error: `#[rustc_scalable_vector]` attribute cannot be used on match arms
-  --> $DIR/invalid.rs:135:9
+  --> $DIR/invalid.rs:136:9
    |
 LL |         #[rustc_scalable_vector(4)]
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -269,7 +269,7 @@ LL |         #[rustc_scalable_vector(4)]
    = help: `#[rustc_scalable_vector]` can only be applied to structs
 
 error[E0539]: malformed `rustc_scalable_vector` attribute input
-  --> $DIR/invalid.rs:142:1
+  --> $DIR/invalid.rs:143:1
    |
 LL | #[rustc_scalable_vector("4")]
    | ^^^^^^^^^^^^^^^^^^^^^^^^---^^
@@ -286,7 +286,7 @@ LL + #[rustc_scalable_vector]
    |
 
 error[E0805]: malformed `rustc_scalable_vector` attribute input
-  --> $DIR/invalid.rs:146:1
+  --> $DIR/invalid.rs:147:1
    |
 LL | #[rustc_scalable_vector(4, 2)]
    | ^^^^^^^^^^^^^^^^^^^^^^^------^
@@ -303,7 +303,7 @@ LL + #[rustc_scalable_vector]
    |
 
 error[E0539]: malformed `rustc_scalable_vector` attribute input
-  --> $DIR/invalid.rs:150:1
+  --> $DIR/invalid.rs:151:1
    |
 LL | #[rustc_scalable_vector(count = "4")]
    | ^^^^^^^^^^^^^^^^^^^^^^^^-----------^^
@@ -320,7 +320,7 @@ LL + #[rustc_scalable_vector]
    |
 
 error: element count in `rustc_scalable_vector` is too large: `65536`
-  --> $DIR/invalid.rs:154:1
+  --> $DIR/invalid.rs:155:1
    |
 LL | #[rustc_scalable_vector(65536)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -328,7 +328,7 @@ LL | #[rustc_scalable_vector(65536)]
    = note: the value may not exceed `u16::MAX`
 
 error: scalable vector structs can only have scalable vector fields
-  --> $DIR/invalid.rs:162:18
+  --> $DIR/invalid.rs:163:18
    |
 LL | struct OkayNoArg(f32);
    |                  ^^^
diff --git a/tests/ui/scalable-vectors/wellformed-arrays.rs b/tests/ui/scalable-vectors/wellformed-arrays.rs
index b8f0bf291eea4..6a26a8595fa64 100644
--- a/tests/ui/scalable-vectors/wellformed-arrays.rs
+++ b/tests/ui/scalable-vectors/wellformed-arrays.rs
@@ -1,5 +1,6 @@
 //@ check-pass
 //@ compile-flags: --crate-type=lib
+//@ only-aarch64
 #![feature(rustc_attrs)]
 
 #[rustc_scalable_vector(16)]
diff --git a/tests/ui/scalable-vectors/wellformed.rs b/tests/ui/scalable-vectors/wellformed.rs
index cb6a22d6c4338..da300d53ef88a 100644
--- a/tests/ui/scalable-vectors/wellformed.rs
+++ b/tests/ui/scalable-vectors/wellformed.rs
@@ -1,5 +1,6 @@
 //@ check-pass
 //@ compile-flags: --crate-type=lib
+//@ only-aarch64
 #![feature(rustc_attrs)]
 
 #[rustc_scalable_vector(16)]