about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--misc/pselect.c1
-rw-r--r--sysdeps/unix/sysv/linux/pselect.c1
3 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6a63313151..a050d89c80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-10-31  Joseph Myers  <joseph@codesourcery.com>
 
+	* misc/pselect.c [!__pselect] (__libc_pselect): Remove alias.
+	* sysdeps/unix/sysv/linux/pselect.c [__NR_pselect6]
+	(__libc_pselect): Likewise.
+
 	[BZ #14138]
 	* sysdeps/unix/sysv/linux/powerpc/powerpc64/pread.c: Remove file.
 	* sysdeps/unix/sysv/linux/powerpc/powerpc64/pread64.c: Likewise.
diff --git a/misc/pselect.c b/misc/pselect.c
index 478dcce330..ba757dfffa 100644
--- a/misc/pselect.c
+++ b/misc/pselect.c
@@ -73,7 +73,6 @@ __pselect (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
 }
 #ifndef __pselect
 weak_alias (__pselect, pselect)
-strong_alias (__pselect, __libc_pselect)
 /* __select handles cancellation.  */
 LIBC_CANCEL_HANDLED ();
 #endif
diff --git a/sysdeps/unix/sysv/linux/pselect.c b/sysdeps/unix/sysv/linux/pselect.c
index b4e77c16aa..5c745c98d8 100644
--- a/sysdeps/unix/sysv/linux/pselect.c
+++ b/sysdeps/unix/sysv/linux/pselect.c
@@ -89,7 +89,6 @@ __pselect (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
   return result;
 }
 weak_alias (__pselect, pselect)
-strong_alias (__pselect, __libc_pselect)
 
 # ifndef __ASSUME_PSELECT
 #  define __pselect static __generic_pselect