Index: head/lib/libc/amd64/string/Makefile.inc
===================================================================
--- head/lib/libc/amd64/string/Makefile.inc
+++ head/lib/libc/amd64/string/Makefile.inc
@@ -2,7 +2,6 @@
 
 MDSRCS+= \
 	bcmp.S \
-	bzero.S \
 	memcmp.S \
 	memcpy.S \
 	memmove.S \
Index: head/lib/libc/amd64/string/bzero.S
===================================================================
--- head/lib/libc/amd64/string/bzero.S
+++ head/lib/libc/amd64/string/bzero.S
@@ -1,7 +0,0 @@
-/*	$FreeBSD */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-#define BZERO
-#include "memset.S"
Index: head/lib/libc/amd64/string/bzero.c
===================================================================
--- head/lib/libc/amd64/string/bzero.c
+++ head/lib/libc/amd64/string/bzero.c
@@ -0,0 +1,15 @@
+/*-
+ * Public domain.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <string.h>
+
+void
+bzero(void *b, size_t len)
+{
+
+	memset(b, 0, len);
+}
Index: head/lib/libc/amd64/string/memset.S
===================================================================
--- head/lib/libc/amd64/string/memset.S
+++ head/lib/libc/amd64/string/memset.S
@@ -31,18 +31,12 @@
 #include <machine/asm.h>
 __FBSDID("$FreeBSD$");
 
-.macro MEMSET bzero erms
-.if \bzero == 1
-	movq	%rsi,%rcx
-	movq	%rsi,%rdx
-	xorl	%eax,%eax
-.else
+.macro MEMSET erms
 	movq	%rdi,%r9
 	movq	%rdx,%rcx
 	movzbq	%sil,%r8
 	movabs	$0x0101010101010101,%rax
 	imulq	%r8,%rax
-.endif
 
 	cmpq	$32,%rcx
 	jb	1016f
@@ -95,9 +89,7 @@
 	jl	1000f
 	movb	%al,(%rdi)
 1000:
-.if \bzero == 0
 	movq	%r9,%rax
-.endif
 	ret
 
 1256:
@@ -112,20 +104,12 @@
 	andb	$7,%cl
 	jne	1004b
 .endif
-.if \bzero == 0
 	movq	%r9,%rax
-.endif
 	ret
 .endm
 
-#ifndef BZERO
 ENTRY(memset)
-	MEMSET bzero=0 erms=0
+	MEMSET erms=0
 END(memset)
-#else
-ENTRY(bzero)
-	MEMSET bzero=1 erms=0
-END(bzero)
-#endif
 
 	.section .note.GNU-stack,"",%progbits