Get rid of nptl/sysdeps/pthread/ subdirectory

40 files changed, 105 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 0f66198d68..cff531567b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,83 @@
 2014-06-12  Roland McGrath  <roland@hack.frob.com>
 
+	* sysdeps/nptl/Makefile: Move tst-timer bits to ...
+	* sysdeps/pthread/Makefile: ... here, new file.
+
+	* nptl/sysdeps/unix/sysv/linux/Implies: Moved ...
+	* sysdeps/nptl/Implies: ... here.
+	* sysdeps/unix/sysv/linux/Implies: Add nptl.
+	* nptl/sysdeps/pthread/list.h: Moved ...
+	* include/list.h: ... here.
+	* nptl/sysdeps/pthread/createthread.c: Moved ...
+	* nptl/createthread.c: ... here.
+	* nptl/sysdeps/unix/sysv/linux/createthread.c: Update #include.
+	* nptl/sysdeps/pthread/pt-longjmp.c: Moved ...
+	* nptl/pt-longjmp.c: ... here.
+	* nptl/sysdeps/pthread/Makefile: Moved ...
+	* sysdeps/nptl/Makefile: ... here.
+	* nptl/sysdeps/pthread/Subdirs: Moved ...
+	* sysdeps/nptl/Subdirs: ... here.
+	* nptl/sysdeps/pthread/aio_misc.h: Moved ...
+	* sysdeps/nptl/aio_misc.h: ... here.
+	* nptl/sysdeps/pthread/bits/libc-lock.h: Moved ...
+	* sysdeps/nptl/bits/libc-lock.h: ... here.
+	* nptl/sysdeps/pthread/bits/libc-lockP.h: Moved ...
+	* sysdeps/nptl/bits/libc-lockP.h: ... here.
+	* nptl/sysdeps/pthread/bits/stdio-lock.h: Moved ...
+	* sysdeps/nptl/bits/stdio-lock.h: ... here.
+	* nptl/sysdeps/pthread/configure: Moved ...
+	* sysdeps/nptl/configure: ... here.
+	* nptl/sysdeps/pthread/configure.ac: Moved ...
+	* sysdeps/nptl/configure.ac: ... here.
+	* nptl/sysdeps/pthread/gai_misc.h: Moved ...
+	* sysdeps/nptl/gai_misc.h: ... here.
+	* nptl/sysdeps/pthread/librt-cancellation.c: Moved ...
+	* sysdeps/nptl/librt-cancellation.c: ... here.
+	* nptl/sysdeps/pthread/malloc-machine.h: Moved ...
+	* sysdeps/nptl/malloc-machine.h: ... here.
+	* nptl/sysdeps/pthread/pthread-functions.h: Moved ...
+	* sysdeps/nptl/pthread-functions.h: ... here.
+	* nptl/sysdeps/pthread/pthread.h: Moved ...
+	* sysdeps/nptl/pthread.h: ... here.
+	* nptl/sysdeps/pthread/setxid.h: Moved ...
+	* sysdeps/nptl/setxid.h: ... here.
+	* nptl/sysdeps/pthread/sigfillset.c: Moved ...
+	* sysdeps/nptl/sigfillset.c: ... here.
+	* nptl/sysdeps/pthread/tcb-offsets.h: Moved ...
+	* sysdeps/nptl/tcb-offsets.h: ... here.
+	* nptl/sysdeps/pthread/tst-mqueue8x.c: Moved ...
+	* sysdeps/nptl/tst-mqueue8x.c: ... here.
+	* nptl/sysdeps/pthread/unwind-forcedunwind.c: Moved ...
+	* sysdeps/nptl/unwind-forcedunwind.c: ... here.
+	* nptl/sysdeps/pthread/allocalim.h: Moved ...
+	* sysdeps/pthread/allocalim.h: ... here.
+	* nptl/sysdeps/pthread/bits/sigthread.h: Moved ...
+	* sysdeps/pthread/bits/sigthread.h: ... here.
+	* nptl/sysdeps/pthread/flockfile.c: Moved ...
+	* sysdeps/pthread/flockfile.c: ... here.
+	* nptl/sysdeps/pthread/ftrylockfile.c: Moved ...
+	* sysdeps/pthread/ftrylockfile.c: ... here.
+	* nptl/sysdeps/pthread/funlockfile.c: Moved ...
+	* sysdeps/pthread/funlockfile.c: ... here.
+	* nptl/sysdeps/pthread/posix-timer.h: Moved ...
+	* sysdeps/pthread/posix-timer.h: ... here.
+	* nptl/sysdeps/pthread/timer_create.c: Moved ...
+	* sysdeps/pthread/timer_create.c: ... here.
+	* nptl/sysdeps/pthread/timer_delete.c: Moved ...
+	* sysdeps/pthread/timer_delete.c: ... here.
+	* nptl/sysdeps/pthread/timer_getoverr.c: Moved ...
+	* sysdeps/pthread/timer_getoverr.c: ... here.
+	* nptl/sysdeps/pthread/timer_gettime.c: Moved ...
+	* sysdeps/pthread/timer_gettime.c: ... here.
+	* nptl/sysdeps/pthread/timer_routines.c: Moved ...
+	* sysdeps/pthread/timer_routines.c: ... here.
+	* nptl/sysdeps/pthread/timer_settime.c: Moved ...
+	* sysdeps/pthread/timer_settime.c: ... here.
+	* nptl/sysdeps/pthread/tst-timer.c: Moved ...
+	* sysdeps/pthread/tst-timer.c: ... here.
+	* nptl/sysdeps/pthread/pthread_sigmask.c: Moved ...
+	* sysdeps/unix/sysv/linux/pthread_sigmask.c: ... here.
+
 	* sysdeps/unix/sysv/linux/sigprocmask.c: Include <nptl/pthreadP.h>.
 	* nptl/sysdeps/pthread/sigprocmask.c: File removed.
 
