This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Merge sysdeps/unix/common into sysdeps/unix
- From: "Joseph S. Myers" <joseph at codesourcery dot com>
- To: libc-alpha at sourceware dot org
- Date: Fri, 4 May 2012 23:00:32 +0000 (UTC)
- Subject: Merge sysdeps/unix/common into sysdeps/unix
The directory sysdeps/unix/common is "things which are common to both
BSD and SVR4". Any plausible Unix target for glibc nowadays is going
to have those things - that is, they can go directly in sysdeps/unix.
All that's left in sysdeps/unix/common is syscalls.list. I propose
this patch to eliminate the directory and merge that syscalls.list
into sysdeps/unix/syscalls.list. (settimeofday had duplicate
identical entries in both places, the other syscalls from
sysdeps/unix/common were moved into sysdeps/unix.) Tested x86_64,
including verifying that the built shared libraries were identical
before and after the patch.
2012-05-04 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/syscalls.list (adjtime): Add entry from
sysdeps/unix/common/syscalls.list.
(fchmod): Likewise.
(fchown): Likewise.
(ftruncate): Likewise.
(getrusage): Likewise.
(gettimeofday): Likewise.
(setpgid): Likewise.
(setregid): Likewise.
(setreuid): Likewise.
(sigaction): Likewise.
(truncate): Likewise.
(vhangup): Likewise.
* sysdeps/unix/common/syscalls.list: Remove file.
* sysdeps/unix/bsd/Implies: Don't include unix/common.
* sysdeps/unix/sysv/linux/Implies: Likewise.
diff --git a/sysdeps/unix/bsd/Implies b/sysdeps/unix/bsd/Implies
index cfc4491..c30979e 100644
--- a/sysdeps/unix/bsd/Implies
+++ b/sysdeps/unix/bsd/Implies
@@ -1,5 +1,2 @@
-# The directory unix/common contains things which are common to both BSD
-# and SVR4.
-unix/common
# The directory unix/inet implements sockets and networking in the usual way.
unix/inet
diff --git a/sysdeps/unix/common/syscalls.list b/sysdeps/unix/common/syscalls.list
deleted file mode 100644
index f0a5ea0..0000000
--- a/sysdeps/unix/common/syscalls.list
+++ /dev/null
@@ -1,15 +0,0 @@
-# File name Caller Syscall name # args Strong name Weak names
-
-adjtime - adjtime i:pp __adjtime adjtime
-fchmod - fchmod i:ii __fchmod fchmod
-fchown - fchown i:iii __fchown fchown
-ftruncate - ftruncate i:ii __ftruncate ftruncate
-getrusage - getrusage i:ip __getrusage getrusage
-gettimeofday - gettimeofday i:PP __gettimeofday gettimeofday __gettimeofday_internal
-settimeofday - settimeofday i:PP __settimeofday settimeofday
-setpgid - setpgrp i:ii __setpgid setpgid
-setregid - setregid i:ii __setregid setregid
-setreuid - setreuid i:ii __setreuid setreuid
-sigaction - sigaction i:ipp __sigaction sigaction
-truncate - truncate i:si __truncate truncate
-vhangup - vhangup i:i vhangup
diff --git a/sysdeps/unix/syscalls.list b/sysdeps/unix/syscalls.list
index 6f423bf..5c696b3 100644
--- a/sysdeps/unix/syscalls.list
+++ b/sysdeps/unix/syscalls.list
@@ -2,6 +2,7 @@
access - access i:si __access access
acct - acct i:S acct
+adjtime - adjtime i:pp __adjtime adjtime
chdir - chdir i:s __chdir chdir
chmod - chmod i:si __chmod chmod
chown - chown i:sii __chown __chown_internal chown
@@ -11,9 +12,12 @@ dup - dup i:i __dup dup
dup2 - dup2 i:ii __dup2 dup2
dup3 - dup3 i:iii dup3
fchdir - fchdir i:i __fchdir fchdir
+fchmod - fchmod i:ii __fchmod fchmod
+fchown - fchown i:iii __fchown fchown
fcntl - fcntl Ci:iiF __libc_fcntl __fcntl __fcntl_internal fcntl
fstatfs - fstatfs i:ip __fstatfs fstatfs
fsync - fsync Ci:i __libc_fsync fsync
+ftruncate - ftruncate i:ii __ftruncate ftruncate
getdomain - getdomainname i:si getdomainname
getgid - getgid Ei: __getgid getgid
getgroups - getgroups i:ip __getgroups getgroups
@@ -21,6 +25,8 @@ getitimer - getitimer i:ip __getitimer getitimer
getpid - getpid Ei: __getpid getpid
getpriority - getpriority i:ii getpriority
getrlimit - getrlimit i:ip __getrlimit getrlimit
+getrusage - getrusage i:ip __getrusage getrusage
+gettimeofday - gettimeofday i:PP __gettimeofday gettimeofday __gettimeofday_internal
getuid - getuid Ei: __getuid getuid
ioctl - ioctl i:iiI __ioctl ioctl
kill - kill i:ii __kill kill
@@ -48,11 +54,15 @@ seteuid - seteuid i:i __seteuid seteuid
setgid - setgid i:i __setgid setgid
setgroups - setgroups i:ip setgroups
setitimer - setitimer i:ipp __setitimer setitimer
+setpgid - setpgrp i:ii __setpgid setpgid
setpriority - setpriority i:iii setpriority
+setregid - setregid i:ii __setregid setregid
+setreuid - setreuid i:ii __setreuid setreuid
setrlimit - setrlimit i:ip __setrlimit setrlimit
setsid - setsid i: __setsid setsid
settimeofday - settimeofday i:PP __settimeofday settimeofday
setuid - setuid i:i __setuid setuid
+sigaction - sigaction i:ipp __sigaction sigaction
sigsuspend - sigsuspend Ci:p sigsuspend
sstk - sstk b:i sstk
statfs - statfs i:sp __statfs statfs
@@ -61,9 +71,11 @@ swapon - swapon i:s swapon
symlink - symlink i:ss __symlink symlink
sync - sync i: sync
syncfs - syncfs i:i syncfs
+truncate - truncate i:si __truncate truncate
umask - umask Ei:i __umask umask
uname - uname i:p __uname uname
unlink - unlink i:s __unlink unlink
utimes - utimes i:sp __utimes utimes
+vhangup - vhangup i:i vhangup
write - write Ci:ibn __libc_write __write write
writev - writev Ci:ipi __writev writev
diff --git a/sysdeps/unix/sysv/linux/Implies b/sysdeps/unix/sysv/linux/Implies
index ab04990..b04bb6b 100644
--- a/sysdeps/unix/sysv/linux/Implies
+++ b/sysdeps/unix/sysv/linux/Implies
@@ -2,8 +2,5 @@
# Hurd-based GNU systems.
gnu
-# Linux shares most of the syscalls which are also common to BSD and SVR4.
-unix/common
-
# Linux has network support in the kernel.
unix/inet
--
Joseph S. Myers
joseph@codesourcery.com