diff --git a/lib/std/special/compiler_rt.zig b/lib/std/special/compiler_rt.zig
index 44db926b5f838035bcd4745378e2210fa0912256..6cdc1271379df2f608c462a31dc03cfb32febf86 100644
--- a/lib/std/special/compiler_rt.zig
+++ b/lib/std/special/compiler_rt.zig
@@ -10,10 +10,29 @@ comptime {
     const strong_linkage = if (is_test) builtin.GlobalLinkage.Internal else builtin.GlobalLinkage.Strong;
 
     switch (builtin.arch) {
-        .i386, .x86_64 => @export(@import("compiler_rt/stack_probe.zig").zig_probe_stack, .{ .name = "__zig_probe_stack", .linkage = linkage }),
-        .aarch64, .aarch64_be, .aarch64_32, .arm, .armeb, .thumb, .thumbeb => {
-            @export(@import("compiler_rt/clear_cache.zig").clear_cache, .{ .name = "__clear_cache", .linkage = linkage });
+        .i386,
+        .x86_64,
+        => @export(@import("compiler_rt/stack_probe.zig").zig_probe_stack, .{
+            .name = "__zig_probe_stack",
+            .linkage = linkage,
+        }),
+
+        .aarch64,
+        .aarch64_be,
+        .aarch64_32,
+        => @export(@import("compiler_rt/clear_cache.zig").clear_cache, .{
+            .name = "__clear_cache",
+            .linkage = linkage,
+        }),
+
+        .arm, .armeb, .thumb, .thumbeb => switch (builtin.os.tag) {
+            .linux => @export(@import("compiler_rt/clear_cache.zig").clear_cache, .{
+                .name = "__clear_cache",
+                .linkage = linkage,
+            }),
+            else => {},
         },
+
         else => {},
     }
 
diff --git a/lib/std/special/compiler_rt/clear_cache.zig b/lib/std/special/compiler_rt/clear_cache.zig
index 5d09a7692d741f0bf7e30700f8d461f3b73a8b19..984ef7e7ac00fa09be3197403c558df4c9e6ae57 100644
--- a/lib/std/special/compiler_rt/clear_cache.zig
+++ b/lib/std/special/compiler_rt/clear_cache.zig
@@ -54,15 +54,10 @@ pub fn clear_cache(start: usize, end: usize) callconv(.C) void {
             //  sysarch(ARM_SYNC_ICACHE, &arg);
             @compileError("TODO: implement for NetBSD/FreeBSD");
         } else if (os == .linux) {
-            const result = std.os.linux.syscall3(
-                std.os.linux.SYS_cacheflush,
-                start,
-                end,
-                0,
-            );
+            const result = std.os.linux.syscall3(std.os.linux.SYS_cacheflush, start, end, 0);
             std.debug.assert(result == 0);
         } else {
-            @compileError("compilerrt_abort");
+            @compileError("no __clear_cache implementation available for this target");
         }
     } else if (os == .linux and mips) {
         @compileError("TODO");