diff --git a/nptl/sysdeps/pthread/list.h b/include/list.h
index 749c727175..749c727175 100644
--- a/nptl/sysdeps/pthread/list.h
+++ b/include/list.h
diff --git a/nptl/sysdeps/pthread/createthread.c b/nptl/createthread.c
index 28c1ea67d3..28c1ea67d3 100644
--- a/nptl/sysdeps/pthread/createthread.c
+++ b/nptl/createthread.c
diff --git a/nptl/sysdeps/pthread/pt-longjmp.c b/nptl/pt-longjmp.c
index 09b3c7eb86..09b3c7eb86 100644
--- a/nptl/sysdeps/pthread/pt-longjmp.c
+++ b/nptl/pt-longjmp.c
diff --git a/nptl/sysdeps/unix/sysv/linux/createthread.c b/nptl/sysdeps/unix/sysv/linux/createthread.c
index c2f09025b4..9a21f3997a 100644
--- a/nptl/sysdeps/unix/sysv/linux/createthread.c
+++ b/nptl/sysdeps/unix/sysv/linux/createthread.c
@@ -20,4 +20,4 @@
 #define TLS_VALUE pd
 
 /* Get the real implementation.	 */
-#include <nptl/sysdeps/pthread/createthread.c>
+#include <nptl/createthread.c>
diff --git a/nptl/sysdeps/unix/sysv/linux/Implies b/sysdeps/nptl/Implies
index f1b3e8939c..f1b3e8939c 100644
--- a/nptl/sysdeps/unix/sysv/linux/Implies
+++ b/sysdeps/nptl/Implies
diff --git a/nptl/sysdeps/pthread/Makefile b/sysdeps/nptl/Makefile
index 60d525e9d7..bedf39b906 100644
--- a/nptl/sysdeps/pthread/Makefile
+++ b/sysdeps/nptl/Makefile
@@ -24,12 +24,6 @@ ifeq ($(subdir),rt)
 librt-sysdep_routines += timer_routines librt-cancellation
 CFLAGS-librt-cancellation.c += -fexceptions -fasynchronous-unwind-tables
 
-ifeq (yes,$(build-shared))
-$(objpfx)tst-timer: $(objpfx)librt.so $(shared-thread-library)
-else
-$(objpfx)tst-timer: $(objpfx)librt.a $(static-thread-library)
-endif
-
 ifeq ($(have-forced-unwind),yes)
 tests += tst-mqueue8x
 CFLAGS-tst-mqueue8x.c += -fexceptions
