diff --git a/lib/std/Target.zig b/lib/std/Target.zig
index a5799c38986cfc266d3e96009187aa659d83d693..a231892e6e3112c34fc516faf8d1cf62087a85cd 100644
--- a/lib/std/Target.zig
+++ b/lib/std/Target.zig
@@ -857,7 +857,7 @@ pub fn toElfMachine(target: Target) std.elf.EM {
         .powerpc64, .powerpc64le => .PPC64,
         .riscv32, .riscv64 => .RISCV,
         .s390x => .S390,
-        .sparc => .SPARC, // TODO: Should be SPARC32PLUS when targeting 32-bit v9.
+        .sparc => if (Target.sparc.featureSetHas(target.cpu.features, .v9)) .SPARC32PLUS else .SPARC,
         .sparc64 => .SPARCV9,
         .spu_2 => .SPU_2,
         .x86 => .@"386",