Date: Wed, 8 Apr 2015 02:21:45 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r281256 - in stable/10/lib/libc: include sys Message-ID: <201504080221.t382Ljt0006854@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Wed Apr 8 02:21:44 2015 New Revision: 281256 URL: https://svnweb.freebsd.org/changeset/base/281256 Log: MFC r280959: Correctly handle __fcntl_compat symbol for the !SYSCALL_COMPAT case. Modified: stable/10/lib/libc/include/compat.h stable/10/lib/libc/sys/fcntl.c Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libc/include/compat.h ============================================================================== --- stable/10/lib/libc/include/compat.h Wed Apr 8 02:15:13 2015 (r281255) +++ stable/10/lib/libc/include/compat.h Wed Apr 8 02:21:44 2015 (r281256) @@ -44,5 +44,14 @@ __sym_compat(shmctl, freebsd7_shmctl, FB #undef __sym_compat +#define __weak_reference(sym,alias) \ + .weak alias;.equ alias,sym + +#ifndef SYSCALL_COMPAT +__weak_reference(__sys_fcntl,__fcntl_compat) +#endif + +#undef __weak_reference + #endif /* __LIBC_COMPAT_H__ */ Modified: stable/10/lib/libc/sys/fcntl.c ============================================================================== --- stable/10/lib/libc/sys/fcntl.c Wed Apr 8 02:15:13 2015 (r281255) +++ stable/10/lib/libc/sys/fcntl.c Wed Apr 8 02:21:44 2015 (r281256) @@ -103,7 +103,4 @@ __fcntl_compat(int fd, int cmd, ...) return (__sys_fcntl(fd, cmd, arg)); } } -#else -__weak_reference(__sys_fcntl, __fcntl_compat); -__weak_reference(__sys_fcntl, __fcntl); #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504080221.t382Ljt0006854>