From e876b09076d859836f948691dee5a1e3b956256e Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@hack.frob.com>
Date: Thu, 12 Jun 2014 10:32:18 -0700
Subject: [PATCH] Consolidate NPTL sigprocmask.

---
 ChangeLog                             |  3 +++
 nptl/sysdeps/pthread/sigprocmask.c    | 19 -------------------
 sysdeps/unix/sysv/linux/sigprocmask.c |  3 ++-
 3 files changed, 5 insertions(+), 20 deletions(-)
 delete mode 100644 nptl/sysdeps/pthread/sigprocmask.c

diff --git a/ChangeLog b/ChangeLog
index b3097e99b2..0f66198d68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-06-12  Roland McGrath  <roland@hack.frob.com>
 
+	* sysdeps/unix/sysv/linux/sigprocmask.c: Include <nptl/pthreadP.h>.
+	* nptl/sysdeps/pthread/sigprocmask.c: File removed.
+
 	* nptl/sysdeps/i386/i486/pthread_spin_trylock.S: Moved ...
 	* sysdeps/i386/i486/nptl/pthread_spin_trylock.S: ... here.
 	* nptl/sysdeps/i386/i586/pthread_spin_trylock.S: Moved ...
diff --git a/nptl/sysdeps/pthread/sigprocmask.c b/nptl/sysdeps/pthread/sigprocmask.c
deleted file mode 100644
index 3c7802a27a..0000000000
--- a/nptl/sysdeps/pthread/sigprocmask.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright (C) 1997-2014 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <nptl/pthreadP.h>
-#include <sysdeps/unix/sysv/linux/sigprocmask.c>
diff --git a/sysdeps/unix/sysv/linux/sigprocmask.c b/sysdeps/unix/sysv/linux/sigprocmask.c
index fe0a150bce..8199874cac 100644
--- a/sysdeps/unix/sysv/linux/sigprocmask.c
+++ b/sysdeps/unix/sysv/linux/sigprocmask.c
@@ -17,12 +17,13 @@
 
 #include <errno.h>
 #include <signal.h>
-#include <string.h>	/* Neede for string function builtin redirection.  */
+#include <string.h>  /* Needed for string function builtin redirection.  */
 #include <unistd.h>
 
 #include <sysdep.h>
 #include <sys/syscall.h>
 
+#include <nptl/pthreadP.h>              /* SIGCANCEL, SIGSETXID */
 #include <kernel-features.h>