diff --git a/core/mem/mem.odin b/core/mem/mem.odin
index 2b11629d2..144ba07a8 100644
--- a/core/mem/mem.odin
+++ b/core/mem/mem.odin
@@ -12,7 +12,18 @@ swap :: proc{swap16, swap32, swap64};
 
 
 set :: proc "contextless" (data: rawptr, value: byte, len: int) -> rawptr {
-	return runtime.memset(data, i32(value), len);
+	foreign _ {
+		when size_of(rawptr) == 8 {
+			@(link_name="llvm.memset.p0i8.i64")
+			llvm_memset :: proc(dst: rawptr, val: byte, len: int, align: i32, is_volatile: bool) ---;
+		} else {
+			@(link_name="llvm.memset.p0i8.i32")
+			llvm_memset :: proc(dst: rawptr, val: byte, len: int, align: i32, is_volatile: bool) ---;
+		}
+	}
+
+	llvm_memset(data, value, len, 1, false);
+	return data;
 }
 zero :: inline proc "contextless" (data: rawptr, len: int) -> rawptr {
 	return set(data, 0, len);
diff --git a/core/runtime/procs_everything_else.odin b/core/runtime/procs_everything_else.odin
index 8423fc451..6dbc89877 100644
--- a/core/runtime/procs_everything_else.odin
+++ b/core/runtime/procs_everything_else.odin
@@ -3,25 +3,28 @@ package runtime
 
 @(link_name="memset")
 memset :: proc "c" (ptr: rawptr, val: i32, len: int) -> rawptr {
-when false {
-	b := byte(val);
+	when false {
+		b := byte(val);
 
-	p_start := uintptr(ptr);
-	p_end := p + uintptr(max(len, 0));
-	for p := p_start; p < p_end; p += 1 {
-		(^byte)(p)^ = b;
-	}
+		p_start := uintptr(ptr);
+		p_end := p + uintptr(max(len, 0));
+		for p := p_start; p < p_end; p += 1 {
+			(^byte)(p)^ = b;
+		}
 
-	return ptr;
-} else {
-	when size_of(rawptr) == 8 {
-		@(link_name="llvm.memset.p0i8.i64")
-		llvm_memset :: proc(dst: rawptr, val: byte, len: int, align: i32, is_volatile: bool) ---;
+		return ptr;
 	} else {
-		@(link_name="llvm.memset.p0i8.i32")
-		llvm_memset :: proc(dst: rawptr, val: byte, len: int, align: i32, is_volatile: bool) ---;
-	}
+		foreign _ {
+			when size_of(rawptr) == 8 {
+				@(link_name="llvm.memset.p0i8.i64")
+				llvm_memset :: proc(dst: rawptr, val: byte, len: int, align: i32, is_volatile: bool) ---;
+			} else {
+				@(link_name="llvm.memset.p0i8.i32")
+				llvm_memset :: proc(dst: rawptr, val: byte, len: int, align: i32, is_volatile: bool) ---;
+			}
 
-	return llvm_memset(ptr, byte(val), len, 1, false);
-}
+		}
+		llvm_memset(ptr, byte(val), len, 1, false);
+		return ptr;
+	}
 }