[Glibc-bsd-commits] r5784 - trunk/glibc-ports/kfreebsd

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2015-10-20 10:56:10 +0000 (Tue, 20 Oct 2015)
New Revision: 5784

Removed:
   trunk/glibc-ports/kfreebsd/execve.c
Modified:
   trunk/glibc-ports/kfreebsd/Makefile
   trunk/glibc-ports/kfreebsd/syscalls.list
Log:
Merge from upstream:

commit 6268f532b6c6be7971cb57883d042bd771966548
Author: Joseph Myers <joseph at codesourcery.com>
Date:   Wed Oct 1 20:58:20 2014 +0000

    Move execve to syscalls.list (bug 14138).



Modified: trunk/glibc-ports/kfreebsd/Makefile
===================================================================
--- trunk/glibc-ports/kfreebsd/Makefile	2015-10-20 10:47:48 UTC (rev 5783)
+++ trunk/glibc-ports/kfreebsd/Makefile	2015-10-20 10:56:10 UTC (rev 5784)
@@ -87,7 +87,7 @@
 # Other.
 sysdep_routines += swapon swapoff sys_aio_cancel sys_aio_error sys_aio_read sys_aio_return sys_aio_suspend sys_aio_waitcomplete sys_aio_write sys_lio_listio issetugid modfind modfnext modnext modstat obreak quotactl rfork sysarch undelete yield
 # for INLINE_SYSCALL
-sysdep_routines += sys_fork sys_execve sys_sigaction sys_close sys_fcntl
+sysdep_routines += sys_fork sys_sigaction sys_close sys_fcntl
 sysdep_routines += sys_clock_getres sys_clock_gettime sys_clock_settime
 sysdep_routines += sys_ktimer_create sys_ktimer_gettime sys_ktimer_settime sys_ktimer_getoverrun sys_ktimer_delete
 sysdep_routines += sys_semctl sys_shmctl sys_msgctl

Deleted: trunk/glibc-ports/kfreebsd/execve.c
===================================================================
--- trunk/glibc-ports/kfreebsd/execve.c	2015-10-20 10:47:48 UTC (rev 5783)
+++ trunk/glibc-ports/kfreebsd/execve.c	2015-10-20 10:56:10 UTC (rev 5784)
@@ -1,5 +0,0 @@
-int __syscall_execve(const char *filename, 
-                     char *const argv[], 
-                     char *const envp[]);
-libc_hidden_proto (__syscall_execve)
-#include <sysdeps/unix/sysv/linux/execve.c>

Modified: trunk/glibc-ports/kfreebsd/syscalls.list
===================================================================
--- trunk/glibc-ports/kfreebsd/syscalls.list	2015-10-20 10:47:48 UTC (rev 5783)
+++ trunk/glibc-ports/kfreebsd/syscalls.list	2015-10-20 10:56:10 UTC (rev 5784)
@@ -25,7 +25,7 @@
 sys_connect		-	connect			i:ipi		__syscall_connect
 sys_cpuset_getaffinity	-	cpuset_getaffinity	i:iiiip		__syscall_cpuset_getaffinity
 sys_cpuset_setaffinity	-	cpuset_setaffinity	i:iiiip		__syscall_cpuset_setaffinity
-sys_execve		-	execve			i:ppp		__syscall_execve
+execve			-	execve			i:spp		__syscall_execve __execve
 extattr_delete_file	-	extattr_delete_file	i:ss		extattr_delete_file
 extattr_get_file	-	extattr_get_file	i:ssbn		extattr_get_file
 extattr_set_file	-	extattr_set_file	i:ssbn		extattr_set_file