00db10
commit ef7344f09c5ce00eb519ed14598b2a8e39c68387
00db10
Author: Joseph Myers <joseph@codesourcery.com>
00db10
Date:   Sun Dec 22 14:49:48 2013 +0000
00db10
00db10
    Flatten sysdeps/unix/bsd/bsd4.4 into sysdeps/unix/bsd.
00db10
    
00db10
    As discussed in
00db10
    <https://sourceware.org/ml/libc-alpha/2012-04/msg00840.html> and
00db10
    <https://sourceware.org/ml/libc-alpha/2012-04/msg00989.html>, it seems
00db10
    appropriate to flatten sysdeps/unix/bsd/bsd4.4 into sysdeps/unix/bsd.
00db10
    
00db10
    The bulk of the patch is just moving files.  The only other changes
00db10
    are: update paths in sysdeps/mach/hurd/Implies and
00db10
    sysdeps/unix/sysv/linux/wait3.c; merge the two syscalls.list files,
00db10
    with the removal of syscalls that were in
00db10
    sysdeps/unix/bsd/syscalls.list but overridden in the bsd4.4 directory
00db10
    by .c files there.
00db10
    
00db10
    Tested x86_64.  The installed shared libraries are identical before
00db10
    and after the patch except for libc.so where the move of wait3.c
00db10
    (included by sysdeps/unix/sysv/linux/wait3.c) affects debug info, but
00db10
    the disassembly is unchanged.
00db10
    
00db10
            * sysdeps/mach/hurd/Implies: Change unix/bsd/bsd4.4 to unix/bsd.
00db10
            * sysdeps/unix/bsd/syscalls.list (chflags): Add entry from
00db10
            sysdeps/unix/bsd/bsd4.4/syscalls.list.
00db10
            (fchflags): Likewise.
00db10
            (revoke): Likewise.
00db10
            (setlogin): Likewise.
00db10
            (sigaltstack): Likewise.
00db10
            (wait4): Likewise.
00db10
            (sigblock): Remove.
00db10
            (sigsetmask): Likewise.
00db10
            (wait3): Likewise.
00db10
            (waitpid): Likewise.
00db10
            * sysdeps/unix/bsd/bsd4.4/syscalls.list: Remove file.
00db10
            * sysdeps/unix/sysv/linux/wait3.c: Update directory of included
00db10
            file.
00db10
            * sysdeps/unix/bsd/bsd4.4/Makefile: Move to ...
00db10
            * sysdeps/unix/bsd/Makefile: ... here.
00db10
            * sysdeps/unix/bsd/bsd4.4/Versions: Move to ...
00db10
            * sysdeps/unix/bsd/Versions: ... here.
00db10
            * sysdeps/unix/bsd/bsd4.4/bits/sockaddr.h: Move to ...
00db10
            * sysdeps/unix/bsd/bits/sockaddr.h: ... here.
00db10
            * sysdeps/unix/bsd/bsd4.4/cmsg_nxthdr.c: Move to ...
00db10
            * sysdeps/unix/bsd/cmsg_nxthdr.c: ... here.
00db10
            * sysdeps/unix/bsd/bsd4.4/sigblock.c: Move to ...
00db10
            * sysdeps/unix/bsd/sigblock.c: ... here.
00db10
            * sysdeps/unix/bsd/bsd4.4/sigsetmask.c: Move to ...
00db10
            * sysdeps/unix/bsd/sigsetmask.c: ... here.
00db10
            * sysdeps/unix/bsd/bsd4.4/sigvec.c: Move to ...
00db10
            * sysdeps/unix/bsd/sigvec.c: ... here.
00db10
            * sysdeps/unix/bsd/bsd4.4/tcdrain.c: Move to ...
00db10
            * sysdeps/unix/bsd/tcdrain.c: ... here.
00db10
            * sysdeps/unix/bsd/bsd4.4/tcgetattr.c: Move to ...
00db10
            * sysdeps/unix/bsd/tcgetattr.c: ... here.
00db10
            * sysdeps/unix/bsd/bsd4.4/tcsetattr.c: Move to ...
00db10
            * sysdeps/unix/bsd/tcsetattr.c: ... here.
00db10
            * sysdeps/unix/bsd/bsd4.4/wait.c: Move to ...
00db10
            * sysdeps/unix/bsd/wait.c: ... here.
