From patchwork Wed Sep 4 16:20:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 825336 Delivered-To: patch@linaro.org Received: by 2002:adf:e246:0:b0:367:895a:4699 with SMTP id bl6csp255133wrb; Wed, 4 Sep 2024 09:20:24 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUzWc1Du2qwFAPbOdZRbtMoUQ7bW9svrlFNJbnR29NUmg8VhWLPNrx6F09QHm8nqO2d4dJVrg==@linaro.org X-Google-Smtp-Source: AGHT+IGt6b6IC2p/+hJSOneODhwSYOI7Q3eLbC5y05B4u2eUru7711WP1OGXSnDvI3d5tqu4eyzr X-Received: by 2002:a05:6870:ac09:b0:277:ca2f:905 with SMTP id 586e51a60fabf-27810c18cc3mr8502398fac.29.1725466823813; Wed, 04 Sep 2024 09:20:23 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1725466823; cv=pass; d=google.com; s=arc-20160816; b=BBmThqeISU/7O9R3dmaEIncJQ+Qcrnit4SQlxHVT3TJmzk8wOM0XMiOReMNawarQo2 cM7BK4FxfgPijsLENkF4x6BNDFosvB+ntZdfvh3mZaTBMReVAfj3bhgV3ZIAvpvQjEff wV5mM2y4FzWWh70fZ4+hQ6lSCgBcJ+P/dejGnHPdokfGpeyO/3mjFmiA/PYUts/KWDme 9Xeo/2rVml9/7wv6QkmrqQ1lws+cAi/9j2up3c6MI1Xqf4wa7VaVgNw7FIRl1OUo43+f S9SYuHQuWDpH7JV3EpVEcpUNrHAjHn/fSUDRxM3h1+Agm/HTcCZ71fBGjoJHkLfod/qG C3HQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=WCUbGh0QrmWVlEUWZfNpuDT2CaWTmsiE7s6ZHJpRjCY=; fh=dHLBnA+MhGtNtN2B2JMAELi4oD+gmgMg7DL8H0jYbkI=; b=uS0uPMmNvc1W4Hocl3P+MnfQ6bpwDzr7PFMJjDcEC4qYBUZANJSY/i30e1HQVFBW9F Uak38UjFuvb4r4Vo4td2Nn5v8F058oWlsoRo66EECaRXRlV6Sv2FxKOeHEgct5ba29gG eiHBe9oViy6bXbgyoYnjH1EnZuXgIo9D+Foqny3CP9uMrCZNcrsNwqWs2yzlyBvRbGOm mDHA0l9Fb2UFhRjfUPXWxVmIfajKghVx3Gz91NtkJhovVk0pGaa7KYxXCPjBnNBrMnrZ jXrrjiAc92J8qejQZK4p4BV4bP5tOHnN1x1DudTE9muNzGTEOUnmLNc0hj1PiJuY5eYB fSYQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DEQ060xA; arc=pass (i=1); spf=pass (google.com: domain of libc-alpha-bounces~patch=linaro.org@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="libc-alpha-bounces~patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id af79cd13be357-7a806d834b2si1498690185a.390.2024.09.04.09.20.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2024 09:20:23 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-bounces~patch=linaro.org@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DEQ060xA; arc=pass (i=1); spf=pass (google.com: domain of libc-alpha-bounces~patch=linaro.org@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="libc-alpha-bounces~patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 60AC6385EC1E for ; Wed, 4 Sep 2024 16:20:23 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by sourceware.org (Postfix) with ESMTPS id 4DB6E385C6C3 for ; Wed, 4 Sep 2024 16:20:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4DB6E385C6C3 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 4DB6E385C6C3 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::429 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1725466811; cv=none; b=Job6Fii59WpooU6af6zOr98SBPKnKv207zmX9txgqdCRy4FyN9FT9Su+GnDeVqyAv0gkkJF7GlVRk4NJZIpMSbAlcX8giOPxeai996h4M3vHA0+VG71f3YM/1K3GuPJD23s8FKAIOCbZ/Pf4ht9idPrCZMEYyT54mvlJV6+PnbQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1725466811; c=relaxed/simple; bh=8/m8LJkmUKJqz4g1jDWgB3vHQ5VkGDi6Dz5j2BRnuUc=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=wfKRaUKWDFO0PLOFlS2QCws+roscco0IgdbOfw0RBsGIRx4drAFwsmOoqEYy0TJMS8y+whKTCDOrYlNj4TvrBI35k5MGojqVGUbhiU9Uhpz/fZ+9coZrQuVa9AzkaeUrTXkS8ExPw3+0S5Nw3zhFPiQ4X6xMs4m7qqe3AWiCReE= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-7176645e501so2354100b3a.1 for ; Wed, 04 Sep 2024 09:20:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725466808; x=1726071608; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=WCUbGh0QrmWVlEUWZfNpuDT2CaWTmsiE7s6ZHJpRjCY=; b=DEQ060xAtqN3YpBNTWZP+ds6cFJULmUPVmygw/GyckAhVpbR2Dm5sUelsvyA+URckc byCTwg/2kSGxDfwpRmddsSL0u//mldJXwE1+Ag6MfaVUKtsv3N6N9mMJBxD7gZV0IGBb TQkNDkPFE/RfBOkGm5dGcWNTXNtI0GNZp3mlJaPoO/+mJLDdd1R008SpQBmqtOWQQQKF bZ8XZdnImFAaH32GwvLn5kkuG24eCyHY7goSDczQo+/loLaq57L7Ps1Umks4kmZc4FKr WGcKFqdpcU63oNsLxNrZMJvkHgz4XsKTW78tHu4E0bt1aHTWqwa1ROHsZvcdfeH4F6bC bOtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725466808; x=1726071608; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=WCUbGh0QrmWVlEUWZfNpuDT2CaWTmsiE7s6ZHJpRjCY=; b=Azf2kRIQv9QEnrkt78tN18M9bpiRcl8RxvHbu7szYFoW6OOY0Vn2IkQDePpaUBaq4w ljZvN+rI+tCoNplqLJo/T0F7LXfZKuUCtruzlzWOGS9wF42u1wAxyP93hnptGsOtAaJw mQY1Iq0VXrJDVO+EkdRAetD8rdHjH3B9EEuG8Q+90NLBpCzJE8FL2z/c/EG/rtKOF7wZ ykpW5zAnmwpO+ufMxbbJKehDKA+Du3HfqpyS4o81Inr6SU5+8J3yOwUS3Mfo3DKk1veV 6g89g8L9f3nNftjB0FdYgtrgvjMBMCeMlkc/K5/TFSYmBxggM0TP4lBtVuPLlndvSD1T TnMA== X-Gm-Message-State: AOJu0Yzi6mxswxEK8/GQhAUhbHUhHoVsackqqdDD7Q2whoHkjpFRQT/O oOzCG8UDJb4OLLl7RGJUYyo7VcXHY/8FL1mQE9/uUSZRFRfMvpUpWaZ9bXKL+rUswEbky9O5fy6 mPxg= X-Received: by 2002:a05:6a00:4616:b0:706:6af8:e088 with SMTP id d2e1a72fcca58-71744331059mr11946698b3a.3.1725466807838; Wed, 04 Sep 2024 09:20:07 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c3:e912:1301:81fd:2901:4eab]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7d4fbda8762sm1820286a12.69.2024.09.04.09.20.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2024 09:20:07 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH] linux: Use GLRO(dl_vdso_time) on time Date: Wed, 4 Sep 2024 13:20:02 -0300 Message-ID: <20240904162003.821668-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patch=linaro.org@sourceware.org The BZ#24967 fix (1bdda52fe92fd01b424c) missed the time for architectures that define 1bdda52fe92fd01b424c. Although it is not an issue, since there is no pointer mangling, there is also no need to call dl_vdso_vsym since the vDSO setup was already done by the loader. Checked on x86_64-linux-gnu and i686-linux-gnu. --- sysdeps/unix/sysv/linux/time.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sysdeps/unix/sysv/linux/time.c b/sysdeps/unix/sysv/linux/time.c index f8b0cee41c..ea929f6758 100644 --- a/sysdeps/unix/sysv/linux/time.c +++ b/sysdeps/unix/sysv/linux/time.c @@ -32,12 +32,9 @@ time_syscall (time_t *t) return INLINE_SYSCALL_CALL (time, t); } -# undef INIT_ARCH -# define INIT_ARCH() \ - void *vdso_time = dl_vdso_vsym (HAVE_TIME_VSYSCALL); libc_ifunc (time, - vdso_time ? VDSO_IFUNC_RET (vdso_time) - : (void *) time_syscall); + GLRO(dl_vdso_time) != NULL ? VDSO_IFUNC_RET (GLRO(dl_vdso_time)) + : (void *) time_syscall); # else time_t