Date: Tue, 10 Jul 2018 13:32:04 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336171 - in head: lib/libc/sys sys/compat/freebsd32 sys/kern Message-ID: <201807101332.w6ADW4Mv070794@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Tue Jul 10 13:32:04 2018 New Revision: 336171 URL: https://svnweb.freebsd.org/changeset/base/336171 Log: Get rid of netbsd_lchown and netbsd_msync syscall entries. No valid FreeBSD binary very called them (they would call lchown and msync directly) and we haven't supported NetBSD binaries in ages. This is a respin of r335983 with a workaround for the ancient BFD linker in the libc stubs. Reviewed by: kib Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D16193 Added: head/lib/libc/sys/compat-stub.c (contents, props changed) 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 Tue Jul 10 13:03:06 2018 (r336170) +++ head/lib/libc/sys/Makefile.inc Tue Jul 10 13:32:04 2018 (r336171) @@ -48,6 +48,8 @@ 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 Tue Jul 10 13:03:06 2018 (r336170) +++ head/lib/libc/sys/Symbol.map Tue Jul 10 13:32:04 2018 (r336171) @@ -179,8 +179,6 @@ FBSD_1.0 { munlockall; munmap; nanosleep; - netbsd_lchown; - netbsd_msync; nfssvc; nmount; ntp_adjtime; @@ -777,10 +775,6 @@ FBSDprivate_1.0 { __sys_munmap; _nanosleep; __sys_nanosleep; - _netbsd_lchown; - __sys_netbsd_lchown; - _netbsd_msync; - __sys_netbsd_msync; _nfssvc; __sys_nfssvc; _nmount; Added: head/lib/libc/sys/compat-stub.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libc/sys/compat-stub.c Tue Jul 10 13:32:04 2018 (r336171) @@ -0,0 +1,56 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2018 SRI International + * All rights reserved. + * + * This software was developed by SRI International and the University of + * Cambridge Computer Laboratory (Department of Computer Science and + * Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the + * DARPA SSITH research programme. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#include <sys/cdefs.h> +#include <sys/types.h> +#include <sys/errno.h> + +/* + * XXX: Ideally we'd use a common function rather than generating one + * for each compat symbol, but the bfd linker in base rejects that. + * This should be revisited once we're using only modern linkers. + */ +#define __compat_nosys(symbol, version) \ +int __compat_enosys ## symbol(void); \ +int \ +__compat_enosys ## symbol(void) \ +{ \ + \ + return (ENOSYS); \ +} \ +__sym_compat(symbol, __compat_enosys ## symbol, version) + +__compat_nosys(netbsd_lchown, FBSD_1.0); +__compat_nosys(netbsd_msync, FBSD_1.0); Modified: head/sys/compat/freebsd32/syscalls.master ============================================================================== --- head/sys/compat/freebsd32/syscalls.master Tue Jul 10 13:03:06 2018 (r336170) +++ head/sys/compat/freebsd32/syscalls.master Tue Jul 10 13:32:04 2018 (r336171) @@ -499,13 +499,10 @@ int count); } 273 AUE_NULL UNIMPL nosys 274 AUE_LCHMOD NOPROTO { int lchmod(char *path, mode_t mode); } -275 AUE_LCHOWN NOPROTO { int lchown(char *path, uid_t uid, \ - gid_t gid); } netbsd_lchown \ - lchown_args int +275 AUE_NULL OBSOL netbsd_lchown 276 AUE_LUTIMES STD { int freebsd32_lutimes(char *path, \ struct timeval32 *tptr); } -277 AUE_MSYNC NOPROTO { int msync(void *addr, size_t len, \ - int flags); } netbsd_msync msync_args int +277 AUE_NULL OBSOL netbsd_msync 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 Tue Jul 10 13:03:06 2018 (r336170) +++ head/sys/kern/syscalls.master Tue Jul 10 13:32:04 2018 (r336171) @@ -630,13 +630,10 @@ size_t count); } 273 AUE_NULL UNIMPL nosys 274 AUE_LCHMOD STD { int lchmod(_In_z_ char *path, mode_t mode); } -275 AUE_LCHOWN NOPROTO { int lchown(char *path, uid_t uid, \ - gid_t gid); } netbsd_lchown lchown_args \ - int +275 AUE_NULL OBSOL netbsd_lchown 276 AUE_LUTIMES STD { int lutimes(_In_z_ char *path, \ _In_ struct timeval *tptr); } -277 AUE_MSYNC NOPROTO { int msync(_In_ void *addr, size_t len, \ - int flags); } netbsd_msync msync_args int +277 AUE_NULL OBSOL netbsd_msync 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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807101332.w6ADW4Mv070794>