From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oi1-x234.google.com (mail-oi1-x234.google.com [IPv6:2607:f8b0:4864:20::234]) by sourceware.org (Postfix) with ESMTPS id 1EF0B3858C2D for ; Tue, 8 Feb 2022 20:13:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1EF0B3858C2D Received: by mail-oi1-x234.google.com with SMTP id r27so271934oiw.4 for ; Tue, 08 Feb 2022 12:13:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=H+RnJErydbjnmGdGTSiEZIPo8rovggPVyQNa5GCbk/k=; b=P8r0XrrWfuL18OaXQQJj1262HLJyFZOLpotOieEmpyx+N8geJifHrq+n5zklHRwaVs E024FEzbFVNtC8CYTTZBBYCmyhlL62pZiRovvS/Y75Tenvq4foFEthxAKGnM1V0mlLE+ coTbfos8OqUjjc7Z4BH3V4uIO2m/nhoZSCxjhOFQ3lYiPNaNade1NF+d4Z5YaSUzLO/2 naDqggnpUXXNxpi80XPVmkKz0lpe/H88qLTif6o3Z0ns4JOu9kVnvRDJGvt+xTUhwnzR PX0PP22KMSoXRCXFR88SdDIN2emQubrojehip+exclSPDpfs0vxnN9oaXAyNtPLLbvvl /feg== X-Gm-Message-State: AOAM5303tBgHfRabqMy7pOaZlNCPVSd+V6Mi+Tt1/XG1OJ02zFhR8oyq MYQg5nnnzOWS95nMe9Y5wPZmCxmD4X0kjw== X-Google-Smtp-Source: ABdhPJzsjQ34j9lrNaeA6tHXLLXAwP/RPmczRcx2dA//bgNqMm8dyTq8dNrjS+dEZDrss641xn4f4w== X-Received: by 2002:a05:6808:23c6:: with SMTP id bq6mr1331572oib.54.1644351199470; Tue, 08 Feb 2022 12:13:19 -0800 (PST) Received: from ?IPV6:2804:431:c7ca:733:86a9:ad5:adef:2f3e? ([2804:431:c7ca:733:86a9:ad5:adef:2f3e]) by smtp.gmail.com with ESMTPSA id k10sm5830690oou.26.2022.02.08.12.13.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 08 Feb 2022 12:13:19 -0800 (PST) Message-ID: Date: Tue, 8 Feb 2022 17:13:17 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.6.0 Subject: Re: [PATCH v2 4/5] Linux: Assume that NEED_DL_SYSINFO_DSO is always defined Content-Language: en-US To: Florian Weimer , libc-alpha@sourceware.org References: From: Adhemerval Zanella In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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-List-Received-Date: Tue, 08 Feb 2022 20:13:24 -0000 On 03/02/2022 08:08, Florian Weimer via Libc-alpha wrote: > The definition itself is still needed for generic code. LGTM, thanks. Reviewed-by: Adhemerval Zanella > --- > 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