This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: Flatten sysdeps/unix/bsd/bsd4.4 into sysdeps/unix/bsd
On Mon, 9 Jul 2012, Roland McGrath wrote:
> My position on this has not changed. Moving files that are only
> Mach-specific and not really Hurd-specific from mach/ to mach/hurd/ is
> just wrong to me. As I said before, I think the right solution here
> is to leave mach/ and mach/hurd/ files where they are, and instead
> work out the new sysdeps directory selection scheme such that the
> directory ordering does what we want.
And I think it's probably inevitable there will be cases where sometimes
you want directory A to take precedence, and sometimes want B to take
precedence, and that the solution is likely to involve ways to specify
particular files at a point in the ordering (without putting everything in
their containing directory there), or to exclude particular files when
listing a directory.
> The consolidation of bsd/bsd4.4/ files into bsd/ doesn't cause any
> problems, so they truly incremental first step is to do just that
> alone first.
Here then is the original patch without the sysdeps/mach/hurd/Implies
changes. I hope that the Implies mechanism works properly when a
directory that does not exist is named (that is, produces the same
directory ordering as if the directory did exist), since git does not
represent empty directories so the effect of this patch is that the
directory sysdeps/unix/bsd/bsd4.4 will not exist but will still be
referenced by sysdeps/mach/hurd/Implies.
2012-07-09 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/bsd/syscalls.list (chflags): Add entry from
sysdeps/unix/bsd/bsd4.4/syscalls.list.
(fchflags): Likewise.
(revoke): Likewise.
(setlogin): Likewise.
(sigaltstack): Likewise.
(wait4): Likewise.
(sigblock): Remove.
(sigsetmask): Likewise.
(wait3): Likewise.
(waitpid): Likewise.
* sysdeps/unix/bsd/bsd4.4/syscalls.list: Remove file.
* sysdeps/unix/sysv/linux/wait3.c: Update directory of included
file.
* sysdeps/unix/bsd/bsd4.4/Makefile: Move to ...
* sysdeps/unix/bsd/Makefile: ... here.
* sysdeps/unix/bsd/bsd4.4/Versions: Move to ...
* sysdeps/unix/bsd/Versions: ... here.
* sysdeps/unix/bsd/bsd4.4/bits/dirent.h: Move to ...
* sysdeps/unix/bsd/bits/dirent.h: ... here.
* sysdeps/unix/bsd/bsd4.4/bits/errno.h: Move to ...
* sysdeps/unix/bsd/bits/errno.h: ... here.
* sysdeps/unix/bsd/bsd4.4/bits/fcntl.h: Move to ...
* sysdeps/unix/bsd/bits/fcntl.h: ... here.
* sysdeps/unix/bsd/bsd4.4/bits/ioctls.h: Move to ...
* sysdeps/unix/bsd/bits/ioctls.h: ... here.
* sysdeps/unix/bsd/bsd4.4/bits/sockaddr.h: Move to ...
* sysdeps/unix/bsd/bits/sockaddr.h: ... here.
* sysdeps/unix/bsd/bsd4.4/bits/socket.h: Move to ...
* sysdeps/unix/bsd/bits/socket.h: ... here.
* sysdeps/unix/bsd/bsd4.4/cmsg_nxthdr.c: Move to ...
* sysdeps/unix/bsd/cmsg_nxthdr.c: ... here.
* sysdeps/unix/bsd/bsd4.4/freebsd/bits/environments.h: Move to ...
* sysdeps/unix/bsd/freebsd/bits/environments.h: ... here.
* sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h: Move to ...
* sysdeps/unix/bsd/freebsd/bits/typesizes.h: ... here.
* sysdeps/unix/bsd/bsd4.4/freebsd/sys/sysmacros.h: Move to ...
* sysdeps/unix/bsd/freebsd/sys/sysmacros.h: ... here.
* sysdeps/unix/bsd/bsd4.4/sigblock.c: Move to ...
* sysdeps/unix/bsd/sigblock.c: ... here.
* sysdeps/unix/bsd/bsd4.4/sigsetmask.c: Move to ...
* sysdeps/unix/bsd/sigsetmask.c: ... here.
* sysdeps/unix/bsd/bsd4.4/sigvec.c: Move to ...
* sysdeps/unix/bsd/sigvec.c: ... here.
* sysdeps/unix/bsd/bsd4.4/tcdrain.c: Move to ...
* sysdeps/unix/bsd/tcdrain.c: ... here.
* sysdeps/unix/bsd/bsd4.4/tcgetattr.c: Move to ...
* sysdeps/unix/bsd/tcgetattr.c: ... here.
* sysdeps/unix/bsd/bsd4.4/tcsetattr.c: Move to ...
* sysdeps/unix/bsd/tcsetattr.c: ... here.
* sysdeps/unix/bsd/bsd4.4/wait.c: Move to ...
* sysdeps/unix/bsd/wait.c: ... here.
* sysdeps/unix/bsd/bsd4.4/wait3.c: Move to ...
* sysdeps/unix/bsd/wait3.c: ... here.
* sysdeps/unix/bsd/bsd4.4/waitpid.c: Move to ...
* sysdeps/unix/bsd/waitpid.c: ... here.
diff --git a/sysdeps/unix/bsd/bsd4.4/Makefile b/sysdeps/unix/bsd/Makefile
similarity index 100%
rename from sysdeps/unix/bsd/bsd4.4/Makefile
rename to sysdeps/unix/bsd/Makefile
diff --git a/sysdeps/unix/bsd/bsd4.4/Versions b/sysdeps/unix/bsd/Versions
similarity index 100%
rename from sysdeps/unix/bsd/bsd4.4/Versions
rename to sysdeps/unix/bsd/Versions
diff --git a/sysdeps/unix/bsd/bsd4.4/bits/dirent.h b/sysdeps/unix/bsd/bits/dirent.h
similarity index 100%
rename from sysdeps/unix/bsd/bsd4.4/bits/dirent.h
rename to sysdeps/unix/bsd/bits/dirent.h
diff --git a/sysdeps/unix/bsd/bsd4.4/bits/errno.h b/sysdeps/unix/bsd/bits/errno.h
similarity index 100%
rename from sysdeps/unix/bsd/bsd4.4/bits/errno.h
rename to sysdeps/unix/bsd/bits/errno.h
diff --git a/sysdeps/unix/bsd/bsd4.4/bits/fcntl.h b/sysdeps/unix/bsd/bits/fcntl.h
similarity index 100%
rename from sysdeps/unix/bsd/bsd4.4/bits/fcntl.h
rename to sysdeps/unix/bsd/bits/fcntl.h
diff --git a/sysdeps/unix/bsd/bsd4.4/bits/ioctls.h b/sysdeps/unix/bsd/bits/ioctls.h
similarity index 100%
rename from sysdeps/unix/bsd/bsd4.4/bits/ioctls.h
rename to sysdeps/unix/bsd/bits/ioctls.h
diff --git a/sysdeps/unix/bsd/bsd4.4/bits/sockaddr.h b/sysdeps/unix/bsd/bits/sockaddr.h
similarity index 100%
rename from sysdeps/unix/bsd/bsd4.4/bits/sockaddr.h
rename to sysdeps/unix/bsd/bits/sockaddr.h
diff --git a/sysdeps/unix/bsd/bsd4.4/bits/socket.h b/sysdeps/unix/bsd/bits/socket.h
similarity index 100%
rename from sysdeps/unix/bsd/bsd4.4/bits/socket.h
rename to sysdeps/unix/bsd/bits/socket.h
diff --git a/sysdeps/unix/bsd/bsd4.4/syscalls.list b/sysdeps/unix/bsd/bsd4.4/syscalls.list
deleted file mode 100644
index a4d3546..0000000
--- a/sysdeps/unix/bsd/bsd4.4/syscalls.list
+++ /dev/null
@@ -1,8 +0,0 @@
-# File name Caller Syscall name # args Strong name Weak names
-
-chflags - chflags 2 chflags
-fchflags - fchflags 2 fchflags
-revoke - revoke 1 revoke
-setlogin - setlogin 2 setlogin
-sigaltstack - sigaltstack 2 __sigaltstack sigaltstack
-wait4 - wait4 4 __wait4 wait4
diff --git a/sysdeps/unix/bsd/bsd4.4/cmsg_nxthdr.c b/sysdeps/unix/bsd/cmsg_nxthdr.c
similarity index 100%
rename from sysdeps/unix/bsd/bsd4.4/cmsg_nxthdr.c
rename to sysdeps/unix/bsd/cmsg_nxthdr.c
diff --git a/sysdeps/unix/bsd/bsd4.4/freebsd/bits/environments.h b/sysdeps/unix/bsd/freebsd/bits/environments.h
similarity index 100%
rename from sysdeps/unix/bsd/bsd4.4/freebsd/bits/environments.h
rename to sysdeps/unix/bsd/freebsd/bits/environments.h
diff --git a/sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h b/sysdeps/unix/bsd/freebsd/bits/typesizes.h
similarity index 100%
rename from sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h
rename to sysdeps/unix/bsd/freebsd/bits/typesizes.h
diff --git a/sysdeps/unix/bsd/bsd4.4/freebsd/sys/sysmacros.h b/sysdeps/unix/bsd/freebsd/sys/sysmacros.h
similarity index 100%
rename from sysdeps/unix/bsd/bsd4.4/freebsd/sys/sysmacros.h
rename to sysdeps/unix/bsd/freebsd/sys/sysmacros.h
diff --git a/sysdeps/unix/bsd/bsd4.4/sigblock.c b/sysdeps/unix/bsd/sigblock.c
similarity index 100%
rename from sysdeps/unix/bsd/bsd4.4/sigblock.c
rename to sysdeps/unix/bsd/sigblock.c
diff --git a/sysdeps/unix/bsd/bsd4.4/sigsetmask.c b/sysdeps/unix/bsd/sigsetmask.c
similarity index 100%
rename from sysdeps/unix/bsd/bsd4.4/sigsetmask.c
rename to sysdeps/unix/bsd/sigsetmask.c
diff --git a/sysdeps/unix/bsd/bsd4.4/sigvec.c b/sysdeps/unix/bsd/sigvec.c
similarity index 100%
rename from sysdeps/unix/bsd/bsd4.4/sigvec.c
rename to sysdeps/unix/bsd/sigvec.c
diff --git a/sysdeps/unix/bsd/syscalls.list b/sysdeps/unix/bsd/syscalls.list
index e84819d..9f48a14 100644
--- a/sysdeps/unix/bsd/syscalls.list
+++ b/sysdeps/unix/bsd/syscalls.list
@@ -1,14 +1,16 @@
# File name Caller Syscall name # args Strong name Weak names
+chflags - chflags 2 chflags
+fchflags - fchflags 2 fchflags
flock - flock 2 __flock flock
getdents - getdirentries 4 __getdirentries getdirentries
getdtsz - getdtablesize 0 __getdtablesize getdtablesize
getpagesize - getpagesize 0 __getpagesize getpagesize
killpg - killpg 2 killpg
-sigblock - sigblock 1 __sigblock sigblock
+revoke - revoke 1 revoke
+setlogin - setlogin 2 setlogin
+sigaltstack - sigaltstack 2 __sigaltstack sigaltstack
sigpause - sigpause 1 __sigpause sigpause
-sigsetmask - sigsetmask 1 __sigsetmask sigsetmask
sigstack - sigstack 2 sigstack
sigvec - sigvec 3 __sigvec sigvec
-wait3 - wait3 3 __wait3 wait3
-waitpid - waitpid 3 __waitpid waitpid
+wait4 - wait4 4 __wait4 wait4
diff --git a/sysdeps/unix/bsd/bsd4.4/tcdrain.c b/sysdeps/unix/bsd/tcdrain.c
similarity index 100%
rename from sysdeps/unix/bsd/bsd4.4/tcdrain.c
rename to sysdeps/unix/bsd/tcdrain.c
diff --git a/sysdeps/unix/bsd/bsd4.4/tcgetattr.c b/sysdeps/unix/bsd/tcgetattr.c
similarity index 100%
rename from sysdeps/unix/bsd/bsd4.4/tcgetattr.c
rename to sysdeps/unix/bsd/tcgetattr.c
diff --git a/sysdeps/unix/bsd/bsd4.4/tcsetattr.c b/sysdeps/unix/bsd/tcsetattr.c
similarity index 100%
rename from sysdeps/unix/bsd/bsd4.4/tcsetattr.c
rename to sysdeps/unix/bsd/tcsetattr.c
diff --git a/sysdeps/unix/bsd/bsd4.4/wait.c b/sysdeps/unix/bsd/wait.c
similarity index 100%
rename from sysdeps/unix/bsd/bsd4.4/wait.c
rename to sysdeps/unix/bsd/wait.c
diff --git a/sysdeps/unix/bsd/bsd4.4/wait3.c b/sysdeps/unix/bsd/wait3.c
similarity index 100%
rename from sysdeps/unix/bsd/bsd4.4/wait3.c
rename to sysdeps/unix/bsd/wait3.c
diff --git a/sysdeps/unix/bsd/bsd4.4/waitpid.c b/sysdeps/unix/bsd/waitpid.c
similarity index 100%
rename from sysdeps/unix/bsd/bsd4.4/waitpid.c
rename to sysdeps/unix/bsd/waitpid.c
diff --git a/sysdeps/unix/sysv/linux/wait3.c b/sysdeps/unix/sysv/linux/wait3.c
index 0b3bdee..2ff027f 100644
--- a/sysdeps/unix/sysv/linux/wait3.c
+++ b/sysdeps/unix/sysv/linux/wait3.c
@@ -1 +1 @@
-#include <sysdeps/unix/bsd/bsd4.4/wait3.c>
+#include <sysdeps/unix/bsd/wait3.c>
--
Joseph S. Myers
joseph@codesourcery.com