00db10
            * sysdeps/unix/bsd/bsd4.4/wait3.c: Move to ...
00db10
            * sysdeps/unix/bsd/wait3.c: ... here.
00db10
            * sysdeps/unix/bsd/bsd4.4/waitpid.c: Move to ...
00db10
            * sysdeps/unix/bsd/waitpid.c: ... here.
00db10
00db10
diff --git a/sysdeps/mach/hurd/Implies b/sysdeps/mach/hurd/Implies
00db10
index b6063463ce34f3b7..d2d5234c1fdf1522 100644
00db10
--- a/sysdeps/mach/hurd/Implies
00db10
+++ b/sysdeps/mach/hurd/Implies
00db10
@@ -2,4 +2,4 @@
00db10
 # Hurd-based GNU systems.
00db10
 gnu
00db10
 # The Hurd provides a rough superset of the functionality of 4.4 BSD.
00db10
-unix/bsd/bsd4.4
00db10
+unix/bsd
00db10
diff --git a/sysdeps/unix/bsd/bsd4.4/Makefile b/sysdeps/unix/bsd/Makefile
00db10
similarity index 100%
00db10
rename from sysdeps/unix/bsd/bsd4.4/Makefile
00db10
rename to sysdeps/unix/bsd/Makefile
00db10
diff --git a/sysdeps/unix/bsd/bsd4.4/Versions b/sysdeps/unix/bsd/Versions
00db10
similarity index 100%
00db10
rename from sysdeps/unix/bsd/bsd4.4/Versions
00db10
rename to sysdeps/unix/bsd/Versions
00db10
diff --git a/sysdeps/unix/bsd/bsd4.4/bits/sockaddr.h b/sysdeps/unix/bsd/bits/sockaddr.h
00db10
similarity index 100%
00db10
rename from sysdeps/unix/bsd/bsd4.4/bits/sockaddr.h
00db10
rename to sysdeps/unix/bsd/bits/sockaddr.h
00db10
diff --git a/sysdeps/unix/bsd/bsd4.4/syscalls.list b/sysdeps/unix/bsd/bsd4.4/syscalls.list
00db10
deleted file mode 100644
00db10
index a4d354685424ac61..0000000000000000
00db10
--- a/sysdeps/unix/bsd/bsd4.4/syscalls.list
00db10
+++ /dev/null
00db10
@@ -1,8 +0,0 @@
00db10
-# File name	Caller	Syscall name	# args	Strong name	Weak names
00db10
-
00db10
-chflags		-	chflags		2	chflags
00db10
-fchflags	-	fchflags	2	fchflags
00db10
-revoke		-	revoke		1	revoke
00db10
-setlogin	-	setlogin	2	setlogin
00db10
-sigaltstack	-	sigaltstack	2	__sigaltstack	sigaltstack
00db10
-wait4		-	wait4		4	__wait4		wait4
00db10
diff --git a/sysdeps/unix/bsd/bsd4.4/cmsg_nxthdr.c b/sysdeps/unix/bsd/cmsg_nxthdr.c
00db10
similarity index 100%
00db10
rename from sysdeps/unix/bsd/bsd4.4/cmsg_nxthdr.c
00db10
rename to sysdeps/unix/bsd/cmsg_nxthdr.c
00db10
diff --git a/sysdeps/unix/bsd/bsd4.4/sigblock.c b/sysdeps/unix/bsd/sigblock.c
00db10
similarity index 100%
00db10
rename from sysdeps/unix/bsd/bsd4.4/sigblock.c
00db10
rename to sysdeps/unix/bsd/sigblock.c
00db10
diff --git a/sysdeps/unix/bsd/bsd4.4/sigsetmask.c b/sysdeps/unix/bsd/sigsetmask.c
00db10
similarity index 100%
00db10
rename from sysdeps/unix/bsd/bsd4.4/sigsetmask.c
00db10
rename to sysdeps/unix/bsd/sigsetmask.c
00db10
diff --git a/sysdeps/unix/bsd/bsd4.4/sigvec.c b/sysdeps/unix/bsd/sigvec.c
00db10
similarity index 100%
00db10
rename from sysdeps/unix/bsd/bsd4.4/sigvec.c
00db10
rename to sysdeps/unix/bsd/sigvec.c
00db10
diff --git a/sysdeps/unix/bsd/syscalls.list b/sysdeps/unix/bsd/syscalls.list
00db10
index e84819dc1f19d148..9f48a144d475f342 100644
00db10
--- a/sysdeps/unix/bsd/syscalls.list
00db10
+++ b/sysdeps/unix/bsd/syscalls.list
00db10
@@ -1,14 +1,16 @@
00db10
 # File name	Caller	Syscall name	# args	Strong name	Weak names
