From: Roland McGrath <roland@hack.frob.com>
Date: Thu, 31 Jul 2014 18:37:48 +0000 (-0700)
Subject: Split nptl-signals.h out from pthreadP.h
X-Git-Tag: glibc-2.20~69
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=23fe486bebc9ce58405853eb70cd87352156c91d;p=thirdparty%2Fglibc.git

Split nptl-signals.h out from pthreadP.h
---

diff --git a/ChangeLog b/ChangeLog
index de363a6009f..d50535c6fba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-07-31  Roland McGrath  <roland@hack.frob.com>
+
+	* nptl/pthreadP.h (SIGCANCEL, SIGTIMER, SIGSETXID, __xidcmd): Moved ...
+	* sysdeps/unix/sysv/linux/nptl-signals.h: ... to this new file.
+	* sysdeps/nptl/nptl-signals.h: New file.
+	* nptl/pthreadP.h: Include <nptl-signals.h>.
+
 2014-07-31  Stefan Liebler  <stli@linux.vnet.ibm.com>
 
 	* sysdeps/s390/s390-64/utf16-utf32-z9.c
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index 6069be93c33..4226473d592 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -32,6 +32,8 @@
 #include <atomic.h>
 #include <kernel-features.h>
 #include <errno.h>
+#include <nptl-signals.h>
+
 
 /* Atomic operations on TLS memory.  */
 #ifndef THREAD_ATOMIC_CMPXCHG_VAL
@@ -314,22 +316,6 @@ __do_cancel (void)
 # define LIBC_CANCEL_HANDLED()	/* Nothing.  */
 #endif
 
-/* The signal used for asynchronous cancelation.  */
-#define SIGCANCEL	__SIGRTMIN
-
-
-/* Signal needed for the kernel-supported POSIX timer implementation.
-   We can reuse the cancellation signal since we can distinguish
-   cancellation from timer expirations.  */
-#define SIGTIMER	SIGCANCEL
-
-
-/* Signal used to implement the setuid et.al. functions.  */
-#define SIGSETXID	(__SIGRTMIN + 1)
-
-/* Used to communicate with signal handler.  */
-extern struct xid_command *__xidcmd attribute_hidden;
-
 
 /* Internal prototypes.  */
 
diff --git a/sysdeps/nptl/nptl-signals.h b/sysdeps/nptl/nptl-signals.h
new file mode 100644
index 00000000000..38a0608dd3e
--- /dev/null
+++ b/sysdeps/nptl/nptl-signals.h
@@ -0,0 +1,22 @@
+/* Special use of signals in NPTL internals.  Stub version.
+   Copyright (C) 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/>.  */
+
+/* This file can define the macros SIGCANCEL, SIGTIMER, and SIGSETXID to
+   signal numbers reserved by libpthread for those internal purposes.
+
+   Note that some code presumes SIGTIMER is the same as SIGCANCEL.  */
diff --git a/sysdeps/unix/sysv/linux/nptl-signals.h b/sysdeps/unix/sysv/linux/nptl-signals.h
new file mode 100644
index 00000000000..aaa9a6a65da
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/nptl-signals.h
@@ -0,0 +1,33 @@
+/* Special use of signals in NPTL internals.  Linux version.
+   Copyright (C) 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/>.  */
+
+/* The signal used for asynchronous cancelation.  */
+#define SIGCANCEL       __SIGRTMIN
+
+
+/* Signal needed for the kernel-supported POSIX timer implementation.
+   We can reuse the cancellation signal since we can distinguish
+   cancellation from timer expirations.  */
+#define SIGTIMER        SIGCANCEL
+
+
+/* Signal used to implement the setuid et.al. functions.  */
+#define SIGSETXID       (__SIGRTMIN + 1)
+
+/* Used to communicate with signal handler.  */
+extern struct xid_command *__xidcmd attribute_hidden;