AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-03 00:10:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove __libc_waitpid function name.

Browse Source 
Continuing the removal of unused __libc_* function names, this patch
removes the __libc_waitpid name.

Tested for x86_64 (testsuite, and that disassembly of installed shared
libraries is unchanged by the patch; __waitpid, which is exported from
shared libc, changes from weak to strong on some configurations, which
is of no significance).

	* include/sys/wait.h (__libc_waitpid): Remove declaration.
	* posix/waitpid.c (__libc_waitpid): Rename to __waitpid.
	(__waitpid): Don't define as alias.  Use libc_hidden_def not
	libc_hidden_weak.
	(waitpid): Define as alias of __waitpid.
	* sysdeps/unix/bsd/waitpid.c (__libc_waitpid): Rename to
	__waitpid.
	(__waitpid): Don't define as alias.  Use libc_hidden_def not
	libc_hidden_weak.
	(waitpid): Define as alias of __waitpid.
	* sysdeps/unix/sysv/linux/i386/syscalls.list (waitpid): Remove
	__libc_waitpid alias.
	* sysdeps/unix/sysv/linux/m68k/syscalls.list (waitpid): Likewise.
	* sysdeps/unix/sysv/linux/powerpc/syscalls.list (waitpid):
	Likewise.
	* sysdeps/unix/sysv/linux/sh/syscalls.list (waitpid): Likewise.
	* sysdeps/unix/sysv/linux/sparc/syscalls.list (waitpid): Likewise.
	* sysdeps/unix/sysv/linux/tile/waitpid.S (__libc_waitpid): Remove
	alias.
	* sysdeps/unix/sysv/linux/waitpid.c (__libc_waitpid): Rename to
	__waitpid.
	(__waitpid): Don't define as alias.  Use libc_hidden_def not
	libc_hidden_weak.
	(waitpid): Define as alias of __waitpid.
This commit is contained in:
Joseph Myers 2014-11-07 01:27:16 +00:00
parent a2887bdb27
commit 2c46a66a3a
11 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ChangeLog
View File

@ -1,3 +1,30 @@
2014-11-07 Joseph Myers <joseph@codesourcery.com>
* include/sys/wait.h (__libc_waitpid): Remove declaration.
* posix/waitpid.c (__libc_waitpid): Rename to __waitpid.
(__waitpid): Don't define as alias. Use libc_hidden_def not
libc_hidden_weak.
(waitpid): Define as alias of __waitpid.
* sysdeps/unix/bsd/waitpid.c (__libc_waitpid): Rename to
__waitpid.
(__waitpid): Don't define as alias. Use libc_hidden_def not
libc_hidden_weak.
(waitpid): Define as alias of __waitpid.
* sysdeps/unix/sysv/linux/i386/syscalls.list (waitpid): Remove
__libc_waitpid alias.
* sysdeps/unix/sysv/linux/m68k/syscalls.list (waitpid): Likewise.
* sysdeps/unix/sysv/linux/powerpc/syscalls.list (waitpid):
Likewise.
* sysdeps/unix/sysv/linux/sh/syscalls.list (waitpid): Likewise.
* sysdeps/unix/sysv/linux/sparc/syscalls.list (waitpid): Likewise.
* sysdeps/unix/sysv/linux/tile/waitpid.S (__libc_waitpid): Remove
alias.
* sysdeps/unix/sysv/linux/waitpid.c (__libc_waitpid): Rename to
__waitpid.
(__waitpid): Don't define as alias. Use libc_hidden_def not
libc_hidden_weak.
(waitpid): Define as alias of __waitpid.
2014-11-06 Carlos O'Donell <carlos@redhat.com> 2014-11-06 Carlos O'Donell <carlos@redhat.com>
* manual/llio.texi: Add comment that write safety has been * manual/llio.texi: Add comment that write safety has been

1
include/sys/wait.h
View File

