aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2017-05-09 23:16:19 +0000
committerJoseph Myers <joseph@codesourcery.com>2017-05-09 23:16:19 +0000
commitd08a482bc2b9a7ae69fd5c587e1f5d12aa317e0d (patch)
tree920fda1a6ba5fef4864951a95a823962b99bf87f
parente3b0580d0d66fbdfc2086c20304c0129f9a5297e (diff)
downloadglibc-d08a482bc2b9a7ae69fd5c587e1f5d12aa317e0d.tar
glibc-d08a482bc2b9a7ae69fd5c587e1f5d12aa317e0d.tar.gz
glibc-d08a482bc2b9a7ae69fd5c587e1f5d12aa317e0d.tar.bz2
glibc-d08a482bc2b9a7ae69fd5c587e1f5d12aa317e0d.zip
Remove MIPS32 accept4, recvmmsg, sendmmsg implementations.
MIPS32 has its own implementations of accept4, recvmmsg and sendmmsg because at one point it needed to avoid socketcall being used for those functions (MIPS32 has socketcall, but has never used it in glibc, and so never had socket.S at the time when socketcall used such a per-architecture file instead of C code). The current code no longer uses socketcall based on __NR_socketcall being defined, and the syscalls are always present on MIPS for supported kernels so the socketcall case in the code is dead for MIPS; this patch removes the implementations that are, as Adhemerval noted, no longer needed. Tested compilation for mips-linux-gnu with build-many-glibcs.py. * sysdeps/unix/sysv/linux/mips/mips32/accept4.c: Remove file. * sysdeps/unix/sysv/linux/mips/mips32/recvmmsg.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips32/sendmmsg.c: Likewise.
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/unix/sysv/linux/mips/mips32/accept4.c30
-rw-r--r--sysdeps/unix/sysv/linux/mips/mips32/recvmmsg.c29
-rw-r--r--sysdeps/unix/sysv/linux/mips/mips32/sendmmsg.c29
4 files changed, 4 insertions, 88 deletions
diff --git a/ChangeLog b/ChangeLog
index 90aed79f8c..a772fce69f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2017-05-09 Joseph Myers <joseph@codesourcery.com>
+ * sysdeps/unix/sysv/linux/mips/mips32/accept4.c: Remove file.
+ * sysdeps/unix/sysv/linux/mips/mips32/recvmmsg.c: Likewise.
+ * sysdeps/unix/sysv/linux/mips/mips32/sendmmsg.c: Likewise.
+
* sysdeps/unix/sysv/linux/accept4.c (accept4): Use syscall if
[__ASSUME_ACCEPT4_SYSCALL], otherwise socketcall.
* sysdeps/unix/sysv/linux/recvmmsg.c (recvmmsg): Use syscall if
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/accept4.c b/sysdeps/unix/sysv/linux/mips/mips32/accept4.c
deleted file mode 100644
index ff8ac37103..0000000000
--- a/sysdeps/unix/sysv/linux/mips/mips32/accept4.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright (C) 2008-2017 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library. If not, see
- <http://www.gnu.org/licenses/>. */
-
-/* Avoid accept4.c trying to use a definition based on the socketcall
- syscall and internal_accept4.S. */
-
-#include <errno.h>
-#include <signal.h>
-#include <sys/socket.h>
-
-#include <sysdep-cancel.h>
-#include <sys/syscall.h>
-
-#undef __NR_socketcall
-
-#include <sysdeps/unix/sysv/linux/accept4.c>
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/recvmmsg.c b/sysdeps/unix/sysv/linux/mips/mips32/recvmmsg.c
deleted file mode 100644
index 33d87de35e..0000000000
--- a/sysdeps/unix/sysv/linux/mips/mips32/recvmmsg.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright (C) 2010-2017 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library. If not, see
- <http://www.gnu.org/licenses/>. */
-
-/* Avoid recvmmsg.c trying to use a definition based on the socketcall
- syscall and internal_recvmmsg.S. */
-
-#include <errno.h>
-#include <sys/socket.h>
-
-#include <sysdep-cancel.h>
-#include <sys/syscall.h>
-
-#undef __NR_socketcall
-
-#include <sysdeps/unix/sysv/linux/recvmmsg.c>
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/sendmmsg.c b/sysdeps/unix/sysv/linux/mips/mips32/sendmmsg.c
deleted file mode 100644
index 8d113832ee..0000000000
--- a/sysdeps/unix/sysv/linux/mips/mips32/sendmmsg.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright (C) 2011-2017 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library. If not, see
- <http://www.gnu.org/licenses/>. */
-
-/* Avoid sendmmsg.c trying to use a definition based on the socketcall
- syscall and internal_sendmmsg.S. */
-
-#include <errno.h>
-#include <sys/socket.h>
-
-#include <sysdep-cancel.h>
-#include <sys/syscall.h>
-
-#undef __NR_socketcall
-
-#include <sysdeps/unix/sysv/linux/sendmmsg.c>