about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--sysdeps/unix/sysv/linux/syscalls.list3
-rw-r--r--sysdeps/unix/sysv/syscalls.list5
3 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index d44f1f406e..b418bfe316 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-05-10  Joseph Myers  <joseph@codesourcery.com>
+
+	* sysdeps/unix/sysv/linux/syscalls.list (alarm): Add entry from
+	sysdeps/unix/sysv/syscalls.list.
+	(stime): Likewise.
+	(utime): Likewise.
+	* sysdeps/unix/sysv/syscalls.list: Remove file.
+
 2012-05-10  Paul Eggert  <eggert@cs.ucla.edu>
 
 	[BZ #3440]
diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list
index f6e6653d37..eef6d82b59 100644
--- a/sysdeps/unix/sysv/linux/syscalls.list
+++ b/sysdeps/unix/sysv/linux/syscalls.list
@@ -1,6 +1,7 @@
 # File name	Caller	Syscall name	Args	Strong name	Weak names
 
 adjtimex	adjtime	adjtimex	i:p	__adjtimex	adjtimex ntp_adjtime __adjtimex_internal
+alarm		-	alarm		i:i	alarm
 bdflush		EXTRA	bdflush		i:ii	bdflush
 capget		EXTRA	capget		i:pp	capget
 capset		EXTRA	capset		i:pp	capset
@@ -71,12 +72,14 @@ setfsuid	EXTRA	setfsuid	i:i	setfsuid
 setpgid		-	setpgid		i:ii	__setpgid	setpgid
 sigaltstack	-	sigaltstack	i:PP	__sigaltstack	sigaltstack
 splice		EXTRA	splice		Ci:iPiPii	splice
+stime		-	stime		i:p	stime
 sysinfo		EXTRA	sysinfo		i:p	sysinfo
 swapon		-	swapon		i:si	__swapon	swapon
 swapoff		-	swapoff		i:s	__swapoff	swapoff
 tee		EXTRA	tee		Ci:iiii	tee
 unshare		EXTRA	unshare		i:i	unshare
 uselib		EXTRA	uselib		i:s	uselib
+utime		-	utime		i:sP	utime
 vmsplice	EXTRA	vmsplice	Ci:iPii	vmsplice
 wait4		-	wait4		i:iWiP	__wait4		wait4
 
diff --git a/sysdeps/unix/sysv/syscalls.list b/sysdeps/unix/sysv/syscalls.list
deleted file mode 100644
index 5ff702a528..0000000000
--- a/sysdeps/unix/sysv/syscalls.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# File name	Caller	Syscall name	# args	Strong name	Weak names
-
-alarm		-	alarm		i:i	alarm
-stime		-	stime		i:p	stime
-utime		-	utime		i:sP	utime