3 files changed, 33 insertions, 23 deletions

diff --git a/lib/libc/amd64/SYS.h b/lib/libc/amd64/SYS.h
index caea98ff9e23..c8a86f5ee2d5 100644
--- a/lib/libc/amd64/SYS.h
+++ b/lib/libc/amd64/SYS.h
@@ -35,7 +35,7 @@
  *
  *	from: @(#)SYS.h	5.5 (Berkeley) 5/7/91
  *
- *	$Id: SYS.h,v 1.3 1996/01/22 00:00:51 julian Exp $
+ *	$Id: SYS.h,v 1.4 1996/05/05 07:56:03 peter Exp $
  */
 
 #include <sys/syscall.h>
@@ -64,20 +64,38 @@
 #define	SYSCALL(x)	2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror)); ENTRY(x); lea __CONCAT(SYS_,x),%eax; KERNCALL; jb 2b
 #define	RSYSCALL(x)	SYSCALL(x); ret
 
+#define	PSEUDO(x,y)	ENTRY(x); lea __CONCAT(SYS_,y), %eax; KERNCALL; ret
+#define	CALL(x,y)	call CNAME(y); addl $4*x,%esp
+/* gas fucks up offset -- although we don't currently need it, do for BCS */
+#define	LCALL(x,y)	.byte 0x9a ; .long y; .word x
+
+/*
+ * Design note:
+ *
+ * The macros PSYSCALL() and PRSYSCALL() are intended for use where a
+ * syscall needs to be renamed in the threaded library. When building
+ * a normal library, they default to the traditional SYSCALL() and
+ * RSYSCALL(). This avoids the need to #ifdef _THREAD_SAFE everywhere
+ * that the renamed function needs to be called.
+ */
+#ifdef _THREAD_SAFE	/* in case */
 /*
  * For the thread_safe versions, we prepend _thread_sys_ to the function
  * name so that the 'C' wrapper can go around the real name.
  */
-#ifdef _THREAD_SAFE	/* in case */
-#define	PSYSCALL(x,y)	2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror)); ENTRY(y); lea __CONCAT(SYS_,x),%eax; KERNCALL; jb 2b
-#define	PRSYSCALL(x,y)	PSYSCALL(x,y); ret
+#define	PSYSCALL(x)	2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror)); ENTRY(_thread_sys_/**/x); lea __CONCAT(SYS_,x),%eax; KERNCALL; jb 2b
+#define	PRSYSCALL(x)	PSYSCALL(x); ret
+#define	PPSEUDO(x,y)	ENTRY(_thread_sys_/**/x); lea __CONCAT(SYS_,y), %eax; KERNCALL; ret
+#else
+/*
+ * The non-threaded library defaults to traditional syscalls where
+ * the function name matches the syscall name.
+ */
+#define	PSYSCALL(x)	SYSCALL(x)
+#define	PRSYSCALL(x)	RSYSCALL(x)
+#define	PPSEUDO(x,y)	PSEUDO(x,y)
 #endif
 
-#define	PSEUDO(x,y)	ENTRY(x); lea __CONCAT(SYS_,y), %eax; KERNCALL; ret
-#define	CALL(x,y)	call CNAME(y); addl $4*x,%esp
-/* gas fucks up offset -- although we don't currently need it, do for BCS */
-#define	LCALL(x,y)	.byte 0x9a ; .long y; .word x
-
 #ifdef __ELF__
 #define KERNCALL	int $0x80	/* Faster */
 #else
diff --git a/lib/libc/amd64/sys/pipe.S b/lib/libc/amd64/sys/pipe.S
index 0dcf8572096b..d52b189ba536 100644
--- a/lib/libc/amd64/sys/pipe.S
+++ b/lib/libc/amd64/sys/pipe.S
@@ -33,21 +33,17 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: pipe.S,v 1.3 1996/01/22 00:00:58 julian Exp $
+ *	$Id: pipe.S,v 1.4 1996/05/05 07:56:13 peter Exp $
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id: pipe.S,v 1.3 1996/01/22 00:00:58 julian Exp $"
+	.asciz "$Id: pipe.S,v 1.4 1996/05/05 07:56:13 peter Exp $"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
 
-#ifdef _THREAD_SAFE
-PSYSCALL(pipe,_thread_sys_pipe)
-#else
-SYSCALL(pipe)
-#endif
+PSYSCALL(pipe)
 	movl	4(%esp),%ecx
 	movl	%eax,(%ecx)
 	movl	%edx,4(%ecx)
diff --git a/lib/libc/amd64/sys/sigreturn.S b/lib/libc/amd64/sys/sigreturn.S
index cce518b742c3..c685b9198287 100644
--- a/lib/libc/amd64/sys/sigreturn.S
+++ b/lib/libc/amd64/sys/sigreturn.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sigreturn.S,v 1.3 1996/01/22 00:01:00 julian Exp $
+ *	$Id: sigreturn.S,v 1.4 1996/05/05 07:56:19 peter Exp $
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id: sigreturn.S,v 1.3 1996/01/22 00:01:00 julian Exp $"
+	.asciz "$Id: sigreturn.S,v 1.4 1996/05/05 07:56:19 peter Exp $"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
@@ -48,9 +48,5 @@
  * must be saved.   On FreeBSD, this is not the case.
  */
 
-#ifdef _THREAD_SAFE
-PSYSCALL(sigreturn,_thread_sys_sigreturn)
-#else
-SYSCALL(sigreturn)
-#endif
+PSYSCALL(sigreturn)
 	ret