From patchwork Fri May 21 12:46:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 43531 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 ED4EF398B873; Fri, 21 May 2021 12:46:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org ED4EF398B873 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1621601184; bh=SGkzUzq0nsBSo9eyP1pAIlC0AyExdDq/zWVW2l9bIYk=; 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=cAsp+xLooNe9sdiWTyUHG1yfeLJuWhMo1Y4uy8lPwq8M84/+c9NEtsPOjZotb39q3 RIBTrfMvvYYw7YFhvYEqhkGQt8aUp/OsKwTsBoaP3BFBArWdFg1UVpvFWGdf5tfNoI 4UXsdZk5e2lSpNbtHfBitU6lPLACZM0byBkNkTmA= 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 E0FB5398B8AB for ; Fri, 21 May 2021 12:46:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E0FB5398B8AB 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-151-l-6eTec_OsGOlSf8lS11vQ-1; Fri, 21 May 2021 08:46:17 -0400 X-MC-Unique: l-6eTec_OsGOlSf8lS11vQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D4B47501E8 for ; Fri, 21 May 2021 12:46:16 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-113-228.ams2.redhat.com [10.36.113.228]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3236C60C17 for ; Fri, 21 May 2021 12:46:15 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 8/8] Linux: Remove remaining references to $(shared-thread-library) In-Reply-To: References: X-From-Line: 9c17e5ffae73684ec9b9ccb38373f312a0a0396b Mon Sep 17 00:00:00 2001 Message-Id: <9c17e5ffae73684ec9b9ccb38373f312a0a0396b.1621600831.git.fweimer@redhat.com> Date: Fri, 21 May 2021 14:46:14 +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.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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@sourceware.org Sender: "Libc-alpha" Since the variable expands to nothing under Linux, it is no longer necessary to clutter the makefiles with it. 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) @@ -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 \ @@ -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 @@ -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 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 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) \ @@ -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) 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)