mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-22 10:50:07 +00:00
Consolidate Linux creat implementation
This patch consolidates the creat Linux syscall implementation on sysdeps/unix/sysv/linux/creat{64}.c. The changes are: 1. Remove creat{64} from auto-generation syscalls.list. 2. Add a new creat{64}.c implementation. For architectures that define __OFF_T_MATCHES_OFF64_T the default creat64 will create alias to required creat symbols. 3. Use __NR_creat where possible, otherwise use internal open{64} call with expected flags. Checked on i686-linux-gnu, x86_64-linux-gnu, x86_64-linux-gnux32, arch64-linux-gnu, arm-linux-gnueabihf, and powerpc64le-linux-gnu. * io/Makefile (CFLAGS-creat.c): New rule. (CFLAGS-creat64.c): Likewise. * sysdeps/unix/sysv/linux/alpha/creat.c: Remove file. * sysdeps/unix/sysv/linux/generic/creat.c: Likewise. * sysdeps/unix/sysv/linux/wordsize-64/creat64.c: Likewise. * sysdeps/unix/sysv/linux/creat.c: New file. * sysdeps/unix/sysv/linux/creat64.c: Likewise. * sysdeps/unix/sysv/linux/syscalls.list: Remove create from auto-generated list. * sysdeps/unix/sysv/linux/wordsize-64/syscalls.list: Likewise.
This commit is contained in:
parent
b41152d716
commit
cab6e5af9d
11
ChangeLog
11
ChangeLog
@ -1,5 +1,16 @@
|
|||||||
2016-05-10 Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
2016-05-10 Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
||||||
|
|
||||||
|
* io/Makefile (CFLAGS-creat.c): New rule.
|
||||||
|
(CFLAGS-creat64.c): Likewise.
|
||||||
|
* sysdeps/unix/sysv/linux/alpha/creat.c: Remove file.
|
||||||
|
* sysdeps/unix/sysv/linux/generic/creat.c: Likewise.
|
||||||
|
* sysdeps/unix/sysv/linux/wordsize-64/creat64.c: Likewise.
|
||||||
|
* sysdeps/unix/sysv/linux/creat.c: New file.
|
||||||
|
* sysdeps/unix/sysv/linux/creat64.c: Likewise.
|
||||||
|
* sysdeps/unix/sysv/linux/syscalls.list: Remove create from
|
||||||
|
auto-generated list.
|
||||||
|
* sysdeps/unix/sysv/linux/wordsize-64/syscalls.list: Likewise.
|
||||||
|
|
||||||
* sysdeps/unix/sysv/linux/generic/open.c: Remove file.
|
* sysdeps/unix/sysv/linux/generic/open.c: Remove file.
|
||||||
* sysdeps/unix/sysv/linux/generic/open64.c: Likewise.
|
* sysdeps/unix/sysv/linux/generic/open64.c: Likewise.
|
||||||
* sysdeps/unix/sysv/linux/wordsize-64/open64.c: Likewise.
|
* sysdeps/unix/sysv/linux/wordsize-64/open64.c: Likewise.
|
||||||
|
@ -80,6 +80,8 @@ include ../Rules
|
|||||||
|
|
||||||
CFLAGS-open.c = -fexceptions -fasynchronous-unwind-tables
|
CFLAGS-open.c = -fexceptions -fasynchronous-unwind-tables
|
||||||
CFLAGS-open64.c = -fexceptions -fasynchronous-unwind-tables
|
CFLAGS-open64.c = -fexceptions -fasynchronous-unwind-tables
|
||||||
|
CFLAGS-creat.c = -fexceptions -fasynchronous-unwind-tables
|
||||||
|
CFLAGS-creat64.c = -fexceptions -fasynchronous-unwind-tables
|
||||||
CFLAGS-fcntl.c = -fexceptions -fasynchronous-unwind-tables
|
CFLAGS-fcntl.c = -fexceptions -fasynchronous-unwind-tables
|
||||||
CFLAGS-poll.c = -fexceptions -fasynchronous-unwind-tables
|
CFLAGS-poll.c = -fexceptions -fasynchronous-unwind-tables
|
||||||
CFLAGS-ppoll.c = -fexceptions -fasynchronous-unwind-tables
|
CFLAGS-ppoll.c = -fexceptions -fasynchronous-unwind-tables
|
||||||
|
@ -1,8 +0,0 @@
|
|||||||
/* sysdeps/unix/sysv/linux/wordsize-64/syscalls.list defines creat and
|
|
||||||
creat64 for most linux targets, but on alpha creat is not a syscall.
|
|
||||||
If we do nothing, we'll wind up with creat64 being undefined, because
|
|
||||||
the syscalls.list assumes the creat->creat64 alias was created. We
|
|
||||||
could have overridden that with a create64.c, but we might as well do
|
|
||||||
the right thing and set up creat64 as an alias. */
|
|
||||||
#include <io/creat.c>
|
|
||||||
weak_alias(creat, creat64)
|
|
@ -1,6 +1,6 @@
|
|||||||
/* Copyright (C) 2011-2017 Free Software Foundation, Inc.
|
/* Linux default implementation for creat.
|
||||||
|
Copyright (C) 2017 Free Software Foundation, Inc.
|
||||||
This file is part of the GNU C Library.
|
This file is part of the GNU C Library.
|
||||||
Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
|
|
||||||
|
|
||||||
The GNU C Library is free software; you can redistribute it and/or
|
The GNU C Library is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU Lesser General Public
|
modify it under the terms of the GNU Lesser General Public
|
||||||
@ -18,20 +18,23 @@
|
|||||||
|
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
||||||
#include <sysdep-cancel.h>
|
#include <sysdep-cancel.h>
|
||||||
|
|
||||||
#undef creat
|
#ifndef __OFF_T_MATCHES_OFF64_T
|
||||||
|
|
||||||
/* Create FILE with protections MODE. */
|
/* Create FILE with protections MODE. */
|
||||||
int
|
int
|
||||||
creat (const char *file, mode_t mode)
|
__creat (const char *file, mode_t mode)
|
||||||
{
|
{
|
||||||
|
# ifdef __NR_creat
|
||||||
|
return SYSCALL_CANCEL (creat, file, mode);
|
||||||
|
# else
|
||||||
return __open (file, O_WRONLY | O_CREAT | O_TRUNC, mode);
|
return __open (file, O_WRONLY | O_CREAT | O_TRUNC, mode);
|
||||||
|
# endif
|
||||||
}
|
}
|
||||||
|
weak_alias (__creat, creat)
|
||||||
|
|
||||||
/* __open handles cancellation. */
|
|
||||||
LIBC_CANCEL_HANDLED ();
|
LIBC_CANCEL_HANDLED ();
|
||||||
|
|
||||||
#if __WORDSIZE == 64
|
|
||||||
weak_alias (creat, creat64)
|
|
||||||
#endif
|
#endif
|
41
sysdeps/unix/sysv/linux/creat64.c
Normal file
41
sysdeps/unix/sysv/linux/creat64.c
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
/* Linux default implementation for LFS creat.
|
||||||
|
Copyright (C) 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/>. */
|
||||||
|
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sysdep-cancel.h>
|
||||||
|
|
||||||
|
/* Create FILE with protections MODE. */
|
||||||
|
int
|
||||||
|
__creat64 (const char *file, mode_t mode)
|
||||||
|
{
|
||||||
|
#if defined __OFF_T_MATCHES_OFF64_T && defined __NR_creat
|
||||||
|
return SYSCALL_CANCEL (creat, file, mode);
|
||||||
|
#else
|
||||||
|
/* We need to pass O_LARGEFILE. */
|
||||||
|
return __open64 (file, O_WRONLY | O_CREAT | O_TRUNC, mode);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
weak_alias (__creat64, creat64)
|
||||||
|
|
||||||
|
#ifdef __OFF_T_MATCHES_OFF64_T
|
||||||
|
strong_alias (__creat64, __creat)
|
||||||
|
weak_alias (__creat64, creat)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
LIBC_CANCEL_HANDLED ();
|
@ -6,7 +6,6 @@ bdflush EXTRA bdflush i:ii __compat_bdflush bdflush@GLIBC_2.0:GLIBC_2.23
|
|||||||
capget EXTRA capget i:pp capget
|
capget EXTRA capget i:pp capget
|
||||||
capset EXTRA capset i:pp capset
|
capset EXTRA capset i:pp capset
|
||||||
clock_adjtime EXTRA clock_adjtime i:ip clock_adjtime
|
clock_adjtime EXTRA clock_adjtime i:ip clock_adjtime
|
||||||
creat - creat Ci:si creat
|
|
||||||
create_module EXTRA create_module 3 __compat_create_module create_module@GLIBC_2.0:GLIBC_2.23
|
create_module EXTRA create_module 3 __compat_create_module create_module@GLIBC_2.0:GLIBC_2.23
|
||||||
delete_module EXTRA delete_module 3 delete_module
|
delete_module EXTRA delete_module 3 delete_module
|
||||||
epoll_create EXTRA epoll_create i:i epoll_create
|
epoll_create EXTRA epoll_create i:i epoll_create
|
||||||
|
@ -1 +0,0 @@
|
|||||||
/* Defined as alias for the syscall. */
|
|
@ -5,7 +5,6 @@ statfs - statfs i:sp __statfs statfs statfs64
|
|||||||
readahead - readahead i:iii __readahead readahead
|
readahead - readahead i:iii __readahead readahead
|
||||||
sendfile - sendfile i:iipi sendfile sendfile64
|
sendfile - sendfile i:iipi sendfile sendfile64
|
||||||
sync_file_range - sync_file_range Ci:iiii sync_file_range
|
sync_file_range - sync_file_range Ci:iiii sync_file_range
|
||||||
creat - creat Ci:si creat creat64
|
|
||||||
prlimit EXTRA prlimit64 i:iipp prlimit prlimit64
|
prlimit EXTRA prlimit64 i:iipp prlimit prlimit64
|
||||||
|
|
||||||
fanotify_mark EXTRA fanotify_mark i:iiiis fanotify_mark
|
fanotify_mark EXTRA fanotify_mark i:iiiis fanotify_mark
|
||||||
|
Loading…
Reference in New Issue
Block a user