From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from insect.birch.relay.mailchannels.net (insect.birch.relay.mailchannels.net [23.83.209.93]) by sourceware.org (Postfix) with ESMTPS id ECFB03858D28 for ; Mon, 8 May 2023 17:53:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org ECFB03858D28 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gotplt.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 4919A5C0E6B; Mon, 8 May 2023 17:53:52 +0000 (UTC) Received: from pdx1-sub0-mail-a304.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id C62D15C0CCD; Mon, 8 May 2023 17:53:51 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1683568431; a=rsa-sha256; cv=none; b=Wzh+1hdNgjbboHHKR8YNmEYSEhJI43e0uyv/TJvET1liWPB/CFdcna2+z0P2sQs1WsPrmA nJyM74TvEhF+zz032nQrrv2GlYH8UTmAXDAvTr3/A8dX2af1gzoVduuZzvDS+ewPT7gnVE 1qvc+Os/0r6r6+pevjvW/qZJ+TpWRUA/Fywdy0qD7NHcpWZUtqGEvScDBydHtWHsG6MurC kL5eCzEBU++JqkyvdDTP2FCJSQuMH/1nGBq7ZHTFax4ZmGuIIiALMWt3BXWejikdOsFPeD VQEH7/LbwmuIVckpb72EWFFLA05z6LumjvzGcZmXECDfNe1HyoLPAQuxqMThDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1683568431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=r88To7T/HK8fEISBRA7vFFUccJmncMLAcvQAa7eAyCs=; b=nq4DbqrZrktoFuLJ8c56eqO/avj9sDYrv4eXLv5v4DQG5etYMNQ7lV1td4BnEmg7n/1VB9 LIBgZlBu4G69Gthni1zF+yWxYKGnspGO7gH1Tj2ZsFEdP70ZPUe9THY0Y1/smQpBTCkT6V eUwdM/QLcR8JfX0NUJXEKPmCeglCG+GaCbsxH4lC42j7sdVrfxOB3OW99nbEvHRmzFixN2 n+arjTEpn+U9q+3OSqhc5JTuIw2/pFyMlFENQ6egLhyoZxtWbxAguTErVs5pulhekrKCdt iomjM0ApUbytZggu39b1jsMpgtd+astpEqyG6JpV3ChYmSrQ9EBjTdJya2Q9Tw== ARC-Authentication-Results: i=1; rspamd-6c5fbf566c-bvbzg; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Ski-Squirrel: 603527040d6d4ccc_1683568432078_3408739878 X-MC-Loop-Signature: 1683568432078:1724516968 X-MC-Ingress-Time: 1683568432078 Received: from pdx1-sub0-mail-a304.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.116.217.237 (trex/6.7.2); Mon, 08 May 2023 17:53:52 +0000 Received: from [192.168.85.119] (unknown [24.114.52.148]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a304.dreamhost.com (Postfix) with ESMTPSA id 4QFTRy55RbzY1; Mon, 8 May 2023 10:53:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gotplt.org; s=dreamhost; t=1683568431; bh=r88To7T/HK8fEISBRA7vFFUccJmncMLAcvQAa7eAyCs=; h=Date:Subject:From:To:Content-Type:Content-Transfer-Encoding; b=FOXwjSB1IvgJOtwd2dJ4Y4vrEKvoL1M2t0s2omfU4PxDCfsUdegWjJcwZwPeIh/Iy mPssPyP7Ng8dpzq9L4sWKVkkhlc6uB5/MTorweKFZWqfpFZDxf9xyMVK6LOv9+6tzv XqrGAtuSHpWB1dMQMYIIHTvDhpMvYBdOddcnAQ76Tzg6nSQg9hUiR4g7h0mgCpX4nW L6jm6UTzls9Ow5HRYAyBbQ8evRgMiaQ9l2izs/AfeYxUCey1ng8i/nLPCeO1MzIsmb bo+40gITfNf3vBum/3P3hk0MEYBwZXv8GbWOv8MHv4BOS9JoB4/+DWj8q27z2qVPW/ /KYRvzVjWcJ6Q== Message-ID: Date: Mon, 8 May 2023 13:53:48 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: [PATCH 1/2] nptl: Re-flow and sort variables in Makefile. Content-Language: en-US From: Siddhesh Poyarekar To: Carlos O'Donell , libc-alpha@sourceware.org References: <20230428114811.4129539-1-carlos@redhat.com> <20230428114811.4129539-2-carlos@redhat.com> <699d4d42-adf7-07a8-36ab-98c7ae0f6b27@gotplt.org> In-Reply-To: <699d4d42-adf7-07a8-36ab-98c7ae0f6b27@gotplt.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3037.4 required=5.0 tests=BAYES_00,BODY_8BITS,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 2023-05-08 13:17, Siddhesh Poyarekar wrote: > On 2023-04-28 07:48, Carlos O'Donell via Libc-alpha wrote: >> --- >>   sysdeps/pthread/Makefile                      | 433 +++++++++++++----- >>   .../{tst-mutex7robust.c => tst-robust11.c}    |   0 >>   2 files changed, 320 insertions(+), 113 deletions(-) >>   rename sysdeps/pthread/{tst-mutex7robust.c => tst-robust11.c} (100%) > > LGTM, since you also mentioned on the weekly patch review call that the > patchset has no effect on generated code. > Oh, and Reviewed-by: Siddhesh Poyarekar > Thanks, > Sid > >> >> diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile >> index c2f5588bd9..222f5b5142 100644 >> --- a/sysdeps/pthread/Makefile >> +++ b/sysdeps/pthread/Makefile >> @@ -21,9 +21,17 @@ $(objpfx)tst-timer: $(librt) >>   endif >>   ifneq (,$(filter $(subdir),htl nptl)) >> -headers += threads.h >> - >> -routines += thrd_current thrd_equal thrd_sleep thrd_yield pthread_atfork >> +headers += \ >> +  threads.h \ >> +  # headers >> + >> +routines += \ >> +  pthread_atfork \ >> +  thrd_current \ >> +  thrd_equal \ >> +  thrd_sleep \ >> +  thrd_yield \ >> +  # routines >>   $(libpthread-routines-var) += \ >>     call_once \ >> @@ -48,86 +56,231 @@ $(libpthread-routines-var) += \ >>     tss_delete \ >>     tss_get \ >>     tss_set \ >> +  # $(libpthread-routines-var) >> -tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \ >> -     tst-cnd-timedwait tst-thrd-detach tst-mtx-basic tst-thrd-sleep \ >> -     tst-mtx-recursive tst-tss-basic tst-call-once tst-mtx-timedlock \ >> -     \ >> -     tst-abstime \ >> -     tst-pt-align tst-pt-align3 \ >> -     tst-attr1 \ >> -     tst-backtrace1 \ >> -     tst-bad-schedattr \ >> -     tst-barrier1 tst-barrier2 tst-barrier3 tst-barrier4 \ >> -     tst-basic1 tst-basic2 tst-basic3 tst-basic4 tst-basic5 tst-basic6 \ >> -     tst-basic7 \ >> -     tst-cancel-self tst-cancel-self-cancelstate \ >> -     tst-cancel-self-canceltype tst-cancel-self-testcancel \ >> -     tst-cancel1 tst-cancel2 tst-cancel3 \ >> -     tst-cancel4 tst-cancel5 \ >> -     tst-cancel6 tst-cancel8 tst-cancel9 tst-cancel10 tst-cancel11 \ >> -     tst-cancel12 tst-cancel13 tst-cancel14 tst-cancel15 tst-cancel16 \ >> -     tst-cancel18 tst-cancel19 tst-cancel20 tst-cancel21 \ >> -     tst-cancel22 tst-cancel23 tst-cancel26 tst-cancel27 tst-cancel28 \ >> -     tst-cancel29 \ >> -     tst-cleanup0 tst-cleanup1 tst-cleanup2 tst-cleanup3 \ >> -     tst-clock1 \ >> -     tst-cond-except \ >> -     tst-cond1 tst-cond2 tst-cond3 tst-cond4 tst-cond5 tst-cond6 >> tst-cond7 \ >> -     tst-cond8 tst-cond9 tst-cond10 tst-cond11 tst-cond12 tst-cond13 \ >> -     tst-cond14 tst-cond15 tst-cond16 tst-cond17 tst-cond18 tst-cond19 \ >> -     tst-cond20 tst-cond21 tst-cond23 tst-cond24 tst-cond25 tst-cond27 \ >> -     tst-create-detached \ >> -     tst-detach1 \ >> -     tst-eintr2 tst-eintr3 tst-eintr4 tst-eintr5 \ >> -     tst-exec1 tst-exec2 tst-exec3 \ >> -     tst-exit1 tst-exit2 tst-exit3 \ >> -     tst-flock1 tst-flock2 \ >> -     tst-fork1 tst-fork2 tst-fork3 tst-fork4 \ >> -     tst-atfork1 \ >> -     tst-getpid3 \ >> -     tst-join1 tst-join2 tst-join3 tst-join4 tst-join5 tst-join6 >> tst-join7 \ >> -     tst-join8 tst-join9 tst-join10 tst-join11 tst-join12 tst-join13 \ >> -     tst-join14 tst-join15 \ >> -     tst-key1 tst-key2 tst-key3 tst-key4 \ >> -     tst-kill1 tst-kill2 tst-kill3 tst-kill5 tst-kill6 \ >> -     tst-locale1 tst-locale2 \ >> -     tst-memstream \ >> -     tst-mutex-errorcheck tst-mutex1 tst-mutex2 tst-mutex3 tst-mutex4 \ >> -     tst-mutex5 tst-mutex6 tst-mutex7 tst-mutex7robust tst-mutex9 \ >> -     tst-mutex10 tst-mutex11 tst-pthread-mutexattr \ >> -     tst-once1 tst-once2 tst-once3 tst-once4 \ >> -     tst-pt-popen1 \ >> -     tst-raise1 \ >> -     tst-robust1 tst-robust2 tst-robust3 tst-robust4 tst-robust5 \ >> -     tst-robust6 tst-robust7 tst-robust9 tst-robust10 \ >> -     tst-rwlock1 tst-rwlock4 tst-rwlock5 tst-rwlock12 \ >> -     tst-rwlock13 tst-rwlock14 tst-rwlock16 \ >> -     tst-rwlock-tryrdlock-stall tst-rwlock-trywrlock-stall \ >> -     tst-sem1 tst-sem2 tst-sem3 tst-sem4 tst-sem5 tst-sem6 tst-sem7 \ >> -     tst-sem8 tst-sem9 tst-sem10 tst-sem14 tst-sem15 tst-sem16 \ >> -     tst-setuid3 \ >> -     tst-signal1 tst-signal2 \ >> -     tst-signal4 tst-signal5 tst-signal6 tst-signal8 \ >> -     tst-spin1 tst-spin2 tst-spin3 tst-spin4 \ >> -     tst-stack1 \ >> -     tst-stdio1 tst-stdio2 \ >> -     tst-pt-sysconf \ >> -     tst-pt-tls1 tst-pt-tls2 \ >> -     tst-tsd1 tst-tsd2 tst-tsd5 tst-tsd6 \ >> -     tst-umask1 \ >> -     tst-unload \ >> -     tst-unwind-thread \ >> -     tst-pt-vfork1 tst-pt-vfork2 tst-vfork1x tst-vfork2x \ >> -     tst-pthread-exit-signal \ >> -     tst-pthread-setuid-loop \ >> -     tst-pthread_cancel-exited \ >> -     tst-pthread_cancel-select-loop \ >> -     tst-pthread-raise-blocked-self \ >> -     tst-pthread_kill-exited \ >> -     tst-pthread_kill-exiting \ >> -     tst-cancel30 \ >> -     # tests >> +tests += \ >> +  tst-abstime \ >> +  tst-atfork1 \ >> +  tst-attr1 \ >> +  tst-backtrace1 \ >> +  tst-bad-schedattr \ >> +  tst-barrier1 \ >> +  tst-barrier2 \ >> +  tst-barrier3 \ >> +  tst-barrier4 \ >> +  tst-basic1 \ >> +  tst-basic2 \ >> +  tst-basic3 \ >> +  tst-basic4 \ >> +  tst-basic5 \ >> +  tst-basic6 \ >> +  tst-basic7 \ >> +  tst-call-once \ >> +  tst-cancel-self \ >> +  tst-cancel-self-cancelstate \ >> +  tst-cancel-self-canceltype \ >> +  tst-cancel-self-testcancel \ >> +  tst-cancel1 \ >> +  tst-cancel2 \ >> +  tst-cancel3 \ >> +  tst-cancel4 \ >> +  tst-cancel5 \ >> +  tst-cancel6 \ >> +  tst-cancel8 \ >> +  tst-cancel9 \ >> +  tst-cancel10 \ >> +  tst-cancel11 \ >> +  tst-cancel12 \ >> +  tst-cancel13 \ >> +  tst-cancel14 \ >> +  tst-cancel15 \ >> +  tst-cancel16 \ >> +  tst-cancel18 \ >> +  tst-cancel19 \ >> +  tst-cancel20 \ >> +  tst-cancel21 \ >> +  tst-cancel22 \ >> +  tst-cancel23 \ >> +  tst-cancel26 \ >> +  tst-cancel27 \ >> +  tst-cancel28 \ >> +  tst-cancel29 \ >> +  tst-cancel30 \ >> +  tst-cleanup0 \ >> +  tst-cleanup1 \ >> +  tst-cleanup2 \ >> +  tst-cleanup3 \ >> +  tst-clock1 \ >> +  tst-cnd-basic \ >> +  tst-cnd-broadcast \ >> +  tst-cnd-timedwait \ >> +  tst-cond-except \ >> +  tst-cond1 \ >> +  tst-cond2 \ >> +  tst-cond3 \ >> +  tst-cond4 \ >> +  tst-cond5 \ >> +  tst-cond6 \ >> +  tst-cond7 \ >> +  tst-cond8 \ >> +  tst-cond9 \ >> +  tst-cond10 \ >> +  tst-cond11 \ >> +  tst-cond12 \ >> +  tst-cond13 \ >> +  tst-cond14 \ >> +  tst-cond15 \ >> +  tst-cond16 \ >> +  tst-cond17 \ >> +  tst-cond18 \ >> +  tst-cond19 \ >> +  tst-cond20 \ >> +  tst-cond21 \ >> +  tst-cond23 \ >> +  tst-cond24 \ >> +  tst-cond25 \ >> +  tst-cond27 \ >> +  tst-create-detached \ >> +  tst-detach1 \ >> +  tst-eintr2 \ >> +  tst-eintr3 \ >> +  tst-eintr4 \ >> +  tst-eintr5 \ >> +  tst-exec1 \ >> +  tst-exec2 \ >> +  tst-exec3 \ >> +  tst-exit1 \ >> +  tst-exit2 \ >> +  tst-exit3 \ >> +  tst-flock1 \ >> +  tst-flock2 \ >> +  tst-fork1 \ >> +  tst-fork2 \ >> +  tst-fork3 \ >> +  tst-fork4 \ >> +  tst-getpid3 \ >> +  tst-join1 \ >> +  tst-join2 \ >> +  tst-join3 \ >> +  tst-join4 \ >> +  tst-join5 \ >> +  tst-join6 \ >> +  tst-join7 \ >> +  tst-join8 \ >> +  tst-join9 \ >> +  tst-join10 \ >> +  tst-join11 \ >> +  tst-join12 \ >> +  tst-join13 \ >> +  tst-join14 \ >> +  tst-join15 \ >> +  tst-key1 \ >> +  tst-key2 \ >> +  tst-key3 \ >> +  tst-key4 \ >> +  tst-kill1 \ >> +  tst-kill2 \ >> +  tst-kill3 \ >> +  tst-kill5 \ >> +  tst-kill6 \ >> +  tst-locale1 \ >> +  tst-locale2 \ >> +  tst-memstream \ >> +  tst-mtx-basic \ >> +  tst-mtx-recursive \ >> +  tst-mtx-timedlock \ >> +  tst-mtx-trylock \ >> +  tst-mutex-errorcheck \ >> +  tst-mutex1 \ >> +  tst-mutex2 \ >> +  tst-mutex3 \ >> +  tst-mutex4 \ >> +  tst-mutex5 \ >> +  tst-mutex6 \ >> +  tst-mutex7 \ >> +  tst-mutex9 \ >> +  tst-mutex10 \ >> +  tst-mutex11 \ >> +  tst-once1 \ >> +  tst-once2 \ >> +  tst-once3 \ >> +  tst-once4 \ >> +  tst-pt-align \ >> +  tst-pt-align3 \ >> +  tst-pt-popen1 \ >> +  tst-pt-sysconf \ >> +  tst-pt-tls1 \ >> +  tst-pt-tls2 \ >> +  tst-pt-vfork1 \ >> +  tst-pt-vfork2 \ >> +  tst-pthread-exit-signal \ >> +  tst-pthread-mutexattr \ >> +  tst-pthread-raise-blocked-self \ >> +  tst-pthread-setuid-loop \ >> +  tst-pthread_cancel-exited \ >> +  tst-pthread_cancel-select-loop \ >> +  tst-pthread_kill-exited \ >> +  tst-pthread_kill-exiting \ >> +  tst-raise1 \ >> +  tst-robust1 \ >> +  tst-robust2 \ >> +  tst-robust3 \ >> +  tst-robust4 \ >> +  tst-robust5 \ >> +  tst-robust6 \ >> +  tst-robust7 \ >> +  tst-robust9 \ >> +  tst-robust10 \ >> +  tst-robust11 \ >> +  tst-rwlock-tryrdlock-stall \ >> +  tst-rwlock-trywrlock-stall \ >> +  tst-rwlock1 \ >> +  tst-rwlock4 \ >> +  tst-rwlock5 \ >> +  tst-rwlock12 \ >> +  tst-rwlock13 \ >> +  tst-rwlock14 \ >> +  tst-rwlock16 \ >> +  tst-sem1 \ >> +  tst-sem2 \ >> +  tst-sem3 \ >> +  tst-sem4 \ >> +  tst-sem5 \ >> +  tst-sem6 \ >> +  tst-sem7 \ >> +  tst-sem8 \ >> +  tst-sem9 \ >> +  tst-sem10 \ >> +  tst-sem14 \ >> +  tst-sem15 \ >> +  tst-sem16 \ >> +  tst-setuid3 \ >> +  tst-signal1 \ >> +  tst-signal2 \ >> +  tst-signal4 \ >> +  tst-signal5 \ >> +  tst-signal6 \ >> +  tst-signal8 \ >> +  tst-spin1 \ >> +  tst-spin2 \ >> +  tst-spin3 \ >> +  tst-spin4 \ >> +  tst-stack1 \ >> +  tst-stdio1 \ >> +  tst-stdio2 \ >> +  tst-thrd-detach \ >> +  tst-thrd-sleep \ >> +  tst-tsd1 \ >> +  tst-tsd2 \ >> +  tst-tsd5 \ >> +  tst-tsd6 \ >> +  tst-tss-basic \ >> +  tst-umask1 \ >> +  tst-unload \ >> +  tst-unwind-thread \ >> +  tst-vfork1x \ >> +  tst-vfork2x \ >> +  # tests >>   tests-time64 += \ >>     tst-abstime-time64 \ >> @@ -138,47 +291,70 @@ tests-time64 += \ >>     tst-rwlock14-time64 \ >>     tst-sem5-time64 \ >>     tst-thrd-sleep-time64 \ >> +  # tests-time64 >>   static-only-routines = pthread_atfork >>   # Files which must not be linked with libpthread. >> -tests-nolibpthread += tst-unload >> +tests-nolibpthread += \ >> +  tst-unload \ >> +  # tests-nolibpthread >>   # GCC-4.9 compiles 'sprintf(NULL, ...)' into UD2 on x86_64 without >> -fno-builtin >>   CFLAGS-tst-cleanup2.c += -fno-builtin >>   CFLAGS-tst-cleanupx2.c += -fno-builtin >> -tests += tst-cancelx2 tst-cancelx3 tst-cancelx6 tst-cancelx8 >> tst-cancelx9 \ >> -     tst-cancelx4 tst-cancelx5 \ >> -     tst-cancelx10 tst-cancelx11 tst-cancelx12 tst-cancelx13 >> tst-cancelx14 \ >> -     tst-cancelx15 tst-cancelx16 tst-cancelx18 tst-cancelx20 >> tst-cancelx21 \ >> -     tst-cleanupx0 tst-cleanupx1 tst-cleanupx2 tst-cleanupx3 >> +tests += \ >> +  tst-cancelx2 \ >> +  tst-cancelx3 \ >> +  tst-cancelx4 \ >> +  tst-cancelx5 \ >> +  tst-cancelx6 \ >> +  tst-cancelx8 \ >> +  tst-cancelx9 \ >> +  tst-cancelx10 \ >> +  tst-cancelx11 \ >> +  tst-cancelx12 \ >> +  tst-cancelx13 \ >> +  tst-cancelx14 \ >> +  tst-cancelx15 \ >> +  tst-cancelx16 \ >> +  tst-cancelx18 \ >> +  tst-cancelx20 \ >> +  tst-cancelx21 \ >> +  tst-cleanupx0 \ >> +  tst-cleanupx1 \ >> +  tst-cleanupx2 \ >> +  tst-cleanupx3 \ >> +  # tests >>   ifeq ($(build-shared),yes) >>   tests += \ >> -  tst-atfork2 \ >> -  tst-pt-tls4 \ >>     tst-_res1 \ >> -  tst-fini1 \ >> -  tst-create1 \ >> +  tst-atfork2 \ >>     tst-atfork3 \ >>     tst-atfork4 \ >> -# tests >> +  tst-create1 \ >> +  tst-fini1 \ >> +  tst-pt-tls4 \ >> +  # tests >> -tests-nolibpthread += tst-fini1 >> +tests-nolibpthread += \ >> +  tst-fini1 \ >> +  # tests-nolibpthread >>   endif >>   modules-names += \ >> -  tst-atfork2mod \ >> -  tst-tls4moda \ >> -  tst-tls4modb \ >>     tst-_res1mod1 \ >>     tst-_res1mod2 \ >> -  tst-fini1mod \ >> -  tst-create1mod \ >> +  tst-atfork2mod \ >>     tst-atfork3mod \ >>     tst-atfork4mod \ >> -# module-names >> +  tst-create1mod \ >> +  tst-fini1mod \ >> +  tst-tls4moda \ >> +  tst-tls4modb \ >> +  # modules-names >>   test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names))) >> @@ -192,17 +368,30 @@ ifeq ($(build-shared),yes) >>   tests: $(test-modules) >>   endif >> +tests-static += \ >> +  tst-cancel21-static \ >> +  tst-locale1 \ >> +  tst-locale2 \ >> +  # tests-static >> -tests-static += tst-locale1 tst-locale2 tst-cancel21-static >> - >> -tests += tst-cancel21-static tst-cond11-static >> +tests += \ >> +  tst-cancel21-static \ >> +  tst-cond11-static \ >> +  # tests >>   # These tests are linked with libc before libpthread >> -tests-reverse += tst-cancel5 tst-cancel23 tst-vfork1x tst-vfork2x >> +tests-reverse += \ >> +  tst-cancel5 \ >> +  tst-cancel23 \ >> +  tst-vfork1x \ >> +  tst-vfork2x \ >> +  # tests-reverse >>   ifeq ($(run-built-tests),yes) >>   ifeq ($(build-shared),yes) >> -tests-special += $(objpfx)tst-cleanup0-cmp.out >> +tests-special += \ >> +  $(objpfx)tst-cleanup0-cmp.out \ >> +  # tests-special >>   endif >>   endif >> @@ -286,20 +475,38 @@ $(objpfx)tst-_res1: $(objpfx)tst-_res1mod1.so >> $(objpfx)tst-_res1mod2.so \ >>   $(objpfx)tst-pt-tls4: $(shared-thread-library) >>   $(objpfx)tst-pt-tls4.out: $(objpfx)tst-tls4moda.so >> $(objpfx)tst-tls4modb.so >> -generated += tst-atfork2.mtrace >> +generated += \ >> +  tst-atfork2.mtrace \ >> +  # generated >> -generated += $(objpfx)tst-atfork2.mtrace \ >> -         $(addsuffix .so,$(strip $(modules-names))) >> +generated += \ >> +  $(objpfx)tst-atfork2.mtrace \ >> +  $(addsuffix .so,$(strip $(modules-names))) \ >> +  # generated >> -tests-internal += tst-cancel25 tst-robust8 >> +tests-internal += \ >> +  tst-cancel25 \ >> +  tst-robust8 \ >> +  # tests-internal >> -tests += tst-oncex3 tst-oncex4 tst-oncey3 tst-oncey4 >> +tests += \ >> +  tst-oncex3 \ >> +  tst-oncex4 \ >> +  tst-oncey3 \ >> +  tst-oncey4 \ >> +  # tests >> -modules-names += tst-join7mod >> +modules-names += \ >> +  tst-join7mod \ >> +  # modules-names >>   ifeq ($(build-shared),yes) >> -tests-static += tst-cond8-static >> -tests += tst-cond8-static >> +tests-static += \ >> +  tst-cond8-static \ >> +  # tests-static >> +tests += \ >> +  tst-cond8-static \ >> +  # tests >>   endif >>   CFLAGS-tst-oncex3.c += -fexceptions >> diff --git a/sysdeps/pthread/tst-mutex7robust.c >> b/sysdeps/pthread/tst-robust11.c >> similarity index 100% >> rename from sysdeps/pthread/tst-mutex7robust.c >> rename to sysdeps/pthread/tst-robust11.c >