diff --git a/ChangeLog b/ChangeLog index cd987d9084..2d9066eeb0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-10-01 Joseph Myers + + [BZ #14138] + * sysdeps/unix/sysv/linux/execve.c: Remove file. + * sysdeps/unix/sysv/linux/syscalls.list (execve): Add syscall. + 2014-10-01 Steve Ellcey * sysdeps/mips/strcmp.S: New. diff --git a/sysdeps/unix/sysv/linux/execve.c b/sysdeps/unix/sysv/linux/execve.c deleted file mode 100644 index db96226f65..0000000000 --- a/sysdeps/unix/sysv/linux/execve.c +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright (C) 1999-2014 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 - . */ - -#include -#include - -#include -#include -#include - -/* Consider moving to syscalls.list. */ - -int -__execve (file, argv, envp) - const char *file; - char *const argv[]; - char *const envp[]; -{ - return INLINE_SYSCALL (execve, 3, file, argv, envp); -} -weak_alias (__execve, execve) diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list index 5e3968a28b..ddec198279 100644 --- a/sysdeps/unix/sysv/linux/syscalls.list +++ b/sysdeps/unix/sysv/linux/syscalls.list @@ -13,6 +13,7 @@ epoll_create EXTRA epoll_create i:i epoll_create epoll_create1 EXTRA epoll_create1 i:i epoll_create1 epoll_ctl EXTRA epoll_ctl i:iiip epoll_ctl epoll_wait EXTRA epoll_wait Ci:ipii epoll_wait +execve - execve i:spp __execve execve fdatasync - fdatasync Ci:i fdatasync flock - flock i:ii __flock flock get_kernel_syms EXTRA get_kernel_syms i:p get_kernel_syms