diff --git a/lib/libc/alpha/SYS.h b/lib/libc/alpha/SYS.h
index 778f73aef1e..a7d9b69638f 100644
--- a/lib/libc/alpha/SYS.h
+++ b/lib/libc/alpha/SYS.h
@@ -104,7 +104,7 @@ END(___CONCAT(_thread_sys_,name))
 
 #define	PSYSCALL(name)						\
 PLEAF(name,0);				/* XXX # of args? */	\
-	WEAK_ALIAS(__CONCAT(_thread_sys_,name), name);		\
+	WEAK_ALIAS(__CONCAT(_,name), name);			\
 	CALLSYS_ERROR(name)
 
 #define	PRSYSCALL(name)						\
@@ -115,7 +115,7 @@ PEND(name)
 
 #define	PPSEUDO(label,name)					\
 PLEAF(label,0);				/* XXX # of args? */	\
-	WEAK_ALIAS(__CONCAT(_thread_sys_,name), name);		\
+	WEAK_ALIAS(__CONCAT(_,name), name);			\
 	CALLSYS_ERROR(name);					\
 	RET;							\
 PEND(label)
diff --git a/lib/libc/amd64/SYS.h b/lib/libc/amd64/SYS.h
index 34942794d96..9195f9bc69a 100644
--- a/lib/libc/amd64/SYS.h
+++ b/lib/libc/amd64/SYS.h
@@ -71,15 +71,15 @@
  * For the thread_safe versions, we prepend _thread_sys_ to the function
  * name so that the 'C' wrapper can go around the real name.
  */
-#define	PSYSCALL(x)	2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror)); \
-			ENTRY(__CONCAT(_thread_sys_,x)); \
-			.weak CNAME(x); \
-			.set CNAME(x),CNAME(__CONCAT(_thread_sys_,x)); \
+#define	PSYSCALL(x)	2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror));	\
+			ENTRY(__CONCAT(_thread_sys_,x));		\
+			.weak CNAME(x);					\
+			.set CNAME(x),CNAME(__CONCAT(_,x));		\
 			lea __CONCAT(SYS_,x),%eax; KERNCALL; jb 2b
 #define	PRSYSCALL(x)	PSYSCALL(x); ret
-#define	PPSEUDO(x,y)	ENTRY(__CONCAT(_thread_sys_,x)); \
-			.weak CNAME(x); \
-			.set CNAME(x),CNAME(__CONCAT(_thread_sys_,x)); \
+#define	PPSEUDO(x,y)	ENTRY(__CONCAT(_thread_sys_,x));		\
+			.weak CNAME(x);					\
+			.set CNAME(x),CNAME(__CONCAT(_,x));		\
 			lea __CONCAT(SYS_,y), %eax; KERNCALL; ret
 #else
 /*
diff --git a/lib/libc/i386/SYS.h b/lib/libc/i386/SYS.h
index 34942794d96..9195f9bc69a 100644
--- a/lib/libc/i386/SYS.h
+++ b/lib/libc/i386/SYS.h
@@ -71,15 +71,15 @@
  * For the thread_safe versions, we prepend _thread_sys_ to the function
  * name so that the 'C' wrapper can go around the real name.
  */
-#define	PSYSCALL(x)	2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror)); \
-			ENTRY(__CONCAT(_thread_sys_,x)); \
-			.weak CNAME(x); \
-			.set CNAME(x),CNAME(__CONCAT(_thread_sys_,x)); \
+#define	PSYSCALL(x)	2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror));	\
+			ENTRY(__CONCAT(_thread_sys_,x));		\
+			.weak CNAME(x);					\
+			.set CNAME(x),CNAME(__CONCAT(_,x));		\
 			lea __CONCAT(SYS_,x),%eax; KERNCALL; jb 2b
 #define	PRSYSCALL(x)	PSYSCALL(x); ret
-#define	PPSEUDO(x,y)	ENTRY(__CONCAT(_thread_sys_,x)); \
-			.weak CNAME(x); \
-			.set CNAME(x),CNAME(__CONCAT(_thread_sys_,x)); \
+#define	PPSEUDO(x,y)	ENTRY(__CONCAT(_thread_sys_,x));		\
+			.weak CNAME(x);					\
+			.set CNAME(x),CNAME(__CONCAT(_,x));		\
 			lea __CONCAT(SYS_,y), %eax; KERNCALL; ret
 #else
 /*