about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2014-11-01 12:26:09 +0000
committerJoseph Myers <joseph@codesourcery.com>2014-11-01 12:26:09 +0000
commit1679ba8eb6b55a612e15b50139cd2a7ffde61d43 (patch)
tree57649af3302dca71603fab2c0b12805adb04f89d
parent2626c18374b0260a9b4afb7763de19488a87d2ba (diff)
downloadglibc-1679ba8eb6b55a612e15b50139cd2a7ffde61d43.tar.gz
glibc-1679ba8eb6b55a612e15b50139cd2a7ffde61d43.tar.xz
glibc-1679ba8eb6b55a612e15b50139cd2a7ffde61d43.zip
Remove __libc_nanosleep function name.
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.
-rw-r--r--ChangeLog8
-rw-r--r--posix/nanosleep.c7
-rw-r--r--sysdeps/unix/sysv/linux/syscalls.list2
3 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a47cbcaa8..b4353739be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/posix/nanosleep.c b/posix/nanosleep.c
index 19111e3247..3a0e433f6e 100644
--- a/posix/nanosleep.c
+++ b/posix/nanosleep.c
@@ -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)
diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list
index a9e5c7b782..42b6c2ef42 100644
--- a/sysdeps/unix/sysv/linux/syscalls.list
+++ b/sysdeps/unix/sysv/linux/syscalls.list
@@ -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