diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2016-11-28 15:18:22 -0200 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-06-30 15:17:26 -0300 |
| commit | 9b8f8593e5d919d8ea9a5f21ce7473246651ec2f (patch) | |
| tree | afe393fdfb8aa7f6bd7390150f642fc92b0a963b /sysdeps/unix/sysv/linux/powerpc | |
| parent | 28cfa3a48e59f9c6b9bc25a003a4ede435841382 (diff) | |
| download | glibc-9b8f8593e5d919d8ea9a5f21ce7473246651ec2f.tar glibc-9b8f8593e5d919d8ea9a5f21ce7473246651ec2f.tar.gz glibc-9b8f8593e5d919d8ea9a5f21ce7473246651ec2f.tar.bz2 glibc-9b8f8593e5d919d8ea9a5f21ce7473246651ec2f.zip | |
Consolidate Linux fcntl implementation
This patch consolidates the fcntl Linux syscall generation on
sysdeps/unix/sysv/linux/fcntl.c. It basically removes all the
architecture specific implementations.
Checked on i686-linux-gnu, x86_64-linux-gnu, x86_64-linux-gnux32,
aarch64-linux-gnu, arm-linux-gnueabihf, and powerpc64le-linux-gnu.
* sysdeps/unix/sysv/linux/arm/fcntl.c: Remove file.
* sysdeps/unix/sysv/linux/generic/wordsize-32/fcntl.c: Likewise.
* sysdeps/unix/sysv/linux/hppa/fcntl.c: Likewise.
* sysdeps/unix/sysv/linux/i386/fcntl.c: Likewise.
* sysdeps/unix/sysv/linux/m68k/fcntl.c: Likewise.
* sysdeps/unix/sysv/linux/microblaze/fcntl.c: Likewise.
* sysdeps/unix/sysv/linux/mips/mips32/fcntl.c: Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/n32/fcntl.c: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/fcntl.c: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/fcntl.c: Likewise.
* sysdeps/unix/sysv/linux/sh/fcntl.c: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/fcntl.c: Likewise.
* sysdeps/unix/sysv/linux/fcntl.c: New file.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c: Refactor to
use default implementation.
Diffstat (limited to 'sysdeps/unix/sysv/linux/powerpc')
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc32/fcntl.c | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c | 49 |
2 files changed, 8 insertions, 42 deletions
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fcntl.c b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fcntl.c deleted file mode 100644 index ea951bc4f9..0000000000 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fcntl.c +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/unix/sysv/linux/i386/fcntl.c> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c index 85ae8a2752..1eec4ea18c 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c @@ -15,51 +15,18 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <assert.h> -#include <errno.h> -#include <sysdep-cancel.h> /* Must come before <fcntl.h>. */ +#include <unistd.h> #include <fcntl.h> -#include <stdarg.h> -#include <sys/syscall.h> - - -#ifndef NO_CANCELLATION -int -__fcntl_nocancel (int fd, int cmd, ...) +static inline int +fcntl_adjust_cmd (int cmd) { - va_list ap; - void *arg; - - va_start (ap, cmd); - arg = va_arg (ap, void *); - va_end (ap); - - return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg); -} -#endif - - -int -__libc_fcntl (int fd, int cmd, ...) -{ - va_list ap; - void *arg; - - va_start (ap, cmd); - arg = va_arg (ap, void *); - va_end (ap); - if (cmd >= F_GETLK64 && cmd <= F_SETLKW64) cmd -= F_GETLK64 - F_GETLK; - - if (cmd != F_SETLKW) - return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg); - - return SYSCALL_CANCEL (fcntl, fd, cmd, arg); + return cmd; } -libc_hidden_def (__libc_fcntl) -weak_alias (__libc_fcntl, __fcntl) -libc_hidden_weak (__fcntl) -weak_alias (__libc_fcntl, fcntl) +#define FCNTL_ADJUST_CMD(__cmd) \ + fcntl_adjust_cmd (__cmd) + +#include <sysdeps/unix/sysv/linux/fcntl.c> |