Rename __sysctl syscall to just sysctl, as the userland wrapper is no longer

necessary

ok deraadt@ jsing@

3 files changed, 7 insertions, 7 deletions

diff --git a/lib/libc/Symbols.list b/lib/libc/Symbols.list
index de0ca20999f..900cdd2b347 100644
--- a/lib/libc/Symbols.list
+++ b/lib/libc/Symbols.list
@@ -43,7 +43,6 @@ _thread_sys___getcwd
 _thread_sys___semctl
 _thread_sys___set_tcb
 _thread_sys___syscall
-_thread_sys___sysctl
 _thread_sys___threxit
 _thread_sys___thrsigdivert
 _thread_sys___thrsleep
@@ -229,6 +228,7 @@ _thread_sys_symlink
 _thread_sys_symlinkat
 _thread_sys_sync
 _thread_sys_sysarch
+_thread_sys_sysctl
 _thread_sys_tame
 _thread_sys_truncate
 _thread_sys_umask
diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
index 981850d70b6..b41f08ab8c7 100644
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.69 2015/09/06 20:26:20 guenther Exp $
+#	$OpenBSD: Makefile.inc,v 1.70 2015/09/13 17:08:03 guenther Exp $
 
 # gen sources
 .PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/gen ${LIBCSRCDIR}/gen
@@ -20,7 +20,7 @@ SRCS+=  alarm.c assert.c auth_subr.c authenticate.c \
         rewinddir.c scandir.c seekdir.c setdomainname.c sethostname.c \
         setprogname.c setjmperr.c setmode.c setproctitle.c shm_open.c \
         siginterrupt.c siglist.c signal.c signame.c \
-        sigsetops.c sleep.c statvfs.c strtofflags.c sysconf.c sysctl.c \
+        sigsetops.c sleep.c statvfs.c strtofflags.c sysconf.c \
         syslog.c syslog_r.c telldir.c time.c times.c \
         tolower_.c ttyname.c \
         ttyslot.c toupper_.c ualarm.c uname.c unvis.c usleep.c \
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index 0b72e7fb80c..b3d83a013c3 100644
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.129 2015/09/09 09:16:39 guenther Exp $
+#	$OpenBSD: Makefile.inc,v 1.130 2015/09/13 17:08:03 guenther Exp $
 #	$NetBSD: Makefile.inc,v 1.35 1995/10/16 23:49:07 jtc Exp $
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/17/93
 
@@ -25,7 +25,7 @@ SRCS+=	stack_protector.c
 # modules with default implementations on all architectures, unless overridden
 # below:
 ASM=	__get_tcb.o __getcwd.o __semctl.o __set_tcb.o __syscall.o \
-	__sysctl.o __threxit.o __thrsigdivert.o __thrsleep.o \
+	__threxit.o __thrsigdivert.o __thrsleep.o \
 	__thrwakeup.o accept.o accept4.o access.o acct.o adjfreq.o adjtime.o \
 	bind.o chdir.o chflags.o chflagsat.o chmod.o chown.o chroot.o \
 	clock_getres.o clock_gettime.o clock_settime.o close.o \
@@ -55,8 +55,8 @@ ASM=	__get_tcb.o __getcwd.o __semctl.o __set_tcb.o __syscall.o \
 	setreuid.o setrlimit.o setrtable.o setsid.o setsockopt.o \
 	settimeofday.o setuid.o shmat.o shmctl.o shmdt.o \
 	shmget.o shutdown.o sigaction.o sigaltstack.o socket.o \
-	socketpair.o stat.o statfs.o swapctl.o symlink.o \
-	symlinkat.o sync.o sysarch.o tame.o umask.o unlink.o unlinkat.o \
+	socketpair.o stat.o statfs.o swapctl.o symlink.o symlinkat.o \
+	sync.o sysarch.o sysctl.o tame.o umask.o unlink.o unlinkat.o \
 	unmount.o utimensat.o utimes.o utrace.o wait4.o write.o writev.o
 
 SRCS+=	${SRCS_${MACHINE_CPU}}