diff --git a/nptl/sysdeps/pthread/Subdirs b/sysdeps/nptl/Subdirs
index 36266c1e69..36266c1e69 100644
--- a/nptl/sysdeps/pthread/Subdirs
+++ b/sysdeps/nptl/Subdirs
diff --git a/nptl/sysdeps/pthread/aio_misc.h b/sysdeps/nptl/aio_misc.h
index ac3488c57e..ac3488c57e 100644
--- a/nptl/sysdeps/pthread/aio_misc.h
+++ b/sysdeps/nptl/aio_misc.h
diff --git a/nptl/sysdeps/pthread/bits/libc-lock.h b/sysdeps/nptl/bits/libc-lock.h
index 532cf2c701..532cf2c701 100644
--- a/nptl/sysdeps/pthread/bits/libc-lock.h
+++ b/sysdeps/nptl/bits/libc-lock.h
diff --git a/nptl/sysdeps/pthread/bits/libc-lockP.h b/sysdeps/nptl/bits/libc-lockP.h
index ec202713d6..ec202713d6 100644
--- a/nptl/sysdeps/pthread/bits/libc-lockP.h
+++ b/sysdeps/nptl/bits/libc-lockP.h
diff --git a/nptl/sysdeps/pthread/bits/stdio-lock.h b/sysdeps/nptl/bits/stdio-lock.h
index e2678cc918..e2678cc918 100644
--- a/nptl/sysdeps/pthread/bits/stdio-lock.h
+++ b/sysdeps/nptl/bits/stdio-lock.h
diff --git a/nptl/sysdeps/pthread/configure b/sysdeps/nptl/configure
index 239a039e3a..239a039e3a 100644
--- a/nptl/sysdeps/pthread/configure
+++ b/sysdeps/nptl/configure
diff --git a/nptl/sysdeps/pthread/configure.ac b/sysdeps/nptl/configure.ac
index 413af96799..413af96799 100644
--- a/nptl/sysdeps/pthread/configure.ac
+++ b/sysdeps/nptl/configure.ac
diff --git a/nptl/sysdeps/pthread/gai_misc.h b/sysdeps/nptl/gai_misc.h
index 946275ed75..946275ed75 100644
--- a/nptl/sysdeps/pthread/gai_misc.h
+++ b/sysdeps/nptl/gai_misc.h
diff --git a/nptl/sysdeps/pthread/librt-cancellation.c b/sysdeps/nptl/librt-cancellation.c
index e512929fbe..e512929fbe 100644
--- a/nptl/sysdeps/pthread/librt-cancellation.c
+++ b/sysdeps/nptl/librt-cancellation.c
diff --git a/nptl/sysdeps/pthread/malloc-machine.h b/sysdeps/nptl/malloc-machine.h
index ad480a37d8..ad480a37d8 100644
--- a/nptl/sysdeps/pthread/malloc-machine.h
+++ b/sysdeps/nptl/malloc-machine.h
diff --git a/nptl/sysdeps/pthread/pthread-functions.h b/sysdeps/nptl/pthread-functions.h
index 631442585a..631442585a 100644
--- a/nptl/sysdeps/pthread/pthread-functions.h
+++ b/sysdeps/nptl/pthread-functions.h
diff --git a/nptl/sysdeps/pthread/pthread.h b/sysdeps/nptl/pthread.h
index 40a3e215cc..40a3e215cc 100644
--- a/nptl/sysdeps/pthread/pthread.h
+++ b/sysdeps/nptl/pthread.h
diff --git a/nptl/sysdeps/pthread/setxid.h b/sysdeps/nptl/setxid.h
index 76c88e0feb..76c88e0feb 100644
--- a/nptl/sysdeps/pthread/setxid.h
+++ b/sysdeps/nptl/setxid.h
diff --git a/nptl/sysdeps/pthread/sigfillset.c b/sysdeps/nptl/sigfillset.c
index 9ab12c7a3e..9ab12c7a3e 100644
--- a/nptl/sysdeps/pthread/sigfillset.c
+++ b/sysdeps/nptl/sigfillset.c
diff --git a/nptl/sysdeps/pthread/tcb-offsets.h b/sysdeps/nptl/tcb-offsets.h
index 3fe13702ea..3fe13702ea 100644
--- a/nptl/sysdeps/pthread/tcb-offsets.h
+++ b/sysdeps/nptl/tcb-offsets.h
diff --git a/nptl/sysdeps/pthread/tst-mqueue8x.c b/sysdeps/nptl/tst-mqueue8x.c
index ca280394f7..ca280394f7 100644
--- a/nptl/sysdeps/pthread/tst-mqueue8x.c
+++ b/sysdeps/nptl/tst-mqueue8x.c
diff --git a/nptl/sysdeps/pthread/unwind-forcedunwind.c b/sysdeps/nptl/unwind-forcedunwind.c
index 9d7bdc5b90..9d7bdc5b90 100644
--- a/nptl/sysdeps/pthread/unwind-forcedunwind.c
+++ b/sysdeps/nptl/unwind-forcedunwind.c
diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile
new file mode 100644
index 0000000000..1080dc9126
--- /dev/null
+++ b/sysdeps/pthread/Makefile
@@ -0,0 +1,23 @@
+# sysdeps makefile fragment for all pthread-supporting configurations.
+# 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/>.
+
+ifeq (yes,$(build-shared))
+$(objpfx)tst-timer: $(objpfx)librt.so $(shared-thread-library)
+else
+$(objpfx)tst-timer: $(objpfx)librt.a $(static-thread-library)
+endif
diff --git a/nptl/sysdeps/pthread/allocalim.h b/sysdeps/pthread/allocalim.h
index 407d4007e7..407d4007e7 100644
--- a/nptl/sysdeps/pthread/allocalim.h
+++ b/sysdeps/pthread/allocalim.h
diff --git a/nptl/sysdeps/pthread/bits/sigthread.h b/sysdeps/pthread/bits/sigthread.h
index 0048d7fd76..0048d7fd76 100644
--- a/nptl/sysdeps/pthread/bits/sigthread.h
+++ b/sysdeps/pthread/bits/sigthread.h
diff --git a/nptl/sysdeps/pthread/flockfile.c b/sysdeps/pthread/flockfile.c
index da26824cc7..da26824cc7 100644
--- a/nptl/sysdeps/pthread/flockfile.c
+++ b/sysdeps/pthread/flockfile.c
diff --git a/nptl/sysdeps/pthread/ftrylockfile.c b/sysdeps/pthread/ftrylockfile.c
index 7921d607ef..7921d607ef 100644
--- a/nptl/sysdeps/pthread/ftrylockfile.c
+++ b/sysdeps/pthread/ftrylockfile.c
diff --git a/nptl/sysdeps/pthread/funlockfile.c b/sysdeps/pthread/funlockfile.c
index 2b367db112..2b367db112 100644
--- a/nptl/sysdeps/pthread/funlockfile.c
+++ b/sysdeps/pthread/funlockfile.c
diff --git a/nptl/sysdeps/pthread/posix-timer.h b/sysdeps/pthread/posix-timer.h
index 1076110344..1076110344 100644
--- a/nptl/sysdeps/pthread/posix-timer.h
+++ b/sysdeps/pthread/posix-timer.h
diff --git a/nptl/sysdeps/pthread/timer_create.c b/sysdeps/pthread/timer_create.c
index 461d28e353..461d28e353 100644
--- a/nptl/sysdeps/pthread/timer_create.c
+++ b/sysdeps/pthread/timer_create.c
diff --git a/nptl/sysdeps/pthread/timer_delete.c b/sysdeps/pthread/timer_delete.c
index 99e4cc180e..99e4cc180e 100644
--- a/nptl/sysdeps/pthread/timer_delete.c
+++ b/sysdeps/pthread/timer_delete.c
diff --git a/nptl/sysdeps/pthread/timer_getoverr.c b/sysdeps/pthread/timer_getoverr.c
index 159ebf27f0..159ebf27f0 100644
--- a/nptl/sysdeps/pthread/timer_getoverr.c
+++ b/sysdeps/pthread/timer_getoverr.c
diff --git a/nptl/sysdeps/pthread/timer_gettime.c b/sysdeps/pthread/timer_gettime.c
index 1e0ea69ad0..1e0ea69ad0 100644
--- a/nptl/sysdeps/pthread/timer_gettime.c
+++ b/sysdeps/pthread/timer_gettime.c
diff --git a/nptl/sysdeps/pthread/timer_routines.c b/sysdeps/pthread/timer_routines.c
index ce1aa417cd..ce1aa417cd 100644
--- a/nptl/sysdeps/pthread/timer_routines.c
+++ b/sysdeps/pthread/timer_routines.c
diff --git a/nptl/sysdeps/pthread/timer_settime.c b/sysdeps/pthread/timer_settime.c
index 5d3c1664f7..5d3c1664f7 100644
--- a/nptl/sysdeps/pthread/timer_settime.c
+++ b/sysdeps/pthread/timer_settime.c
diff --git a/nptl/sysdeps/pthread/tst-timer.c b/sysdeps/pthread/tst-timer.c
index 16adf3c199..16adf3c199 100644
--- a/nptl/sysdeps/pthread/tst-timer.c
+++ b/sysdeps/pthread/tst-timer.c
diff --git a/sysdeps/unix/sysv/linux/Implies b/sysdeps/unix/sysv/linux/Implies
index b04bb6b33d..a579e634ae 100644
--- a/sysdeps/unix/sysv/linux/Implies
+++ b/sysdeps/unix/sysv/linux/Implies
@@ -1,3 +1,6 @@
+# All Linux builds use NPTL.
+nptl
+
 # The gnu subdirectory exists for things common to both Linux-based and
 # Hurd-based GNU systems.
 gnu
diff --git a/nptl/sysdeps/pthread/pthread_sigmask.c b/sysdeps/unix/sysv/linux/pthread_sigmask.c
index 21f0665460..21f0665460 100644
--- a/nptl/sysdeps/pthread/pthread_sigmask.c
+++ b/sysdeps/unix/sysv/linux/pthread_sigmask.c