From patchwork Thu Jun 17 18:57:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 43890 X-Patchwork-Delegate: azanella@linux.vnet.ibm.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 778793985C0D for ; Thu, 17 Jun 2021 19:02:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 778793985C0D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1623956562; bh=bBXPdgUyU9N9AxBpy5h6DhxD2mvCw6KIrw+l27CR7j0=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=fyi3VAKizi0/KfDvffqz4btL/hHbaQSEIsc3Kn3iXRsulhn4mwdJ9oefWrLhyjiQy hkoz55sIDNIYen6mEx00bik+z2oLvzNxzYLMhuNdTnOp4n5JP2xWM0WNbrIQI7Ysgc dVcIfr6ERsC7i6iL9dGavdZNmCVUKlZ18jqWj/RE= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id A49AD3894C3B for ; Thu, 17 Jun 2021 18:57:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A49AD3894C3B Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-131-fiPC34nqO5WIQR5yBDLQKg-1; Thu, 17 Jun 2021 14:57:27 -0400 X-MC-Unique: fiPC34nqO5WIQR5yBDLQKg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E575F100C661 for ; Thu, 17 Jun 2021 18:57:26 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-115-60.ams2.redhat.com [10.36.115.60]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BF617189CE for ; Thu, 17 Jun 2021 18:57:25 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 08/34] nptl: Move pthreadP.h into sysdeps directory In-Reply-To: References: X-From-Line: 62e7615f6b2d4b950ec66b42979d04376a278aa8 Mon Sep 17 00:00:00 2001 Message-Id: <62e7615f6b2d4b950ec66b42979d04376a278aa8.1623956057.git.fweimer@redhat.com> Date: Thu, 17 Jun 2021 20:57:23 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" This mirrors the situation on Hurd. These directories are on the include search part, so #include works after this change on both Hurd and nptl. Reviewed-by: Adhemerval Zanella --- nptl_db/thread_dbP.h | 2 +- sysdeps/nptl/aio_misc.h | 2 +- sysdeps/nptl/dl-tls_init_tp.c | 2 +- sysdeps/nptl/fork.c | 2 +- sysdeps/nptl/gai_misc.h | 2 +- sysdeps/nptl/jmp-unwind.c | 2 +- sysdeps/nptl/libc-lockP.h | 2 +- sysdeps/nptl/libc_start_call_main.h | 2 +- {nptl => sysdeps/nptl}/pthreadP.h | 2 +- sysdeps/nptl/pthread_early_init.h | 2 +- sysdeps/nptl/setxid.h | 2 +- sysdeps/posix/spawni.c | 2 +- sysdeps/unix/sysv/linux/dl-execstack.c | 2 +- sysdeps/unix/sysv/linux/mq_notify.c | 2 +- sysdeps/unix/sysv/linux/s390/jmp-unwind.c | 2 +- sysdeps/unix/sysv/linux/sigprocmask.c | 2 +- sysdeps/unix/sysv/linux/spawni.c | 2 +- sysdeps/unix/sysv/linux/timer_create.c | 2 +- sysdeps/unix/sysv/linux/timer_routines.c | 2 +- sysdeps/unix/sysv/linux/tls-internal.h | 2 +- sysdeps/unix/sysv/linux/x86/longjmp.c | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) rename {nptl => sysdeps/nptl}/pthreadP.h (99%) diff --git a/nptl_db/thread_dbP.h b/nptl_db/thread_dbP.h index 712fa3aeb6..7e7d1d5535 100644 --- a/nptl_db/thread_dbP.h +++ b/nptl_db/thread_dbP.h @@ -27,7 +27,7 @@ #include #include "proc_service.h" #include "thread_db.h" -#include "../nptl/pthreadP.h" /* This is for *_BITMASK only. */ +#include /* This is for *_BITMASK only. */ #include #include #include diff --git a/sysdeps/nptl/aio_misc.h b/sysdeps/nptl/aio_misc.h index 3e9b8929b2..a5c439fab5 100644 --- a/sysdeps/nptl/aio_misc.h +++ b/sysdeps/nptl/aio_misc.h @@ -21,7 +21,7 @@ correct aio_suspend and lio_listio implementations. */ #include -#include +#include #include #define DONT_NEED_AIO_MISC_COND 1 diff --git a/sysdeps/nptl/dl-tls_init_tp.c b/sysdeps/nptl/dl-tls_init_tp.c index b7b3bb1cdb..c3349dd14c 100644 --- a/sysdeps/nptl/dl-tls_init_tp.c +++ b/sysdeps/nptl/dl-tls_init_tp.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #ifndef __ASSUME_SET_ROBUST_LIST diff --git a/sysdeps/nptl/fork.c b/sysdeps/nptl/fork.c index 062b01265a..39ab797612 100644 --- a/sysdeps/nptl/fork.c +++ b/sysdeps/nptl/fork.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sysdeps/nptl/gai_misc.h b/sysdeps/nptl/gai_misc.h index 82948fdf96..36bf27523d 100644 --- a/sysdeps/nptl/gai_misc.h +++ b/sysdeps/nptl/gai_misc.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include #define DONT_NEED_GAI_MISC_COND 1 diff --git a/sysdeps/nptl/jmp-unwind.c b/sysdeps/nptl/jmp-unwind.c index 96c4862c74..5254c16b81 100644 --- a/sysdeps/nptl/jmp-unwind.c +++ b/sysdeps/nptl/jmp-unwind.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include void _longjmp_unwind (jmp_buf env, int val) diff --git a/sysdeps/nptl/libc-lockP.h b/sysdeps/nptl/libc-lockP.h index ec7b02bbdd..ef88a3e533 100644 --- a/sysdeps/nptl/libc-lockP.h +++ b/sysdeps/nptl/libc-lockP.h @@ -36,7 +36,7 @@ #if IS_IN (libpthread) /* This gets us the declarations of the __pthread_* internal names, and hidden_proto for them. */ -# include +# include #endif /* Mutex type. */ diff --git a/sysdeps/nptl/libc_start_call_main.h b/sysdeps/nptl/libc_start_call_main.h index b56bf34325..06d72c1e38 100644 --- a/sysdeps/nptl/libc_start_call_main.h +++ b/sysdeps/nptl/libc_start_call_main.h @@ -17,7 +17,7 @@ . */ #include -#include +#include _Noreturn static void __libc_start_call_main (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL), diff --git a/nptl/pthreadP.h b/sysdeps/nptl/pthreadP.h similarity index 99% rename from nptl/pthreadP.h rename to sysdeps/nptl/pthreadP.h index 675d1de753..ca96ff073b 100644 --- a/nptl/pthreadP.h +++ b/sysdeps/nptl/pthreadP.h @@ -25,7 +25,7 @@ #include #include #include -#include "descr.h" +#include #include #include #include diff --git a/sysdeps/nptl/pthread_early_init.h b/sysdeps/nptl/pthread_early_init.h index 5b49ce39c2..89774c1477 100644 --- a/sysdeps/nptl/pthread_early_init.h +++ b/sysdeps/nptl/pthread_early_init.h @@ -20,7 +20,7 @@ #define _PTHREAD_EARLY_INIT_H 1 #include -#include +#include #include #include diff --git a/sysdeps/nptl/setxid.h b/sysdeps/nptl/setxid.h index 8b49d11550..e90367bf02 100644 --- a/sysdeps/nptl/setxid.h +++ b/sysdeps/nptl/setxid.h @@ -15,7 +15,7 @@ License along with the GNU C Library; if not, see . */ -#include +#include #include #include diff --git a/sysdeps/posix/spawni.c b/sysdeps/posix/spawni.c index a649788668..fe3b5bb7f6 100644 --- a/sysdeps/posix/spawni.c +++ b/sysdeps/posix/spawni.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sysdeps/unix/sysv/linux/dl-execstack.c b/sysdeps/unix/sysv/linux/dl-execstack.c index e2449d1890..6598c90357 100644 --- a/sysdeps/unix/sysv/linux/dl-execstack.c +++ b/sysdeps/unix/sysv/linux/dl-execstack.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sysdeps/unix/sysv/linux/mq_notify.c b/sysdeps/unix/sysv/linux/mq_notify.c index 6f46d29d1d..e22850a910 100644 --- a/sysdeps/unix/sysv/linux/mq_notify.c +++ b/sysdeps/unix/sysv/linux/mq_notify.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include /* Defined in the kernel headers: */ diff --git a/sysdeps/unix/sysv/linux/s390/jmp-unwind.c b/sysdeps/unix/sysv/linux/s390/jmp-unwind.c index 8e0399a3e9..5fbca71f5b 100644 --- a/sysdeps/unix/sysv/linux/s390/jmp-unwind.c +++ b/sysdeps/unix/sysv/linux/s390/jmp-unwind.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include void _longjmp_unwind (jmp_buf env, int val) diff --git a/sysdeps/unix/sysv/linux/sigprocmask.c b/sysdeps/unix/sysv/linux/sigprocmask.c index 9dfd8076d1..eeec05d037 100644 --- a/sysdeps/unix/sysv/linux/sigprocmask.c +++ b/sysdeps/unix/sysv/linux/sigprocmask.c @@ -16,7 +16,7 @@ . */ #include -#include /* SIGCANCEL, SIGSETXID */ +#include /* SIGCANCEL, SIGSETXID */ /* Get and/or change the set of blocked signals. */ int diff --git a/sysdeps/unix/sysv/linux/spawni.c b/sysdeps/unix/sysv/linux/spawni.c index 501f8fbccd..3b435e6c86 100644 --- a/sysdeps/unix/sysv/linux/spawni.c +++ b/sysdeps/unix/sysv/linux/spawni.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sysdeps/unix/sysv/linux/timer_create.c b/sysdeps/unix/sysv/linux/timer_create.c index 37de98fde4..1ea0086487 100644 --- a/sysdeps/unix/sysv/linux/timer_create.c +++ b/sysdeps/unix/sysv/linux/timer_create.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include "kernel-posix-timers.h" #include "kernel-posix-cpu-timers.h" diff --git a/sysdeps/unix/sysv/linux/timer_routines.c b/sysdeps/unix/sysv/linux/timer_routines.c index 60e60e0098..4098da8a5f 100644 --- a/sysdeps/unix/sysv/linux/timer_routines.c +++ b/sysdeps/unix/sysv/linux/timer_routines.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include "kernel-posix-timers.h" diff --git a/sysdeps/unix/sysv/linux/tls-internal.h b/sysdeps/unix/sysv/linux/tls-internal.h index 40798a5dcc..17128136dd 100644 --- a/sysdeps/unix/sysv/linux/tls-internal.h +++ b/sysdeps/unix/sysv/linux/tls-internal.h @@ -20,7 +20,7 @@ #define _TLS_INTERNAL_H 1 #include -#include +#include static inline struct tls_internal_t * __glibc_tls_internal (void) diff --git a/sysdeps/unix/sysv/linux/x86/longjmp.c b/sysdeps/unix/sysv/linux/x86/longjmp.c index 1cc8b8dfad..25e2af7685 100644 --- a/sysdeps/unix/sysv/linux/x86/longjmp.c +++ b/sysdeps/unix/sysv/linux/x86/longjmp.c @@ -18,7 +18,7 @@ #include -#include +#include #include #ifdef __x86_64__