diff --git a/lib/compiler_rt.zig b/lib/compiler_rt.zig
index 0a8621ed13e8e6b4422b7b2554bf29955282f91c..e8a7d8a857f57d56dc737de84d3e0eeddb97a8c2 100644
--- a/lib/compiler_rt.zig
+++ b/lib/compiler_rt.zig
@@ -302,7 +302,6 @@ comptime {
         _ = @import("compiler_rt/memcpy.zig");
         if (!ofmt_c) {
             symbol(&memset, "memset");
-            symbol(&__memset, "__memset");
         }
         _ = @import("compiler_rt/memmove.zig");
         symbol(&memcmp, "memcmp");
@@ -667,12 +666,6 @@ pub fn memset(dest: ?[*]u8, c: u8, len: usize) callconv(.c) ?[*]u8 {
     return dest;
 }
 
-pub fn __memset(dest: ?[*]u8, c: u8, n: usize, dest_n: usize) callconv(.c) ?[*]u8 {
-    if (dest_n < n)
-        @panic("buffer overflow");
-    return memset(dest, c, n);
-}
-
 pub fn bcmp(vl: [*]allowzero const u8, vr: [*]allowzero const u8, n: usize) callconv(.c) c_int {
     @setRuntimeSafety(false);
 
diff --git a/test/standalone/compiler_rt_panic/main.c b/test/standalone/compiler_rt_panic/main.c
index be64216ab7e794616bd77cf5e61980f5fdc381c8..a11df761aaa60fc388163ccd76e82906767d146f 100644
--- a/test/standalone/compiler_rt_panic/main.c
+++ b/test/standalone/compiler_rt_panic/main.c
@@ -1,11 +1,11 @@
 #include <stddef.h>
 
-void* __memset(void* dest, char c, size_t n, size_t dest_n);
+void *__memset_chk(void *dest, int c, size_t n, size_t dest_n);
 
 char foo[128];
 
 int main() {
-    __memset(&foo[0], 0xff, 128, 128);
+    __memset_chk(&foo[0], 0xff, 128, 128);
     return foo[64];
 }