From patchwork Wed May 12 16:58:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 43405 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 D647A399C02D; Wed, 12 May 2021 16:58:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D647A399C02D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1620838693; bh=B62JGZze4JZY9dptZZwXZ/4bFKUCGtkOJo46zXhNstw=; 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=VF8O00EHgTiGI23YOleD8pvC5+EQ4tREXB/2RFMtRICdcdw+YJxqDhysAYRya3QrA McqfOfJXIh7iZhBArc7R5Fs7Wiq+AN1nRVrsem4xkQpcCpXgAJg7OjqX9g7tG8yXkn YCiMxeH59zLbcx+GiqpoJb0JFXiEU7Io+JLkWn28= 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 [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id 6BD863990834 for ; Wed, 12 May 2021 16:58:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6BD863990834 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-158-SOamoPztM-eqnx63CPdOPQ-1; Wed, 12 May 2021 12:58:10 -0400 X-MC-Unique: SOamoPztM-eqnx63CPdOPQ-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 72AF4107ACCD for ; Wed, 12 May 2021 16:58:09 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-112-137.ams2.redhat.com [10.36.112.137]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8F3706086F for ; Wed, 12 May 2021 16:58:08 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 10/23] elf: Remove DL_STATIC_INIT In-Reply-To: References: X-From-Line: c01baffa4a3f83ab52dd0254000694209f74bfa0 Mon Sep 17 00:00:00 2001 Message-Id: Date: Wed, 12 May 2021 18:58:06 +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.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.8 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" All users have been converted to the __rtld_static_init mechanism. Reviewed-by: Adhemerval Zanella --- elf/dl-open.c | 4 ---- sysdeps/generic/ldsodefs.h | 6 ------ 2 files changed, 10 deletions(-) diff --git a/elf/dl-open.c b/elf/dl-open.c index 7e018bb44c..5a870aaf2e 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -781,10 +781,6 @@ dl_open_worker (void *a) _dl_call_libc_early_init (libc_map, initial); } -#ifndef SHARED - DL_STATIC_INIT (new); -#endif - /* Run the initializer functions of new objects. Temporarily disable the exception handler, so that lazy binding failures are fatal. */ diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index e43d6f5ecd..c288f3a2a1 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -135,12 +135,6 @@ dl_symbol_visibility_binds_local_p (const ElfW(Sym) *sym) # define DL_UNMAP(map) _dl_unmap_segments (map) #endif -/* By default we do not need special support to initialize DSOs loaded - by statically linked binaries. */ -#ifndef DL_STATIC_INIT -# define DL_STATIC_INIT(map) -#endif - /* Reloc type classes as returned by elf_machine_type_class(). ELF_RTYPE_CLASS_PLT means this reloc should not be satisfied by some PLT symbol, ELF_RTYPE_CLASS_COPY means this reloc should not be