Get rid of nptl/sysdeps/pthread/ subdirectory

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.
 

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>

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

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

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