Blame SOURCES/glibc-rh1505492-bsd-flatten.patch

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