From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qt1-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) by sourceware.org (Postfix) with ESMTPS id 22F1E3857C48 for ; Mon, 24 May 2021 18:27:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 22F1E3857C48 Received: by mail-qt1-x833.google.com with SMTP id s12so12113759qta.3 for ; Mon, 24 May 2021 11:27:50 -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=lytJHkPAoyOqL51SQFocKgNzOD9tblGOBURm1qDiETw=; b=lZDFX9w8YZw14qg1R1K5n5WDOINg3iZnr9D4ID777nJROgZB2CshYj3JyRK+/q+8PT pipXPx7cCfnOuhe1l0hGvy7dLHom60lLIySOGUA6m4INTkPLkZR9hwILAc0hgyhmZRr1 3z02iG2a8El3VpltAaFY/dCgoeRD8VqjnExOPekslPbPQlnjtqVXHS/QLJaoRlydy8Rq 1VwzZL3WA7vCe1zg5Z/2ifjHXr2C4zpFXBkIiuih9Yolc4slitLmxWvEjKG8sjxZXWvu EUwVX92cSeryVypGEkaPkks204iACFc9NHnOZdoCHoDpZrAqPTA5m5a1gOvXwFsfnCaC osmQ== X-Gm-Message-State: AOAM531D1GzrR3qbUvxNXmvBNaAUAI4smyJuyH3v1TCbFhUdLiFqOlq/ uF6k0kQQa2b/IeSIs2lyCxOMs6RAS2+MvQ== X-Google-Smtp-Source: ABdhPJzrwpeKSCWP+urasBZgHG4BX9T/VwpkwYqVpiEa8KS5V6BoyvlCk0rETWHpmLdwogHC5rkmxg== X-Received: by 2002:aed:2081:: with SMTP id 1mr28500180qtb.24.1621880869018; Mon, 24 May 2021 11:27:49 -0700 (PDT) Received: from [192.168.1.4] ([177.194.37.86]) by smtp.gmail.com with ESMTPSA id f19sm11881958qkg.70.2021.05.24.11.27.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 May 2021 11:27:48 -0700 (PDT) Subject: Re: [PATCH 8/8] Linux: Remove remaining references to $(shared-thread-library) To: Florian Weimer , libc-alpha@sourceware.org References: <9c17e5ffae73684ec9b9ccb38373f312a0a0396b.1621600831.git.fweimer@redhat.com> From: Adhemerval Zanella Message-ID: Date: Mon, 24 May 2021 15:27:46 -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: <9c17e5ffae73684ec9b9ccb38373f312a0a0396b.1621600831.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.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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: Mon, 24 May 2021 18:27:51 -0000 On 21/05/2021 09:46, Florian Weimer via Libc-alpha wrote: > Since the variable expands to nothing under Linux, it is no longer > necessary to clutter the makefiles with it. LGTM, thanks. Reviewed-by: Adhemerval Zanella > --- > nptl/Makefile | 21 +++++++-------------- > sysdeps/mips/Makefile | 2 -- > sysdeps/unix/sysv/linux/Makefile | 6 ------ > sysdeps/unix/sysv/linux/i386/Makefile | 1 - > 4 files changed, 7 insertions(+), 23 deletions(-) > > diff --git a/nptl/Makefile b/nptl/Makefile > index 52d1d193d9..060d6eebd6 100644 > --- a/nptl/Makefile > +++ b/nptl/Makefile > @@ -371,12 +371,6 @@ CPPFLAGS-tst-pthread-gdb-attach-static.c := \ > # were launched with an explicit ld.so invocation. > tst-pthread-gdb-attach-no-pie = yes > > -ifeq ($(build-shared),yes) > -tests-printers-libs := $(shared-thread-library) > -else > -tests-printers-libs := $(static-thread-library) > -endif > - > tests += tst-cancelx7 tst-cancelx17 > > ifeq ($(build-shared),yes) Ok. > @@ -501,7 +495,7 @@ $(objpfx)tst-stack3-mem.out: $(objpfx)tst-stack3.out > $(evaluate-test) > generated += tst-stack3-mem.out tst-stack3.mtrace > > -$(objpfx)tst-stack4: $(libdl) $(shared-thread-library) > +$(objpfx)tst-stack4: $(libdl) > tst-stack4mod.sos=$(shell for i in 0 1 2 3 4 5 6 7 8 9 10 \ > 11 12 13 14 15 16 17 18 19; do \ > for j in 0 1 2 3 4 5 6 7 8 9 10 \ Ok. > @@ -514,19 +508,18 @@ $(tst-stack4mod.sos): $(objpfx)tst-stack4mod.so > clean: > rm -f $(tst-stack4mod.sos) > > -$(objpfx)tst-cleanup4: $(objpfx)tst-cleanup4aux.o $(shared-thread-library) > -$(objpfx)tst-cleanupx4: $(objpfx)tst-cleanupx4aux.o $(shared-thread-library) > +$(objpfx)tst-cleanup4: $(objpfx)tst-cleanup4aux.o > +$(objpfx)tst-cleanupx4: $(objpfx)tst-cleanupx4aux.o > > -$(objpfx)tst-tls3: $(libdl) $(shared-thread-library) > +$(objpfx)tst-tls3: $(libdl) > LDFLAGS-tst-tls3 = -rdynamic > $(objpfx)tst-tls3.out: $(objpfx)tst-tls3mod.so > -$(objpfx)tst-tls3mod.so: $(shared-thread-library) > > -$(objpfx)tst-tls3-malloc: $(libdl) $(shared-thread-library) > +$(objpfx)tst-tls3-malloc: $(libdl) > LDFLAGS-tst-tls3-malloc = -rdynamic > $(objpfx)tst-tls3-malloc.out: $(objpfx)tst-tls3mod.so > > -$(objpfx)tst-tls5: $(objpfx)tst-tls5mod.so $(shared-thread-library) > +$(objpfx)tst-tls5: $(objpfx)tst-tls5mod.so > LDFLAGS-tst-tls5 = -Wl,--no-as-needed > LDFLAGS-tst-tls5mod.so = -Wl,-soname,tst-tls5mod.so > Ok. > @@ -540,7 +533,7 @@ $(objpfx)tst-tls6.out: tst-tls6.sh $(objpfx)tst-tls5 \ > $(evaluate-test) > endif > > -$(objpfx)tst-dlsym1: $(libdl) $(shared-thread-library) > +$(objpfx)tst-dlsym1: $(libdl) > > ifeq (yes,$(build-shared)) > librt = $(common-objpfx)rt/librt.so Ok. > diff --git a/sysdeps/mips/Makefile b/sysdeps/mips/Makefile > index 19e6a57622..150518bc6d 100644 > --- a/sysdeps/mips/Makefile > +++ b/sysdeps/mips/Makefile > @@ -72,8 +72,6 @@ endif > ifeq ($(mips-mode-switch),yes) > ifeq ($(o32-fpabi),xx) > tests += tst-mode-switch-1 tst-mode-switch-2 tst-mode-switch-3 > -$(objpfx)tst-mode-switch-1: $(shared-thread-library) > -$(objpfx)tst-mode-switch-2: $(shared-thread-library) > endif > endif > endif Ok. > diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile > index fb155cf856..e9566e028a 100644 > --- a/sysdeps/unix/sysv/linux/Makefile > +++ b/sysdeps/unix/sysv/linux/Makefile > @@ -179,8 +179,6 @@ $(objpfx)tst-glibcsyscalls.out: \ > # Separate object file for access to the constant from the UAPI header. > $(objpfx)tst-sysconf-iov_max: $(objpfx)tst-sysconf-iov_max-uapi.o > > -$(objpfx)tst-pkey: $(shared-thread-library) > - > tests-special += $(objpfx)tst-mman-consts.out > $(objpfx)tst-mman-consts.out: ../sysdeps/unix/sysv/linux/tst-mman-consts.py > $(sysdeps-linux-python) \ Ok. > @@ -189,10 +187,6 @@ $(objpfx)tst-mman-consts.out: ../sysdeps/unix/sysv/linux/tst-mman-consts.py > < /dev/null > $@ 2>&1; $(evaluate-test) > $(objpfx)tst-mman-consts.out: $(sysdeps-linux-python-deps) > > -$(objpfx)tst-gettid: $(shared-thread-library) > -$(objpfx)tst-gettid-kill: $(shared-thread-library) > -$(objpfx)tst-tgkill: $(shared-thread-library) > - > endif # $(subdir) == misc > > ifeq ($(subdir),time) Ok. > diff --git a/sysdeps/unix/sysv/linux/i386/Makefile b/sysdeps/unix/sysv/linux/i386/Makefile > index 26e0a8852b..abd0009d58 100644 > --- a/sysdeps/unix/sysv/linux/i386/Makefile > +++ b/sysdeps/unix/sysv/linux/i386/Makefile > @@ -5,7 +5,6 @@ ifeq ($(subdir),misc) > sysdep_routines += ioperm iopl vm86 > > tests += tst-bz21269 > -$(objpfx)tst-bz21269: $(shared-thread-library) > endif > > ifeq ($(subdir),elf) > Ok.