From b41152d716ee9c5ba34495a54e64ea2b732139b5 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Fri, 11 Nov 2016 15:00:03 -0200 Subject: [PATCH] Consolidate Linux open implementation This patch consolidates the open Linux syscall implementation on sysdeps/unix/sysv/linux/open{64}.c. The changes are: 1. Remove open{64} from auto-generation syscalls.list. 2. Add a new open{64}.c implementation. For architectures that define __OFF_T_MATCHES_OFF64_T the default open64 will create alias to required open symbols. 3. Use __NR_openat as default syscall for open{64}. Checked on i686-linux-gnu, x86_64-linux-gnu, x86_64-linux-gnux32, arch64-linux-gnu, arm-linux-gnueabihf, and powerpc64le-linux-gnu. * sysdeps/unix/sysv/linux/generic/open.c: Remove file. * sysdeps/unix/sysv/linux/generic/open64.c: Likewise. * sysdeps/unix/sysv/linux/wordsize-64/open64.c: Likewise. * sysdeps/unix/sysv/linux/open.c: New file. * sysdeps/unix/sysv/linux/open64.c (__libc_open64): Use O_LARGEFILE only for __OFF_T_MATCHES_OFF64_T and add alias to open if the case. * sysdeps/unix/sysv/linux/wordsize-64/syscalls.list: Remove open from auto-generated list. --- ChangeLog | 9 ++++ sysdeps/unix/sysv/linux/generic/open64.c | 44 ------------------- sysdeps/unix/sysv/linux/{generic => }/open.c | 25 +++-------- sysdeps/unix/sysv/linux/open64.c | 24 ++++++++-- sysdeps/unix/sysv/linux/wordsize-64/open64.c | 1 - .../unix/sysv/linux/wordsize-64/syscalls.list | 1 - 6 files changed, 36 insertions(+), 68 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/generic/open64.c rename sysdeps/unix/sysv/linux/{generic => }/open.c (78%) delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/open64.c diff --git a/ChangeLog b/ChangeLog index cc843be301..0431df8701 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2016-05-10 Adhemerval Zanella + * sysdeps/unix/sysv/linux/generic/open.c: Remove file. + * sysdeps/unix/sysv/linux/generic/open64.c: Likewise. + * sysdeps/unix/sysv/linux/wordsize-64/open64.c: Likewise. + * sysdeps/unix/sysv/linux/open.c: New file. + * sysdeps/unix/sysv/linux/open64.c (__libc_open64): Define symbol + iff __WORDSIZE != 64 and use __NR_openat when available. + * sysdeps/unix/sysv/linux/wordsize-64/syscalls.list: Remove open + from auto-generated list. + * nptl/Makefile (CFLAGS-close.c): New flag. * sysdeps/unix/sysv/linux/close.c: New file. diff --git a/sysdeps/unix/sysv/linux/generic/open64.c b/sysdeps/unix/sysv/linux/generic/open64.c deleted file mode 100644 index 88312a117c..0000000000 --- a/sysdeps/unix/sysv/linux/generic/open64.c +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright (C) 2011-2017 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Chris Metcalf , 2011. - - 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 - . */ - -#include -#include -#include -#include -#include - -/* Open FILE with access OFLAG. If O_CREAT or O_TMPFILE is in OFLAG, - a third argument is the file protection. */ -int -__libc_open64 (const char *file, int oflag, ...) -{ - int mode = 0; - - if (__OPEN_NEEDS_MODE (oflag)) - { - va_list arg; - va_start (arg, oflag); - mode = va_arg (arg, int); - va_end (arg); - } - - return SYSCALL_CANCEL (openat, AT_FDCWD, file, oflag | O_LARGEFILE, mode); -} -weak_alias (__libc_open64, __open64) -libc_hidden_weak (__open64) -weak_alias (__libc_open64, open64) diff --git a/sysdeps/unix/sysv/linux/generic/open.c b/sysdeps/unix/sysv/linux/open.c similarity index 78% rename from sysdeps/unix/sysv/linux/generic/open.c rename to sysdeps/unix/sysv/linux/open.c index 10cdbe0b82..b3912d5554 100644 --- a/sysdeps/unix/sysv/linux/generic/open.c +++ b/sysdeps/unix/sysv/linux/open.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2017 Free Software Foundation, Inc. +/* Copyright (C) 2017 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Chris Metcalf , 2011. @@ -16,12 +16,15 @@ License along with the GNU C Library. If not, see . */ -#include +#include +#include #include #include -#include + #include +#ifndef __OFF_T_MATCHES_OFF64_T + /* Open FILE with access OFLAG. If O_CREAT or O_TMPFILE is in OFLAG, a third argument is the file protection. */ int @@ -45,18 +48,4 @@ weak_alias (__libc_open, __open) libc_hidden_weak (__open) weak_alias (__libc_open, open) -int -__open_nocancel (const char *file, int oflag, ...) -{ - int mode = 0; - - if (__OPEN_NEEDS_MODE (oflag)) - { - va_list arg; - va_start (arg, oflag); - mode = va_arg (arg, int); - va_end (arg); - } - - return INLINE_SYSCALL (openat, 4, AT_FDCWD, file, oflag, mode); -} +#endif diff --git a/sysdeps/unix/sysv/linux/open64.c b/sysdeps/unix/sysv/linux/open64.c index 5e209ee917..fcac984d22 100644 --- a/sysdeps/unix/sysv/linux/open64.c +++ b/sysdeps/unix/sysv/linux/open64.c @@ -15,10 +15,11 @@ License along with the GNU C Library; if not, see . */ -#include +#include +#include #include #include -#include + #include /* Open FILE with access OFLAG. If O_CREAT or O_TMPFILE is in OFLAG, @@ -36,8 +37,23 @@ __libc_open64 (const char *file, int oflag, ...) va_end (arg); } - return SYSCALL_CANCEL (open, file, oflag | O_LARGEFILE, mode); +#ifdef __OFF_T_MATCHES_OFF64_T +# define EXTRA_OPEN_FLAGS 0 +#else +# define EXTRA_OPEN_FLAGS O_LARGEFILE +#endif + + return SYSCALL_CANCEL (openat, AT_FDCWD, file, oflag | EXTRA_OPEN_FLAGS, + mode); } -weak_alias (__libc_open64, __open64) + +strong_alias (__libc_open64, __open64) libc_hidden_weak (__open64) weak_alias (__libc_open64, open64) + +#ifdef __OFF_T_MATCHES_OFF64_T +strong_alias (__libc_open64, __libc_open) +strong_alias (__libc_open64, __open) +libc_hidden_weak (__open) +weak_alias (__libc_open64, open) +#endif diff --git a/sysdeps/unix/sysv/linux/wordsize-64/open64.c b/sysdeps/unix/sysv/linux/wordsize-64/open64.c deleted file mode 100644 index 0abe30ef62..0000000000 --- a/sysdeps/unix/sysv/linux/wordsize-64/open64.c +++ /dev/null @@ -1 +0,0 @@ -/* Defined in open syscall. */ diff --git a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list index 0c606477da..6549ed8258 100644 --- a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list +++ b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list @@ -6,7 +6,6 @@ readahead - readahead i:iii __readahead readahead sendfile - sendfile i:iipi sendfile sendfile64 sync_file_range - sync_file_range Ci:iiii sync_file_range creat - creat Ci:si creat creat64 -open - open Ci:siv __libc_open __open open __open64 open64 prlimit EXTRA prlimit64 i:iipp prlimit prlimit64 fanotify_mark EXTRA fanotify_mark i:iiiis fanotify_mark -- 2.43.5