From patchwork Tue Jan 11 18:44:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 49887 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 607903889819 for ; Tue, 11 Jan 2022 18:47:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 607903889819 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1641926822; bh=0q65a3aVbSN1NWvZhZDGFeELMFRXdSt/gaMyUVLj8TE=; 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=V/EOLDWyphmwg+wscEKiGjWiztfhSJIGj3w7cDcPgPpK9LSHuUobbqg0o6euzK7+Q dwGSyV9Gwnze2zGbSz7g1tXs8rIwITHJYmDMm9iXZn2J8XtzHYaoVrPo+3gL+BpU6S eQMoTLiSfCYXYrI/VnWwx7CXh1pJBlqBCun/whJ8= 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 ESMTPS id 306BD3890023 for ; Tue, 11 Jan 2022 18:44:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 306BD3890023 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-350-oALcdFWGMRGpEQoJfBrb0A-1; Tue, 11 Jan 2022 13:44:04 -0500 X-MC-Unique: oALcdFWGMRGpEQoJfBrb0A-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0029A1023F53 for ; Tue, 11 Jan 2022 18:44:04 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.192.102]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5862C7A405 for ; Tue, 11 Jan 2022 18:44:03 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 4/5] Linux: Assume that NEED_DL_SYSINFO_DSO is always defined In-Reply-To: References: X-From-Line: 8831b5e1d0a01c813b9c8bb9e5e65264c423ea49 Mon Sep 17 00:00:00 2001 Message-Id: <8831b5e1d0a01c813b9c8bb9e5e65264c423ea49.1641922962.git.fweimer@redhat.com> Date: Tue, 11 Jan 2022 19:44:01 +0100 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.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.4 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_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The definition itself is still needed for generic code. --- sysdeps/unix/sysv/linux/dl-sysdep.c | 8 ++------ sysdeps/unix/sysv/linux/m68k/sysdep.h | 4 +--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/sysdeps/unix/sysv/linux/dl-sysdep.c b/sysdeps/unix/sysv/linux/dl-sysdep.c index a13e0ea7ad..2bda76b820 100644 --- a/sysdeps/unix/sysv/linux/dl-sysdep.c +++ b/sysdeps/unix/sysv/linux/dl-sysdep.c @@ -134,11 +134,9 @@ _dl_sysdep_start (void **start_argptr, new_sysinfo = av->a_un.a_val; break; #endif -#ifdef NEED_DL_SYSINFO_DSO case AT_SYSINFO_EHDR: GLRO(dl_sysinfo_dso) = (void *) av->a_un.a_val; break; -#endif case AT_RANDOM: _dl_random = (void *) av->a_un.a_val; break; @@ -153,10 +151,8 @@ _dl_sysdep_start (void **start_argptr, #ifdef NEED_DL_SYSINFO if (new_sysinfo != 0) { -# ifdef NEED_DL_SYSINFO_DSO /* Only set the sysinfo value if we also have the vsyscall DSO. */ if (GLRO(dl_sysinfo_dso) != 0) -# endif GLRO(dl_sysinfo) = new_sysinfo; } #endif @@ -309,7 +305,7 @@ int attribute_hidden _dl_discover_osversion (void) { -#if defined NEED_DL_SYSINFO_DSO && defined SHARED +#ifdef SHARED if (GLRO(dl_sysinfo_map) != NULL) { /* If the kernel-supplied DSO contains a note indicating the kernel's @@ -340,7 +336,7 @@ _dl_discover_osversion (void) } } } -#endif +#endif /* SHARED */ char bufmem[64]; char *buf = bufmem; diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep.h b/sysdeps/unix/sysv/linux/m68k/sysdep.h index 628e1be835..d87892a377 100644 --- a/sysdeps/unix/sysv/linux/m68k/sysdep.h +++ b/sysdeps/unix/sysv/linux/m68k/sysdep.h @@ -299,8 +299,6 @@ SYSCALL_ERROR_LABEL: \ #define PTR_MANGLE(var) (void) (var) #define PTR_DEMANGLE(var) (void) (var) -#if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO /* M68K needs system-supplied DSO to access TLS helpers even when statically linked. */ -# define NEED_STATIC_SYSINFO_DSO 1 -#endif +#define NEED_STATIC_SYSINFO_DSO 1