@ -8,7 +8,6 @@ extern __pid_t __waitpid (__pid_t __pid, int *__stat_loc,
libc_hidden_proto (__waitpid) libc_hidden_proto (__waitpid)
extern int __waitid (idtype_t idtype, id_t id, siginfo_t *infop, int options); extern int __waitid (idtype_t idtype, id_t id, siginfo_t *infop, int options);
extern __pid_t __libc_waitpid (pid_t __pid, int *__stat_loc, int __options);
extern __pid_t __libc_wait (int *__stat_loc); extern __pid_t __libc_wait (int *__stat_loc);
extern __pid_t __wait (__WAIT_STATUS __stat_loc); extern __pid_t __wait (__WAIT_STATUS __stat_loc);
extern __pid_t __wait3 (__WAIT_STATUS __stat_loc, extern __pid_t __wait3 (__WAIT_STATUS __stat_loc,

7
posix/waitpid.c
View File

@ -33,7 +33,7 @@
Return (pid_t) -1 for errors. If the WUNTRACED bit is set in OPTIONS, Return (pid_t) -1 for errors. If the WUNTRACED bit is set in OPTIONS,
return status for stopped children; otherwise don't. */ return status for stopped children; otherwise don't. */
pid_t pid_t
__libc_waitpid (pid_t pid, int *stat_loc, int options) __waitpid (pid_t pid, int *stat_loc, int options)
{ {
if ((options & ~(WNOHANG|WUNTRACED)) != 0) if ((options & ~(WNOHANG|WUNTRACED)) != 0)
{ {
@ -44,8 +44,7 @@ __libc_waitpid (pid_t pid, int *stat_loc, int options)
__set_errno (ENOSYS); __set_errno (ENOSYS);
return (pid_t) -1; return (pid_t) -1;
} }
weak_alias (__libc_waitpid, __waitpid) libc_hidden_def (__waitpid)
libc_hidden_weak (__waitpid) weak_alias (__waitpid, waitpid)
weak_alias (__libc_waitpid, waitpid)
stub_warning (waitpid) stub_warning (waitpid)

7
sysdeps/unix/bsd/waitpid.c
View File

@ -33,11 +33,10 @@
Return (pid_t) -1 for errors. If the WUNTRACED bit is set in OPTIONS, Return (pid_t) -1 for errors. If the WUNTRACED bit is set in OPTIONS,
return status for stopped children; otherwise don't. */ return status for stopped children; otherwise don't. */
pid_t pid_t
__libc_waitpid (pid_t pid, int *stat_loc, int options) __waitpid (pid_t pid, int *stat_loc, int options)
{ {
return __wait4 (pid, (union wait *) stat_loc, options, NULL); return __wait4 (pid, (union wait *) stat_loc, options, NULL);
} }
weak_alias (__libc_waitpid, __waitpid) libc_hidden_def (__waitpid)
libc_hidden_weak (__waitpid) weak_alias (__waitpid, waitpid)
weak_alias (__libc_waitpid, waitpid)

2
sysdeps/unix/sysv/linux/i386/syscalls.list
View File

@ -20,7 +20,7 @@ vm86old EXTRA vm86old i:p __vm86old vm86@GLIBC_2.0
vm86 - vm86 i:ip __vm86 vm86@@GLIBC_2.3.4 vm86 - vm86 i:ip __vm86 vm86@@GLIBC_2.3.4
oldgetrlimit EXTRA getrlimit i:ip __old_getrlimit getrlimit@GLIBC_2.0 oldgetrlimit EXTRA getrlimit i:ip __old_getrlimit getrlimit@GLIBC_2.0
setrlimit - setrlimit i:ip __setrlimit setrlimit@GLIBC_2.0 setrlimit@@GLIBC_2.2 setrlimit - setrlimit i:ip __setrlimit setrlimit@GLIBC_2.0 setrlimit@@GLIBC_2.2
waitpid - waitpid Ci:ipi __waitpid waitpid __libc_waitpid waitpid - waitpid Ci:ipi __waitpid waitpid
prlimit64 EXTRA prlimit64 i:iipp prlimit64 prlimit64 EXTRA prlimit64 i:iipp prlimit64

2
sysdeps/unix/sysv/linux/m68k/syscalls.list
View File

@ -3,7 +3,7 @@
chown - chown32 i:sii __chown chown chown - chown32 i:sii __chown chown
lchown - lchown32 i:sii __lchown lchown lchown - lchown32 i:sii __lchown lchown
fchown - fchown32 i:iii __fchown fchown fchown - fchown32 i:iii __fchown fchown
waitpid - waitpid Ci:ipi __waitpid waitpid __libc_waitpid waitpid - waitpid Ci:ipi __waitpid waitpid
getegid - getegid32 Ei: __getegid getegid getegid - getegid32 Ei: __getegid getegid
geteuid - geteuid32 Ei: __geteuid geteuid geteuid - geteuid32 Ei: __geteuid geteuid

2
sysdeps/unix/sysv/linux/powerpc/syscalls.list
View File

@ -1,3 +1,3 @@
# File name Caller Syscall name # args Strong name Weak names # File name Caller Syscall name # args Strong name Weak names
waitpid - waitpid Ci:ipi __waitpid waitpid __libc_waitpid waitpid - waitpid Ci:ipi __waitpid waitpid

2
sysdeps/unix/sysv/linux/sh/syscalls.list
View File

@ -15,7 +15,7 @@ getgroups - getgroups32 i:ip __getgroups getgroups
setfsgid - setfsgid32 Ei:i setfsgid setfsgid - setfsgid32 Ei:i setfsgid
setfsuid - setfsuid32 Ei:i setfsuid setfsuid - setfsuid32 Ei:i setfsuid
waitpid - waitpid Ci:ipi __waitpid waitpid __libc_waitpid waitpid - waitpid Ci:ipi __waitpid waitpid
prlimit64 EXTRA prlimit64 i:iipp prlimit64 prlimit64 EXTRA prlimit64 i:iipp prlimit64

2
sysdeps/unix/sysv/linux/sparc/syscalls.list
View File

@ -1,3 +1,3 @@
# File name Caller Syscall name # args Strong name Weak names # File name Caller Syscall name # args Strong name Weak names
waitpid - waitpid Ci:ipi __waitpid waitpid __libc_waitpid waitpid - waitpid Ci:ipi __waitpid waitpid

2
sysdeps/unix/sysv/linux/tile/waitpid.S
View File

@ -14,7 +14,5 @@ PSEUDO_END(__waitpid)
libc_hidden_def (__waitpid) libc_hidden_def (__waitpid)
weak_alias (__waitpid, waitpid) weak_alias (__waitpid, waitpid)
libc_hidden_weak (waitpid) libc_hidden_weak (waitpid)
weak_alias (__waitpid, __libc_waitpid)
libc_hidden_weak (__libc_waitpid)
#endif #endif

7
sysdeps/unix/sysv/linux/waitpid.c
View File

@ -21,7 +21,7 @@
#include <sys/wait.h> #include <sys/wait.h>
__pid_t __pid_t
__libc_waitpid (__pid_t pid, int *stat_loc, int options) __waitpid (__pid_t pid, int *stat_loc, int options)
{ {
if (SINGLE_THREAD_P) if (SINGLE_THREAD_P)
{ {
@ -44,6 +44,5 @@ __libc_waitpid (__pid_t pid, int *stat_loc, int options)
return result; return result;
} }
weak_alias (__libc_waitpid, __waitpid) libc_hidden_def (__waitpid)
libc_hidden_weak (__waitpid) weak_alias (__waitpid, waitpid)
weak_alias (__libc_waitpid, waitpid)