3 files changed, 7 insertions, 5 deletions
diff --git a/libpthread/nptl/init.c b/libpthread/nptl/init.c
index f380a5c5a..6d1ead43b 100644
--- a/libpthread/nptl/init.c
+++ b/libpthread/nptl/init.c
@@ -264,13 +264,13 @@ __pthread_initialize_minimal_internal (void)
   sa.sa_flags = SA_SIGINFO;
   __sigemptyset (&sa.sa_mask);
 
-  (void) __sigaction_internal (SIGCANCEL, &sa, NULL);
+  (void) __libc_sigaction (SIGCANCEL, &sa, NULL);
 
   /* Install the handle to change the threads' uid/gid.  */
   sa.sa_sigaction = sighandler_setxid;
   sa.sa_flags = SA_SIGINFO | SA_RESTART;
 
-  (void) __sigaction_internal (SIGSETXID, &sa, NULL);
+  (void) __libc_sigaction (SIGSETXID, &sa, NULL);
 
   /* The parent process might have left the signals blocked.  Just in
      case, unblock it.  We reuse the signal mask in the sigaction
diff --git a/libpthread/nptl/sysdeps/pthread/sigaction.c b/libpthread/nptl/sysdeps/pthread/sigaction.c
index b1efb5c37..6ab8a5279 100644
--- a/libpthread/nptl/sysdeps/pthread/sigaction.c
+++ b/libpthread/nptl/sysdeps/pthread/sigaction.c
@@ -42,7 +42,7 @@ __sigaction (sig, act, oact)
       return -1;
     }
 
-  return __sigaction_internal (sig, act, oact);
+  return __libc_sigaction (sig, act, oact);
 }
 weak_alias(__sigaction, sigaction)
 
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sigwaitinfo.c b/libpthread/nptl/sysdeps/unix/sysv/linux/sigwaitinfo.c
index 4342cedf1..c6ea739d3 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sigwaitinfo.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sigwaitinfo.c
@@ -68,8 +68,10 @@ do_sigwaitinfo (const sigset_t *set, siginfo_t *info)
 
 
 /* Return any pending signal or wait for one for the given time.  */
-int attribute_hidden
-__sigwaitinfo (const sigset_t *set, siginfo_t *info)
+int
+__sigwaitinfo (set, info)
+     const sigset_t *set;
+     siginfo_t *info;
 {
   if (SINGLE_THREAD_P)
     return do_sigwaitinfo (set, info);