From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id C6CE23858D28 for ; Tue, 30 May 2023 14:07:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C6CE23858D28 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685455643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=q2lRHMy53X6aGsjSv5h7gW4w1z9yyhSF4ChaUKjFe0A=; b=P3J2ZjO6Ry3TgjzUo330z/52u54gTQsRvrGxPAVSQuBb4OODOi48D+myf5rn1NJRkVrBOa Lmj4oz0lZAKv9PpIuO6SE7wOEmX6ewDTUqrQFwFM09e3WpRAEkhedeEsVFas2II6Vl98fS mV56pvQLFFIOcYa/XCbFz4E9fy0JaAg= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-622-_UEPNZQrOLKlVKnghzPgkg-1; Tue, 30 May 2023 10:07:22 -0400 X-MC-Unique: _UEPNZQrOLKlVKnghzPgkg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 46A40832D33 for ; Tue, 30 May 2023 14:06:31 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.2.16.38]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CD83B40C6CD6 for ; Tue, 30 May 2023 14:06:30 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH] elf: Remove spurios SHARED conditional from elf/rtld.c Date: Tue, 30 May 2023 16:06:29 +0200 Message-ID: <87leh5syl6.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-10.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_NONE,SPF_HELO_NONE,SPF_NONE,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: elf/rtld.c is only ever built in SHARED mode. --- elf/rtld.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/elf/rtld.c b/elf/rtld.c index 37a2d8b3e9..ca5e8b9ec3 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -2409,10 +2409,8 @@ dl_main (const ElfW(Phdr) *phdr, _dl_relocate_object might need to call `mprotect' for DT_TEXTREL. */ _dl_sysdep_start_cleanup (); -#ifdef SHARED /* Auditing checkpoint: we have added all objects. */ _dl_audit_activity_nsid (LM_ID_BASE, LA_ACT_CONSISTENT); -#endif /* Notify the debugger all new objects are now ready to go. We must re-get the address since by now the variable might be in another object. */ --