diff --git a/lib/libc/arch/x86_64/sys/syscall.S b/lib/libc/arch/x86_64/sys/syscall.S
index b4197fdfb32f..e802b61fbe3e 100644
--- a/lib/libc/arch/x86_64/sys/syscall.S
+++ b/lib/libc/arch/x86_64/sys/syscall.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: syscall.S,v 1.3 2003/08/07 16:42:38 agc Exp $	*/
+/*	$NetBSD: syscall.S,v 1.4 2007/11/05 20:30:07 dsl Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -36,20 +36,9 @@
 
 #include <machine/asm.h>
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: syscall.S,v 1.3 2003/08/07 16:42:38 agc Exp $")
+	RCSID("$NetBSD: syscall.S,v 1.4 2007/11/05 20:30:07 dsl Exp $")
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include "SYS.h"
 
-ENTRY(syscall)
-	movl	%edi,%eax
-	syscall
-	jc	err
-	ret
-err:
-#ifdef PIC
-	movq	PIC_GOT(CERROR), %rcx
-	jmp	*%rcx
-#else
-	jmp	CERROR
-#endif
+RSYSCALL(syscall)