diff --git a/test/llvm_targets.zig b/test/llvm_targets.zig
index 8e9a070d93..33d7be42a9 100644
--- a/test/llvm_targets.zig
+++ b/test/llvm_targets.zig
@@ -125,8 +125,6 @@ const targets = [_]std.Target.Query{
     // .{ .cpu_arch = .m68k, .os_tag = .netbsd, .abi = .none },
     // .{ .cpu_arch = .m68k, .os_tag = .rtems, .abi = .none },
 
-    .{ .cpu_arch = .mips, .os_tag = .freebsd, .abi = .eabi },
-    .{ .cpu_arch = .mips, .os_tag = .freebsd, .abi = .eabihf },
     .{ .cpu_arch = .mips, .os_tag = .freestanding, .abi = .eabi },
     .{ .cpu_arch = .mips, .os_tag = .freestanding, .abi = .eabihf },
     .{ .cpu_arch = .mips, .os_tag = .linux, .abi = .eabi },
@@ -140,8 +138,6 @@ const targets = [_]std.Target.Query{
     .{ .cpu_arch = .mips, .os_tag = .rtems, .abi = .eabi },
     .{ .cpu_arch = .mips, .os_tag = .rtems, .abi = .eabihf },
 
-    .{ .cpu_arch = .mipsel, .os_tag = .freebsd, .abi = .eabi },
-    .{ .cpu_arch = .mipsel, .os_tag = .freebsd, .abi = .eabihf },
     .{ .cpu_arch = .mipsel, .os_tag = .freestanding, .abi = .eabi },
     .{ .cpu_arch = .mipsel, .os_tag = .freestanding, .abi = .eabihf },
     .{ .cpu_arch = .mipsel, .os_tag = .linux, .abi = .eabi },
@@ -155,7 +151,6 @@ const targets = [_]std.Target.Query{
     .{ .cpu_arch = .mipsel, .os_tag = .rtems, .abi = .eabi },
     .{ .cpu_arch = .mipsel, .os_tag = .rtems, .abi = .eabihf },
 
-    .{ .cpu_arch = .mips64, .os_tag = .freebsd, .abi = .none },
     .{ .cpu_arch = .mips64, .os_tag = .freestanding, .abi = .none },
     .{ .cpu_arch = .mips64, .os_tag = .linux, .abi = .gnuabi64 },
     .{ .cpu_arch = .mips64, .os_tag = .linux, .abi = .gnuabin32 },
@@ -165,7 +160,6 @@ const targets = [_]std.Target.Query{
     .{ .cpu_arch = .mips64, .os_tag = .netbsd, .abi = .none },
     .{ .cpu_arch = .mips64, .os_tag = .openbsd, .abi = .none },
 
-    .{ .cpu_arch = .mips64el, .os_tag = .freebsd, .abi = .none },
     .{ .cpu_arch = .mips64el, .os_tag = .freestanding, .abi = .none },
     .{ .cpu_arch = .mips64el, .os_tag = .linux, .abi = .gnuabi64 },
     .{ .cpu_arch = .mips64el, .os_tag = .linux, .abi = .gnuabin32 },
@@ -248,16 +242,13 @@ const targets = [_]std.Target.Query{
     // .{ .cpu_arch = .s390x, .os_tag = .zos, .abi = .none },
 
     // .{ .cpu_arch = .sparc, .os_tag = .freestanding, .abi = .none },
-    // .{ .cpu_arch = .sparc, .os_tag = .illumos, .abi = .none },
     // .{ .cpu_arch = .sparc, .os_tag = .linux, .abi = .gnu },
     // .{ .cpu_arch = .sparc, .os_tag = .linux, .abi = .none },
     // .{ .cpu_arch = .sparc, .os_tag = .netbsd, .abi = .none },
     // .{ .cpu_arch = .sparc, .os_tag = .rtems, .abi = .none },
-    // .{ .cpu_arch = .sparc, .os_tag = .solaris, .abi = .none },
 
     .{ .cpu_arch = .sparc64, .os_tag = .freestanding, .abi = .none },
     .{ .cpu_arch = .sparc64, .os_tag = .haiku, .abi = .none },
-    .{ .cpu_arch = .sparc64, .os_tag = .illumos, .abi = .none },
     .{ .cpu_arch = .sparc64, .os_tag = .linux, .abi = .gnu },
     .{ .cpu_arch = .sparc64, .os_tag = .linux, .abi = .none },
     .{ .cpu_arch = .sparc64, .os_tag = .netbsd, .abi = .none },
@@ -269,33 +260,22 @@ const targets = [_]std.Target.Query{
     .{ .cpu_arch = .thumb, .os_tag = .freebsd, .abi = .eabihf },
     .{ .cpu_arch = .thumb, .os_tag = .freestanding, .abi = .eabi },
     .{ .cpu_arch = .thumb, .os_tag = .freestanding, .abi = .eabihf },
-    .{ .cpu_arch = .thumb, .os_tag = .haiku, .abi = .eabi },
-    .{ .cpu_arch = .thumb, .os_tag = .haiku, .abi = .eabihf },
-    .{ .cpu_arch = .thumb, .os_tag = .linux, .abi = .androideabi },
     .{ .cpu_arch = .thumb, .os_tag = .linux, .abi = .eabi },
     .{ .cpu_arch = .thumb, .os_tag = .linux, .abi = .eabihf },
     .{ .cpu_arch = .thumb, .os_tag = .linux, .abi = .musleabi },
     .{ .cpu_arch = .thumb, .os_tag = .linux, .abi = .musleabihf },
-    .{ .cpu_arch = .thumb, .os_tag = .netbsd, .abi = .eabi },
-    .{ .cpu_arch = .thumb, .os_tag = .netbsd, .abi = .eabihf },
-    .{ .cpu_arch = .thumb, .os_tag = .openbsd, .abi = .eabi },
-    .{ .cpu_arch = .thumb, .os_tag = .openbsd, .abi = .eabihf },
     .{ .cpu_arch = .thumb, .os_tag = .rtems, .abi = .eabi },
     .{ .cpu_arch = .thumb, .os_tag = .rtems, .abi = .eabihf },
     .{ .cpu_arch = .thumb, .os_tag = .windows, .abi = .gnu },
     .{ .cpu_arch = .thumb, .os_tag = .windows, .abi = .itanium },
     .{ .cpu_arch = .thumb, .os_tag = .windows, .abi = .msvc },
 
-    .{ .cpu_arch = .thumbeb, .os_tag = .freebsd, .abi = .eabi },
-    .{ .cpu_arch = .thumbeb, .os_tag = .freebsd, .abi = .eabihf },
     .{ .cpu_arch = .thumbeb, .os_tag = .freestanding, .abi = .eabi },
     .{ .cpu_arch = .thumbeb, .os_tag = .freestanding, .abi = .eabihf },
     .{ .cpu_arch = .thumbeb, .os_tag = .linux, .abi = .eabi },
     .{ .cpu_arch = .thumbeb, .os_tag = .linux, .abi = .eabihf },
     .{ .cpu_arch = .thumbeb, .os_tag = .linux, .abi = .musleabi },
     .{ .cpu_arch = .thumbeb, .os_tag = .linux, .abi = .musleabihf },
-    .{ .cpu_arch = .thumbeb, .os_tag = .netbsd, .abi = .eabi },
-    .{ .cpu_arch = .thumbeb, .os_tag = .netbsd, .abi = .eabihf },
     .{ .cpu_arch = .thumbeb, .os_tag = .rtems, .abi = .eabi },
     .{ .cpu_arch = .thumbeb, .os_tag = .rtems, .abi = .eabihf },
 
@@ -325,7 +305,6 @@ const targets = [_]std.Target.Query{
     .{ .cpu_arch = .x86, .os_tag = .netbsd, .abi = .none },
     .{ .cpu_arch = .x86, .os_tag = .openbsd, .abi = .none },
     .{ .cpu_arch = .x86, .os_tag = .rtems, .abi = .none },
-    .{ .cpu_arch = .x86, .os_tag = .solaris, .abi = .none },
     .{ .cpu_arch = .x86, .os_tag = .uefi, .abi = .none },
     .{ .cpu_arch = .x86, .os_tag = .windows, .abi = .cygnus },
     .{ .cpu_arch = .x86, .os_tag = .windows, .abi = .gnu },