00db10
 
00db10
+chflags		-	chflags		2	chflags
00db10
+fchflags	-	fchflags	2	fchflags
00db10
 flock		-	flock		2	__flock		flock
00db10
 getdents	-	getdirentries	4	__getdirentries	getdirentries
00db10
 getdtsz		-	getdtablesize	0	__getdtablesize	getdtablesize
00db10
 getpagesize	-	getpagesize	0	__getpagesize	getpagesize
00db10
 killpg		-	killpg		2	killpg
00db10
-sigblock	-	sigblock	1	__sigblock	sigblock
00db10
+revoke		-	revoke		1	revoke
00db10
+setlogin	-	setlogin	2	setlogin
00db10
+sigaltstack	-	sigaltstack	2	__sigaltstack	sigaltstack
00db10
 sigpause	-	sigpause	1	__sigpause	sigpause
00db10
-sigsetmask	-	sigsetmask	1	__sigsetmask	sigsetmask
00db10
 sigstack	-	sigstack	2	sigstack
00db10
 sigvec		-	sigvec		3	__sigvec	sigvec
00db10
-wait3		-	wait3		3	__wait3		wait3
00db10
-waitpid		-	waitpid		3	__waitpid	waitpid
00db10
+wait4		-	wait4		4	__wait4		wait4
00db10
diff --git a/sysdeps/unix/bsd/bsd4.4/tcdrain.c b/sysdeps/unix/bsd/tcdrain.c
00db10
similarity index 100%
00db10
rename from sysdeps/unix/bsd/bsd4.4/tcdrain.c
00db10
rename to sysdeps/unix/bsd/tcdrain.c
00db10
diff --git a/sysdeps/unix/bsd/bsd4.4/tcgetattr.c b/sysdeps/unix/bsd/tcgetattr.c
00db10
similarity index 100%
00db10
rename from sysdeps/unix/bsd/bsd4.4/tcgetattr.c
00db10
rename to sysdeps/unix/bsd/tcgetattr.c
00db10
diff --git a/sysdeps/unix/bsd/bsd4.4/tcsetattr.c b/sysdeps/unix/bsd/tcsetattr.c
00db10
similarity index 100%
00db10
rename from sysdeps/unix/bsd/bsd4.4/tcsetattr.c
00db10
rename to sysdeps/unix/bsd/tcsetattr.c
00db10
diff --git a/sysdeps/unix/bsd/bsd4.4/wait.c b/sysdeps/unix/bsd/wait.c
00db10
similarity index 100%
00db10
rename from sysdeps/unix/bsd/bsd4.4/wait.c
00db10
rename to sysdeps/unix/bsd/wait.c
00db10
diff --git a/sysdeps/unix/bsd/bsd4.4/wait3.c b/sysdeps/unix/bsd/wait3.c
00db10
similarity index 100%
00db10
rename from sysdeps/unix/bsd/bsd4.4/wait3.c
00db10
rename to sysdeps/unix/bsd/wait3.c
00db10
diff --git a/sysdeps/unix/bsd/bsd4.4/waitpid.c b/sysdeps/unix/bsd/waitpid.c
00db10
similarity index 100%
00db10
rename from sysdeps/unix/bsd/bsd4.4/waitpid.c
00db10
rename to sysdeps/unix/bsd/waitpid.c
00db10
diff --git a/sysdeps/unix/sysv/linux/wait3.c b/sysdeps/unix/sysv/linux/wait3.c
00db10
index 0b3bdee771782b7b..2ff027f0e1d83eb2 100644
00db10
--- a/sysdeps/unix/sysv/linux/wait3.c
00db10
+++ b/sysdeps/unix/sysv/linux/wait3.c
00db10
@@ -1 +1 @@
00db10
-#include <sysdeps/unix/bsd/bsd4.4/wait3.c>
00db10
+#include <sysdeps/unix/bsd/wait3.c>