svn commit: r335990 - in head: lib/libc/sys sys/compat/freebsd32 sys/kern

[Brooks Davis]

Author: brooks
Date: Thu Jul  5 16:03:03 2018
New Revision: 335990
URL: https://svnweb.freebsd.org/changeset/base/335990

Log:
  Revert r335983.
  
  The bfd linker in tree doesn't support multiple names for the same
  symbol (at least with current flags).

Deleted:
  head/lib/libc/sys/compat-stub.c
Modified:
  head/lib/libc/sys/Makefile.inc
  head/lib/libc/sys/Symbol.map
  head/sys/compat/freebsd32/syscalls.master
  head/sys/kern/syscalls.master

Modified: head/lib/libc/sys/Makefile.inc
==============================================================================
--- head/lib/libc/sys/Makefile.inc	Thu Jul  5 16:00:58 2018	(r335989)
+++ head/lib/libc/sys/Makefile.inc	Thu Jul  5 16:03:03 2018	(r335990)
@@ -48,8 +48,6 @@ SRCS+= brk.c
 SRCS+= pipe.c
 SRCS+= vadvise.c
 
-SRCS+=	compat-stub.c
-
 INTERPOSED = \
 	accept \
 	accept4 \

Modified: head/lib/libc/sys/Symbol.map
==============================================================================
--- head/lib/libc/sys/Symbol.map	Thu Jul  5 16:00:58 2018	(r335989)
+++ head/lib/libc/sys/Symbol.map	Thu Jul  5 16:03:03 2018	(r335990)
@@ -179,6 +179,8 @@ FBSD_1.0 {
 	munlockall;
 	munmap;
 	nanosleep;
+	netbsd_lchown;
+	netbsd_msync;
 	nfssvc;
 	nmount;
 	ntp_adjtime;
@@ -775,6 +777,10 @@ FBSDprivate_1.0 {
 	__sys_munmap;
 	_nanosleep;
 	__sys_nanosleep;
+	_netbsd_lchown;
+	__sys_netbsd_lchown;
+	_netbsd_msync;
+	__sys_netbsd_msync;
 	_nfssvc;
 	__sys_nfssvc;
 	_nmount;

Modified: head/sys/compat/freebsd32/syscalls.master
==============================================================================
--- head/sys/compat/freebsd32/syscalls.master	Thu Jul  5 16:00:58 2018	(r335989)
+++ head/sys/compat/freebsd32/syscalls.master	Thu Jul  5 16:03:03 2018	(r335990)
@@ -499,10 +499,13 @@
 				    int count); }
 273	AUE_NULL	UNIMPL	nosys
 274	AUE_LCHMOD	NOPROTO	{ int lchmod(char *path, mode_t mode); }
-275	AUE_NULL	OBSOL	netbsd_lchown
+275	AUE_LCHOWN	NOPROTO	{ int lchown(char *path, uid_t uid, \
+				    gid_t gid); } netbsd_lchown \
+				    lchown_args int
 276	AUE_LUTIMES	STD	{ int freebsd32_lutimes(char *path, \
 				    struct timeval32 *tptr); }
-277	AUE_NULL	OBSOL	netbsd_msync
+277	AUE_MSYNC	NOPROTO	{ int msync(void *addr, size_t len, \
+				    int flags); } netbsd_msync msync_args int
 278	AUE_STAT  COMPAT11|NOPROTO { int nstat(char *path, struct nstat *ub); }
 279	AUE_FSTAT COMPAT11|NOPROTO { int nfstat(int fd, struct nstat *sb); }
 280	AUE_LSTAT COMPAT11|NOPROTO { int nlstat(char *path, struct nstat *ub); }

Modified: head/sys/kern/syscalls.master
==============================================================================
--- head/sys/kern/syscalls.master	Thu Jul  5 16:00:58 2018	(r335989)
+++ head/sys/kern/syscalls.master	Thu Jul  5 16:03:03 2018	(r335990)
@@ -630,10 +630,13 @@
 				    size_t count); }
 273	AUE_NULL	UNIMPL	nosys
 274	AUE_LCHMOD	STD	{ int lchmod(_In_z_ char *path, mode_t mode); }
-275	AUE_NULL	OBSOL	netbsd_lchown
+275	AUE_LCHOWN	NOPROTO	{ int lchown(char *path, uid_t uid, \
+				    gid_t gid); } netbsd_lchown lchown_args \
+				    int
 276	AUE_LUTIMES	STD	{ int lutimes(_In_z_ char *path, \
 				    _In_ struct timeval *tptr); }
-277	AUE_NULL	OBSOL	netbsd_msync
+277	AUE_MSYNC	NOPROTO	{ int msync(_In_ void *addr, size_t len, \
+				    int flags); } netbsd_msync msync_args int
 278	AUE_STAT	COMPAT11 { int nstat(_In_z_ char *path, \
 				    _Out_ struct nstat *ub); }
 279	AUE_FSTAT	COMPAT11 { int nfstat(int fd, _Out_ struct nstat *sb); }