Merge from NPTL branch.

diff --git a/libc/sysdeps/linux/mips/sigaction.c b/libc/sysdeps/linux/mips/sigaction.c
index 3763709..b298267 100644 (file)
--- a/libc/sysdeps/linux/mips/sigaction.c
+++ b/libc/sysdeps/linux/mips/sigaction.c
@@ -39,7 +39,7 @@ int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oa
 
     if (act) {
        kact.k_sa_handler = act->sa_handler;
-       memcpy (&kact.sa_mask, &act->sa_mask, sizeof (kact.sa_mask));
+       __memcpy (&kact.sa_mask, &act->sa_mask, sizeof (kact.sa_mask));
        kact.sa_flags = act->sa_flags;
 # ifdef HAVE_SA_RESTORER
 #  if _MIPS_SIM == _ABIO32
@@ -57,7 +57,7 @@ int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oa
 
     if (oact && result >= 0) {
        oact->sa_handler = koact.k_sa_handler;
-       memcpy (&oact->sa_mask, &koact.sa_mask, sizeof (oact->sa_mask));
+       __memcpy (&oact->sa_mask, &koact.sa_mask, sizeof (oact->sa_mask));
        oact->sa_flags = koact.sa_flags;
 # ifdef HAVE_SA_RESTORER
        oact->sa_restorer = koact.sa_restorer;