diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2016-10-25 20:55:09 -0200 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2016-12-28 20:28:56 -0200 |
| commit | dee23189ae6201b553cf0e0f7ee69ce9be95fbe1 (patch) | |
| tree | 8230d251010e7b20915643e1a8a04698fd9a9edd /sysdeps/unix/sysv/linux/msgrcv.c | |
| parent | 356c0aabd0191cdd7287ccf1ec8bbaa4862a0823 (diff) | |
| download | glibc-dee23189ae6201b553cf0e0f7ee69ce9be95fbe1.tar.gz glibc-dee23189ae6201b553cf0e0f7ee69ce9be95fbe1.tar.xz glibc-dee23189ae6201b553cf0e0f7ee69ce9be95fbe1.zip | |
Consolidate Linux msgrcv implementation
This patch consolidates the msgrcv Linux implementation in only one default file, sysdeps/unix/sysv/linux/msgrcv.c. If tries to use the direct syscall if it is supported, otherwise will use the old ipc multiplex mechanism. Checked on x86_64, i686, powerpc64le, aarch64, and armhf. * sysdeps/unix/sysv/linux/alpha/syscalls.list (msgctl): Remove. * sysdeps/unix/sysv/linux/arm/syscalls.list (msgctl): Likewise. * sysdeps/unix/sysv/linux/generic/syscalls.list (msgctl): Likewise. * sysdeps/unix/sysv/linux/hppa/syscalls.list (msgctl): Likewise. * sysdeps/unix/sysv/linux/ia64/syscalls.list (msgctl): Likewise. * sysdeps/unix/sysv/linux/microblaze/syscalls.list (msgctl): Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list (msgctl): Likewise. * sysdeps/unix/sysv/linux/x86_64/syscalls.list (msgctl): Likewise, * sysdeps/unix/sysv/linux/mips/mips64/syscalls.list (msgctl): Likewise. * sysdeps/unix/sysv/linux/msgrcv.c (__libc_msgrcv): Use msgrcv syscall if defined. * sysdeps/unix/sysv/linux/sparc/sparc64/msgrcv.c: Remove file.
Diffstat (limited to 'sysdeps/unix/sysv/linux/msgrcv.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/msgrcv.c | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/sysdeps/unix/sysv/linux/msgrcv.c b/sysdeps/unix/sysv/linux/msgrcv.c index c4dd219097..489d6296c7 100644 --- a/sysdeps/unix/sysv/linux/msgrcv.c +++ b/sysdeps/unix/sysv/linux/msgrcv.c @@ -16,33 +16,19 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <errno.h> #include <sys/msg.h> #include <ipc_priv.h> - #include <sysdep-cancel.h> -#include <sys/syscall.h> - -/* Kludge to work around Linux' restriction of only up to five - arguments to a system call. */ -struct ipc_kludge - { - void *msgp; - long int msgtyp; - }; - ssize_t __libc_msgrcv (int msqid, void *msgp, size_t msgsz, long int msgtyp, int msgflg) { - /* The problem here is that Linux' calling convention only allows up to - fives parameters to a system call. */ - struct ipc_kludge tmp; - - tmp.msgp = msgp; - tmp.msgtyp = msgtyp; - - return SYSCALL_CANCEL (ipc, IPCOP_msgrcv, msqid, msgsz, msgflg, &tmp); +#ifdef __ASSUME_DIRECT_SYSVIPC_SYSCALLS + return SYSCALL_CANCEL (msgrcv, msqid, msgp, msgsz, msgtyp, msgflg); +#else + return SYSCALL_CANCEL (ipc, IPCOP_msgrcv, msqid, msgsz, msgflg, + MSGRCV_ARGS (msgp, msgtyp)); +#endif } weak_alias (__libc_msgrcv, msgrcv) |