From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk1-x736.google.com (mail-qk1-x736.google.com [IPv6:2607:f8b0:4864:20::736]) by sourceware.org (Postfix) with ESMTPS id 78A273857C7A for ; Tue, 22 Jun 2021 00:57:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 78A273857C7A Received: by mail-qk1-x736.google.com with SMTP id g4so34063667qkl.1 for ; Mon, 21 Jun 2021 17:57:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=/hpmFae/fdH6lUtgWRZmiNwcHGT06LNQW6Kvpzoe1Hw=; b=PYjoYQ6er3T/GbkUoBzn1aBc70OWjPIjoN7AJ+HgJiI70nfsLb8C7bqJ/eE8sZX/nv ANUTqMD5A5QdPHQ30P1ziFmb4xiGYTlOZebnkZBEoO2/N66V2720nlacy5PGPRX8S6A2 HstghQoscTnd86TfjXClF0tHF6oxRb+cYrqkmV0KGSBkq+ld2XidyB9iBqr8kKQANt8T 0Tho/H0ZuZu+pSrl+Mi9P9OQznRYrPNZe6bArmO0E33xOk+zettD1sdjq23NUWQRzJuA uO+mUPo2rg64/lIiBSLj6bu7fo10cDTDuFmg+mw2ZVX2yf+M3LO0UruKXhzL63U6PFdE 1/DA== X-Gm-Message-State: AOAM533HQ+PLb0ZRf6/AUICR9ZKWQRzktwpJJyqoroQe3In4igG17fPJ n1XX6rxxNBYibCRdgaTyW2FopF9w3PLUaA== X-Google-Smtp-Source: ABdhPJz/IjTmrAyXBM82SUysS6K1iYWm8FXLbhIAjgVc90okZT2Yt3RedAc2XHO8NTWP4m/tSgKBqQ== X-Received: by 2002:a37:9bc1:: with SMTP id d184mr1508090qke.395.1624323452853; Mon, 21 Jun 2021 17:57:32 -0700 (PDT) Received: from [192.168.1.108] ([177.194.59.218]) by smtp.gmail.com with ESMTPSA id o7sm11619006qko.1.2021.06.21.17.57.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 21 Jun 2021 17:57:32 -0700 (PDT) Subject: Re: [PATCH 08/34] nptl: Move pthreadP.h into sysdeps directory To: Florian Weimer , libc-alpha@sourceware.org References: <62e7615f6b2d4b950ec66b42979d04376a278aa8.1623956057.git.fweimer@redhat.com> From: Adhemerval Zanella Message-ID: <8929aede-c14c-7c8c-a0a3-d329ecdc8737@linaro.org> Date: Mon, 21 Jun 2021 21:57:30 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <62e7615f6b2d4b950ec66b42979d04376a278aa8.1623956057.git.fweimer@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, 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-List-Received-Date: Tue, 22 Jun 2021 00:57:36 -0000 On 17/06/2021 15:57, Florian Weimer via Libc-alpha wrote: > This mirrors the situation on Hurd. These directories are on > the include search part, so #include works after this > change on both Hurd and npt Nice change, is is really awkward to keep using nptl/pthreadP or keep adding some extra hacks to include it outside nptl. LGTM, thanks. 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 Ok. > 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 Ok. > 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 Ok. > 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 Ok. > 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 Ok. > 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) Ok. > 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. */ Ok. > 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), Ok. > 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 Ok. > 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 > Ok. > 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 > Ok. > 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 Ok. > 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 Ok. > 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: */ Ok. > 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) Ok. > 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 Ok. > 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 Ok. > 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" > Ok. > 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" > > Ok. > 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) Ok. > 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__ > Ok.