From patchwork Thu Jun 12 21:02:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 359331 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 0C529140080 for ; Fri, 13 Jun 2014 07:03:01 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; q= dns; s=default; b=d+IvbAjFkovM5lcyDhMwmeEUCEoroFwx7wb6GzvgFkZ2Nh HT2n3LTyrZH67D62r22S0KTT7qXNmGUmj6OUG6zjciAJxB9gmjUs6NZjDpifTlvN wVdLvm5kMU/LyH/Wxa4DmuAxuoX9Ir0Mgbp2zyCripP/011s3a9OnQuQkfrMo= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; s= default; bh=MhHwyXKREUSl88vMs+2U2KfRSuM=; b=RJB2wSkEmAqDLd/uvLFz yQ5GEqWh2g/psUUgNgedOgg3pabTkgHtcdTNh/eyAV7b7bl7KEJw0U/9nf05XyEk jpugrhxjG3yuEWSvYVB5TYA5HvUfebQqYwzMTRQNzoaZiHPx1TWr5XE0ovlf7oBe rhhCA4CzsGV1muHMiq0utl0= Received: (qmail 11170 invoked by alias); 12 Jun 2014 21:02:55 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 11154 invoked by uid 89); 12 Jun 2014 21:02:54 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.2 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: topped-with-meat.com MIME-Version: 1.0 From: Roland McGrath To: "GNU C. Library" Subject: [COMMITTED PATCH] Get rid of nptl/sysdeps/pthread/ subdirectory Message-Id: <20140612210250.0A4C82C3978@topped-with-meat.com> Date: Thu, 12 Jun 2014 14:02:49 -0700 (PDT) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.1 cv=SvUDtp+0 c=1 sm=1 tr=0 a=WkljmVdYkabdwxfqvArNOQ==:117 a=14OXPxybAAAA:8 a=-16725nPJUIA:10 a=Z6MIti7PxpgA:10 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=mDV3o1hIAAAA:8 a=nFSNmNHePlfUgR53f-wA:9 a=CjuIK1q_8ugA:10 This directory never should have existed even for the add-on. This conflated three different kinds of things, which are now separated: * Things that depend only on the public pthread.h API -> sysdeps/pthread/ * Things that depend on NPTL implementation details -> sysdeps/nptl/ * Parts of the NPTL implementation itself -> nptl/ (include/ for list.h) Verified on x86_64-linux-gnu and i686-linux-gnu that there are no code changes except for libpthread.so getting some offset adjustments because the assertion file name strings in its .rodata changed. I've also grepped for potentially affected #include's for other configurations. There are two, both of which are moot after other pending patches on the roland/nptl-ia64 and roland/nptl-microblaze branches. So the ia64 and microblaze builds are broken now, and will be fixed by their maintainers reviewing and approving the machine-specific patches I have already posted. Thanks, Roland * 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. diff --git a/nptl/sysdeps/pthread/list.h b/include/list.h similarity index 100% rename from nptl/sysdeps/pthread/list.h rename to include/list.h diff --git a/nptl/sysdeps/pthread/createthread.c b/nptl/createthread.c similarity index 100% rename from nptl/sysdeps/pthread/createthread.c rename to nptl/createthread.c diff --git a/nptl/sysdeps/pthread/pt-longjmp.c b/nptl/pt-longjmp.c similarity index 100% rename from nptl/sysdeps/pthread/pt-longjmp.c rename to nptl/pt-longjmp.c diff --git a/nptl/sysdeps/unix/sysv/linux/createthread.c b/nptl/sysdeps/unix/sysv/linux/createthread.c index c2f0902..9a21f39 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 +#include diff --git a/nptl/sysdeps/unix/sysv/linux/Implies b/sysdeps/nptl/Implies similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/Implies rename to sysdeps/nptl/Implies diff --git a/nptl/sysdeps/pthread/Makefile b/sysdeps/nptl/Makefile similarity index 88% rename from nptl/sysdeps/pthread/Makefile rename to sysdeps/nptl/Makefile index 60d525e..bedf39b 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 similarity index 100% rename from nptl/sysdeps/pthread/Subdirs rename to sysdeps/nptl/Subdirs diff --git a/nptl/sysdeps/pthread/aio_misc.h b/sysdeps/nptl/aio_misc.h similarity index 100% rename from nptl/sysdeps/pthread/aio_misc.h rename to sysdeps/nptl/aio_misc.h diff --git a/nptl/sysdeps/pthread/bits/libc-lock.h b/sysdeps/nptl/bits/libc-lock.h similarity index 100% rename from nptl/sysdeps/pthread/bits/libc-lock.h rename to sysdeps/nptl/bits/libc-lock.h diff --git a/nptl/sysdeps/pthread/bits/libc-lockP.h b/sysdeps/nptl/bits/libc-lockP.h similarity index 100% rename from nptl/sysdeps/pthread/bits/libc-lockP.h rename to sysdeps/nptl/bits/libc-lockP.h diff --git a/nptl/sysdeps/pthread/bits/stdio-lock.h b/sysdeps/nptl/bits/stdio-lock.h similarity index 100% rename from nptl/sysdeps/pthread/bits/stdio-lock.h rename to sysdeps/nptl/bits/stdio-lock.h diff --git a/nptl/sysdeps/pthread/configure b/sysdeps/nptl/configure similarity index 100% rename from nptl/sysdeps/pthread/configure rename to sysdeps/nptl/configure diff --git a/nptl/sysdeps/pthread/configure.ac b/sysdeps/nptl/configure.ac similarity index 100% rename from nptl/sysdeps/pthread/configure.ac rename to sysdeps/nptl/configure.ac diff --git a/nptl/sysdeps/pthread/gai_misc.h b/sysdeps/nptl/gai_misc.h similarity index 100% rename from nptl/sysdeps/pthread/gai_misc.h rename to sysdeps/nptl/gai_misc.h diff --git a/nptl/sysdeps/pthread/librt-cancellation.c b/sysdeps/nptl/librt-cancellation.c similarity index 100% rename from nptl/sysdeps/pthread/librt-cancellation.c rename to sysdeps/nptl/librt-cancellation.c diff --git a/nptl/sysdeps/pthread/malloc-machine.h b/sysdeps/nptl/malloc-machine.h similarity index 100% rename from nptl/sysdeps/pthread/malloc-machine.h rename to sysdeps/nptl/malloc-machine.h diff --git a/nptl/sysdeps/pthread/pthread-functions.h b/sysdeps/nptl/pthread-functions.h similarity index 100% rename from nptl/sysdeps/pthread/pthread-functions.h rename to sysdeps/nptl/pthread-functions.h diff --git a/nptl/sysdeps/pthread/pthread.h b/sysdeps/nptl/pthread.h similarity index 100% rename from nptl/sysdeps/pthread/pthread.h rename to sysdeps/nptl/pthread.h diff --git a/nptl/sysdeps/pthread/setxid.h b/sysdeps/nptl/setxid.h similarity index 100% rename from nptl/sysdeps/pthread/setxid.h rename to sysdeps/nptl/setxid.h diff --git a/nptl/sysdeps/pthread/sigfillset.c b/sysdeps/nptl/sigfillset.c similarity index 100% rename from nptl/sysdeps/pthread/sigfillset.c rename to sysdeps/nptl/sigfillset.c diff --git a/nptl/sysdeps/pthread/tcb-offsets.h b/sysdeps/nptl/tcb-offsets.h similarity index 100% rename from nptl/sysdeps/pthread/tcb-offsets.h rename to sysdeps/nptl/tcb-offsets.h diff --git a/nptl/sysdeps/pthread/tst-mqueue8x.c b/sysdeps/nptl/tst-mqueue8x.c similarity index 100% rename from nptl/sysdeps/pthread/tst-mqueue8x.c rename to sysdeps/nptl/tst-mqueue8x.c diff --git a/nptl/sysdeps/pthread/unwind-forcedunwind.c b/sysdeps/nptl/unwind-forcedunwind.c similarity index 100% rename from nptl/sysdeps/pthread/unwind-forcedunwind.c rename to sysdeps/nptl/unwind-forcedunwind.c diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile new file mode 100644 index 0000000..1080dc9 --- /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 +# . + +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 similarity index 100% rename from nptl/sysdeps/pthread/allocalim.h rename to sysdeps/pthread/allocalim.h diff --git a/nptl/sysdeps/pthread/bits/sigthread.h b/sysdeps/pthread/bits/sigthread.h similarity index 100% rename from nptl/sysdeps/pthread/bits/sigthread.h rename to sysdeps/pthread/bits/sigthread.h diff --git a/nptl/sysdeps/pthread/flockfile.c b/sysdeps/pthread/flockfile.c similarity index 100% rename from nptl/sysdeps/pthread/flockfile.c rename to sysdeps/pthread/flockfile.c diff --git a/nptl/sysdeps/pthread/ftrylockfile.c b/sysdeps/pthread/ftrylockfile.c similarity index 100% rename from nptl/sysdeps/pthread/ftrylockfile.c rename to sysdeps/pthread/ftrylockfile.c diff --git a/nptl/sysdeps/pthread/funlockfile.c b/sysdeps/pthread/funlockfile.c similarity index 100% rename from nptl/sysdeps/pthread/funlockfile.c rename to sysdeps/pthread/funlockfile.c diff --git a/nptl/sysdeps/pthread/posix-timer.h b/sysdeps/pthread/posix-timer.h similarity index 100% rename from nptl/sysdeps/pthread/posix-timer.h rename to sysdeps/pthread/posix-timer.h diff --git a/nptl/sysdeps/pthread/timer_create.c b/sysdeps/pthread/timer_create.c similarity index 100% rename from nptl/sysdeps/pthread/timer_create.c rename to sysdeps/pthread/timer_create.c diff --git a/nptl/sysdeps/pthread/timer_delete.c b/sysdeps/pthread/timer_delete.c similarity index 100% rename from nptl/sysdeps/pthread/timer_delete.c rename to sysdeps/pthread/timer_delete.c diff --git a/nptl/sysdeps/pthread/timer_getoverr.c b/sysdeps/pthread/timer_getoverr.c similarity index 100% rename from nptl/sysdeps/pthread/timer_getoverr.c rename to sysdeps/pthread/timer_getoverr.c diff --git a/nptl/sysdeps/pthread/timer_gettime.c b/sysdeps/pthread/timer_gettime.c similarity index 100% rename from nptl/sysdeps/pthread/timer_gettime.c rename to sysdeps/pthread/timer_gettime.c diff --git a/nptl/sysdeps/pthread/timer_routines.c b/sysdeps/pthread/timer_routines.c similarity index 100% rename from nptl/sysdeps/pthread/timer_routines.c rename to sysdeps/pthread/timer_routines.c diff --git a/nptl/sysdeps/pthread/timer_settime.c b/sysdeps/pthread/timer_settime.c similarity index 100% rename from nptl/sysdeps/pthread/timer_settime.c rename to sysdeps/pthread/timer_settime.c diff --git a/nptl/sysdeps/pthread/tst-timer.c b/sysdeps/pthread/tst-timer.c similarity index 100% rename from nptl/sysdeps/pthread/tst-timer.c rename to sysdeps/pthread/tst-timer.c diff --git a/sysdeps/unix/sysv/linux/Implies b/sysdeps/unix/sysv/linux/Implies index b04bb6b..a579e63 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 similarity index 100% rename from nptl/sysdeps/pthread/pthread_sigmask.c rename to sysdeps/unix/sysv/linux/pthread_sigmask.c