Skip to content

Commit

Permalink
Remove __libc_nanosleep function name.
Browse files Browse the repository at this point in the history
Continuing the removal of unused __libc_* function names, this patch
removes the __libc_nanosleep name.

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

	* posix/nanosleep.c (__libc_nanosleep): Rename to __nanosleep.
	(__nanosleep): Do not define as alias.
	(nanosleep): Define as alias of __nanosleep.
	* sysdeps/unix/sysv/linux/syscalls.list (nanosleep): Remove
	__libc_nanosleep name.
  • Loading branch information
Joseph Myers committed Nov 1, 2014
1 parent 2626c18 commit 1679ba8
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
8 changes: 8 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
2014-11-01 Joseph Myers <joseph@codesourcery.com>

* posix/nanosleep.c (__libc_nanosleep): Rename to __nanosleep.
(__nanosleep): Do not define as alias.
(nanosleep): Define as alias of __nanosleep.
* sysdeps/unix/sysv/linux/syscalls.list (nanosleep): Remove
__libc_nanosleep name.

2014-10-31 Joseph Myers <joseph@codesourcery.com>

* aclocal.m4 (GLIBC_AUTOCONF_VERSION): Mention need to update
Expand Down
7 changes: 3 additions & 4 deletions posix/nanosleep.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,13 @@

/* Pause execution for a number of nanoseconds. */
int
__libc_nanosleep (const struct timespec *requested_time,
struct timespec *remaining)
__nanosleep (const struct timespec *requested_time,
struct timespec *remaining)
{
__set_errno (ENOSYS);
return -1;
}
stub_warning (nanosleep)

weak_alias (__libc_nanosleep, __nanosleep)
libc_hidden_def (__nanosleep)
weak_alias (__libc_nanosleep, nanosleep)
weak_alias (__nanosleep, nanosleep)
2 changes: 1 addition & 1 deletion sysdeps/unix/sysv/linux/syscalls.list
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ mount EXTRA mount i:sssip __mount mount
mremap EXTRA mremap b:ainip __mremap mremap
munlock - munlock i:ai munlock
munlockall - munlockall i: munlockall
nanosleep - nanosleep Ci:pp __libc_nanosleep __nanosleep nanosleep
nanosleep - nanosleep Ci:pp __nanosleep nanosleep
nfsservctl EXTRA nfsservctl i:ipp nfsservctl
pause - pause Ci: __libc_pause pause
personality EXTRA personality i:i __personality personality
Expand Down

0 comments on commit 1679ba8

Please sign in to comment.