10 files changed, 18 insertions, 48 deletions

diff --git a/lib/libc/aarch64/sys/Makefile.inc b/lib/libc/aarch64/sys/Makefile.inc
index 1329ee8ba3220..60f9a98eea5c9 100644
--- a/lib/libc/aarch64/sys/Makefile.inc
+++ b/lib/libc/aarch64/sys/Makefile.inc
@@ -11,13 +11,5 @@ MDASM=	cerror.S \
 	vfork.S
 
 # Don't generate default code for these syscalls:
-NOASM=	break.o \
-	exit.o \
-	getlogin.o \
-	sbrk.o \
-	sstk.o \
-	vfork.o \
-	yield.o
-
-PSEUDO= _exit.o \
-	_getlogin.o
+NOASM+=	sbrk.o \
+	vfork.o
diff --git a/lib/libc/amd64/sys/Makefile.inc b/lib/libc/amd64/sys/Makefile.inc
index 04d529d0f23a2..d208f0fcc1111 100644
--- a/lib/libc/amd64/sys/Makefile.inc
+++ b/lib/libc/amd64/sys/Makefile.inc
@@ -8,6 +8,4 @@ MDASM=	vfork.S brk.S cerror.S exect.S getcontext.S \
 	sbrk.S setlogin.S sigreturn.S
 
 # Don't generate default code for these syscalls:
-NOASM=	break.o exit.o getlogin.o sstk.o vfork.o yield.o
-
-PSEUDO=	_getlogin.o _exit.o
+NOASM+=	vfork.o
diff --git a/lib/libc/arm/sys/Makefile.inc b/lib/libc/arm/sys/Makefile.inc
index f155e1f0c0f76..9b53030dd3c63 100644
--- a/lib/libc/arm/sys/Makefile.inc
+++ b/lib/libc/arm/sys/Makefile.inc
@@ -5,6 +5,4 @@ SRCS+=	__vdso_gettc.c
 MDASM= Ovfork.S brk.S cerror.S sbrk.S shmat.S sigreturn.S syscall.S
 
 # Don't generate default code for these syscalls:
-NOASM=	break.o exit.o getlogin.o sstk.o vfork.o yield.o
-
-PSEUDO= _exit.o _getlogin.o
+NOASM+=	vfork.o
diff --git a/lib/libc/i386/sys/Makefile.inc b/lib/libc/i386/sys/Makefile.inc
index 30b480eccbd9d..450948ec7f2f0 100644
--- a/lib/libc/i386/sys/Makefile.inc
+++ b/lib/libc/i386/sys/Makefile.inc
@@ -10,10 +10,7 @@ SRCS+=	i386_get_fsbase.c i386_get_gsbase.c i386_get_ioperm.c i386_get_ldt.c \
 MDASM=	Ovfork.S brk.S cerror.S exect.S getcontext.S \
 	sbrk.S setlogin.S sigreturn.S syscall.S
 
-# Don't generate default code for these syscalls:
-NOASM=	break.o exit.o getlogin.o sstk.o vfork.o yield.o
-
-PSEUDO=	_getlogin.o _exit.o
+NOASM+=	vfork.o
 
 MAN+=	i386_get_ioperm.2 i386_get_ldt.2 i386_vm86.2
 MAN+=	i386_set_watch.3
diff --git a/lib/libc/mips/sys/Makefile.inc b/lib/libc/mips/sys/Makefile.inc
index c9ea0402c3b8e..f8af45378b90c 100644
--- a/lib/libc/mips/sys/Makefile.inc
+++ b/lib/libc/mips/sys/Makefile.inc
@@ -6,6 +6,4 @@ MDASM=  Ovfork.S brk.S cerror.S exect.S \
 	sbrk.S syscall.S
 
 # Don't generate default code for these syscalls:
-NOASM=	break.o exit.o getlogin.o sstk.o vfork.o yield.o
-
-PSEUDO= _exit.o _getlogin.o
+NOASM+=	vfork.o
diff --git a/lib/libc/powerpc/sys/Makefile.inc b/lib/libc/powerpc/sys/Makefile.inc
index c37bd901bd917..edb469c6fbcf7 100644
--- a/lib/libc/powerpc/sys/Makefile.inc
+++ b/lib/libc/powerpc/sys/Makefile.inc
@@ -1,8 +1,3 @@
 # $FreeBSD$
 
 MDASM+=	brk.S cerror.S exect.S sbrk.S setlogin.S
-
-# Don't generate default code for these syscalls:
-NOASM=	break.o exit.o getlogin.o sstk.o yield.o
-
-PSEUDO=	_getlogin.o _exit.o
diff --git a/lib/libc/powerpc64/sys/Makefile.inc b/lib/libc/powerpc64/sys/Makefile.inc
index c37bd901bd917..edb469c6fbcf7 100644
--- a/lib/libc/powerpc64/sys/Makefile.inc
+++ b/lib/libc/powerpc64/sys/Makefile.inc
@@ -1,8 +1,3 @@
 # $FreeBSD$
 
 MDASM+=	brk.S cerror.S exect.S sbrk.S setlogin.S
-
-# Don't generate default code for these syscalls:
-NOASM=	break.o exit.o getlogin.o sstk.o yield.o
-
-PSEUDO=	_getlogin.o _exit.o
diff --git a/lib/libc/riscv/sys/Makefile.inc b/lib/libc/riscv/sys/Makefile.inc
index 1e1abc744096f..00f1af11df35f 100644
--- a/lib/libc/riscv/sys/Makefile.inc
+++ b/lib/libc/riscv/sys/Makefile.inc
@@ -10,13 +10,4 @@ MDASM=	cerror.S \
 	vfork.S
 
 # Don't generate default code for these syscalls:
-NOASM=	break.o \
-	exit.o \
-	getlogin.o \
-	sbrk.o \
-	sstk.o \
-	vfork.o \
-	yield.o
-
-PSEUDO= _exit.o \
-	_getlogin.o
+NOASM+=	vfork.o
diff --git a/lib/libc/sparc64/sys/Makefile.inc b/lib/libc/sparc64/sys/Makefile.inc
index 6a226bb71d26c..65e1353cb6ac5 100644
--- a/lib/libc/sparc64/sys/Makefile.inc
+++ b/lib/libc/sparc64/sys/Makefile.inc
@@ -13,8 +13,3 @@ SRCS+=	__sparc_sigtramp_setup.c \
 CFLAGS+= -I${LIBC_SRCTOP}/sparc64/fpu
 
 MDASM+=	brk.S cerror.S exect.S sbrk.S setlogin.S sigaction1.S
-
-# Don't generate default code for these syscalls:
-NOASM=	break.o exit.o getlogin.o sstk.o yield.o
-
-PSEUDO=	_getlogin.o _exit.o
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index 2778cad915a42..88cf0cc813b5b 100644
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -12,7 +12,18 @@
 #
 # MDASM names override the default syscall names in MIASM.
 # NOASM will prevent the default syscall code from being generated.
+# PSEUDO generates _<sys>() and __sys_<sys>() symbols, but not <sys>().
 #
+# While historically machine dependent, all archictures have the following
+# declerations in common:
+#
+NOASM=	break.o \
+	exit.o \
+	getlogin.o \
+	sstk.o \
+	yield.o
+PSEUDO=	_exit.o \
+	_getlogin.o
 .sinclude "${LIBC_SRCTOP}/${LIBC_ARCH}/sys/Makefile.inc"
 
 SRCS+= clock_gettime.c gettimeofday.c __vdso_gettimeofday.c