diff --git a/lib/std/Target.zig b/lib/std/Target.zig
index 9638b1ddb0e77e02ee1c04babcc4b3be603b89e0..7ad66e7590e2fa2527361ea1d93d9a02fc6ad24d 100644
--- a/lib/std/Target.zig
+++ b/lib/std/Target.zig
@@ -825,13 +825,13 @@ pub const Abi = enum {
                 // Soft float is usually a sane default for freestanding.
                 .arm,
                 .armeb,
-                .thumb,
-                .thumbeb,
                 .csky,
                 .mips,
                 .mipsel,
                 .powerpc,
                 .powerpcle,
+                .thumb,
+                .thumbeb,
                 => .eabi,
                 else => .none,
             },
@@ -846,20 +846,28 @@ pub const Abi = enum {
             .linux => switch (arch) {
                 .arm,
                 .armeb,
-                .thumb,
-                .thumbeb,
                 .powerpc,
                 .powerpcle,
+                .thumb,
+                .thumbeb,
                 => .musleabihf,
-                // Soft float tends to be more common for CSKY and MIPS.
-                .csky,
-                => .gnueabi, // No musl support.
                 .mips,
                 .mipsel,
                 => .musleabi,
                 .mips64,
                 .mips64el,
                 => .muslabi64,
+
+                // No musl support.
+                .arc,
+                => .gnu,
+                .csky,
+                => .gnueabi,
+
+                // No glibc or musl support.
+                .xtensa,
+                => .none,
+
                 else => .musl,
             },
             .rtems => switch (arch) {