From patchwork Wed Jun 9 13:01:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 1489856 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=lpfzAt1z; dkim-atps=neutral Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G0S1X3B5Fz9s5R for ; Wed, 9 Jun 2021 23:02:08 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5EF523980821 for ; Wed, 9 Jun 2021 13:02:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5EF523980821 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1623243725; bh=WU8u3Aw0H6vhNZ7Fskiy1tWBSmcMfJEal76VaY6trCY=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=lpfzAt1z328unYu935rOCy7m5Dxm+m1SuA3YWNLZ85uvUc8mzZ0fazU7ZccOCLkhs AtJ2ycHgMf1ksWvfG2qfxFgqjsIqxSeyx/4IBqKuxoplCWtN2N1VUOxxUnuVwM3YJT quUl977liK/yBTEFaz9XrCFT/+uLztQR2ol48OV4= 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 9E806383F43B for ; Wed, 9 Jun 2021 13:01:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9E806383F43B 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-581-4136ZzXmM0OhEoQMNr6i6w-1; Wed, 09 Jun 2021 09:01:46 -0400 X-MC-Unique: 4136ZzXmM0OhEoQMNr6i6w-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2F595100C696 for ; Wed, 9 Jun 2021 13:01:45 +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 A06426091A for ; Wed, 9 Jun 2021 13:01:44 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH] Remove stale references to libdl.a Date: Wed, 09 Jun 2021 15:01:42 +0200 Message-ID: <875yyn5gzt.fsf@oldenburg.str.redhat.com> 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.13 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, 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+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" Since commit 0c1c3a771eceec46e66ce1183cf988e2303bd373 ("dlfcn: Move dlopen into libc") libdl.a is empty, so linking against it is no longer necessary. Tested on i686-linux-gnu and x86_64-linux-gnu. Built with build-many-glibcs.py. Reviewed-by: Adhemerval Zanella --- elf/Makefile | 7 +------ sysdeps/powerpc/Makefile | 1 - sysdeps/powerpc/powerpc64/Makefile | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/elf/Makefile b/elf/Makefile index 6dbb03bbb2..5c47daee12 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -1050,7 +1050,6 @@ unload7-ENV = MALLOC_PERTURB_=85 $(objpfx)unload8.out: $(objpfx)unload8mod1.so $(objpfx)unload8mod1x.so -$(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so ifeq ($(have-z-execstack),yes) @@ -1276,7 +1275,6 @@ $(objpfx)tst-leaks1-mem.out: $(objpfx)tst-leaks1.out $(common-objpfx)malloc/mtrace $(objpfx)tst-leaks1.mtrace > $@; \ $(evaluate-test) -$(objpfx)tst-leaks1-static: $(common-objpfx)dlfcn/libdl.a $(objpfx)tst-leaks1-static-mem.out: $(objpfx)tst-leaks1-static.out $(common-objpfx)malloc/mtrace $(objpfx)tst-leaks1-static.mtrace > $@; \ $(evaluate-test) @@ -1533,7 +1531,6 @@ $(objpfx)tst-ldconfig-X.out : tst-ldconfig-X.sh $(objpfx)ldconfig $(objpfx)tst-linkall-static: \ $(common-objpfx)math/libm.a \ $(common-objpfx)resolv/libresolv.a \ - $(common-objpfx)dlfcn/libdl.a \ $(common-objpfx)login/libutil.a \ $(common-objpfx)rt/librt.a \ $(common-objpfx)resolv/libanl.a \ @@ -1591,7 +1588,6 @@ $(objpfx)tst-absolute-zero: $(objpfx)tst-absolute-zero-lib.so # against libdl. $(objpfx)tst-libc_dlvsym-dso.so: $(libsupport) $(objpfx)tst-libc_dlvsym.out: $(objpfx)tst-libc_dlvsym-dso.so -$(objpfx)tst-libc_dlvsym-static: $(common-objpfx)dlfcn/libdl.a tst-libc_dlvsym-static-ENV = \ LD_LIBRARY_PATH=$(ld-library-path):$(common-objpfx)dlfcn $(objpfx)tst-libc_dlvsym-static.out: $(objpfx)tst-libc_dlvsym-dso.so @@ -1696,7 +1692,7 @@ $(objpfx)tst-single_threaded: $(objpfx)tst-single_threaded-mod1.so $(objpfx)tst-single_threaded.out: \ $(objpfx)tst-single_threaded-mod2.so $(objpfx)tst-single_threaded-mod3.so $(objpfx)tst-single_threaded-static-dlopen: \ - $(objpfx)tst-single_threaded-mod1.o $(common-objpfx)dlfcn/libdl.a + $(objpfx)tst-single_threaded-mod1.o $(objpfx)tst-single_threaded-static-dlopen.out: \ $(objpfx)tst-single_threaded-mod2.so $(objpfx)tst-single_threaded-pthread: \ @@ -1834,6 +1830,5 @@ $(objpfx)tst-tls21: $(shared-thread-library) $(objpfx)tst-tls21.out: $(objpfx)tst-tls21mod.so $(objpfx)tst-tls21mod.so: $(tst-tls-many-dynamic-modules:%=$(objpfx)%.so) -$(objpfx)tst-getauxval-static: $(common-objpfx)dlfcn/libdl.a $(objpfx)tst-getauxval-static.out: $(objpfx)tst-auxvalmod.so tst-getauxval-static-ENV = LD_LIBRARY_PATH=$(objpfx):$(common-objpfx) diff --git a/sysdeps/powerpc/Makefile b/sysdeps/powerpc/Makefile index d1c71a0ca4..09860ffc01 100644 --- a/sysdeps/powerpc/Makefile +++ b/sysdeps/powerpc/Makefile @@ -25,7 +25,6 @@ test-internal-extras += mod-cache-ppc mod-cache-ppc.so-no-z-defs = yes tst-cache-ppc-static-dlopen-ENV = LD_LIBRARY_PATH=$(objpfx):$(common-objpfx):$(common-objpfx)elf -$(objpfx)tst-cache-ppc-static-dlopen: $(common-objpfx)dlfcn/libdl.a $(objpfx)tst-cache-ppc-static-dlopen.out: $(objpfx)mod-cache-ppc.so $(objpfx)tst-cache-ppc: $(objpfx)mod-cache-ppc.so diff --git a/sysdeps/powerpc/powerpc64/Makefile b/sysdeps/powerpc/powerpc64/Makefile index dd49dbbce2..679d5e49ba 100644 --- a/sysdeps/powerpc/powerpc64/Makefile +++ b/sysdeps/powerpc/powerpc64/Makefile @@ -59,7 +59,6 @@ tests += tst-setjmp-bug21895-static tests-static += tst-setjmp-bug21895-static modules-names += setjmp-bug21895 -$(objpfx)tst-setjmp-bug21895-static: $(common-objpfx)dlfcn/libdl.a $(objpfx)tst-setjmp-bug21895-static.out: $(objpfx)setjmp-bug21895.so tst-setjmp-bug21895-static-ENV = \