From nobody Fri May 2 07:34:18 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZpjNV4LTnz5vH1Q; Fri, 02 May 2025 07:34:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZpjNV3C4mz3rf5; Fri, 02 May 2025 07:34:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746171258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=04GS6smPhsr261dTc1tqadJvXdY0DVh9rKfcEjUuGG4=; b=S24YoNGrj44hsvNPHeKBwv+QhZMLUe6hxC1aXOo9DWsg4maH/tLHoe27eLN0Ew9L+o1Krp kOpfHP8wWWmi48FqXqSWK3fnzEOiGzSwtF7SZxyCVD5B96CG2lx4cFXqOP+iW8NTDpB1G6 SNKEtJk60IpZXiQfXkuzI31I/o/tEvG/3Ad6JmWlV/7Pzv5ym5slCEnEvTdENjgu9Hnb/P UYS5sWIGzvvWhLAna/8z3VZB7pqHn9nZS13r3+KSp4Fcr6mBbu9zo3fjhY+9zErhTjTd3u rf/nUoz3UK7ZriaWVTxax8cYAOcI3P2o8If6PnZ2HyDsyl5+QMVgHNTCJE6/Xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746171258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=04GS6smPhsr261dTc1tqadJvXdY0DVh9rKfcEjUuGG4=; b=S3ATgsbOI+W7E4JepNQS7eARu2RfhunrhIfbHgpQgTDEvtQc97KUG7WuPI8LuHHM46qm9V 5FcagM5PGNt6zyhDrOOpUZ/my+uG/j4E6irV0JF8y0J7FOWlx7WXriTHKZGwoCRG6YUEiL +D/g7sb4RiibwI1458GjDWToeK6cZdVhiQFy3t/uICP4Sob37U2Au+uF4rGPWdWwDWBb6/ I5uRWkPMKdp+8cQ6F3qMwEo3gePSB8yH7ReqqACBbyIsU56WR4ESLH4+wCYweZXx7hlToi HN12v7fxSeNoicRTWAD599Td1LBjY9MBtui1LV/5c2M7BppRX/JI2KZMwdYa0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746171258; a=rsa-sha256; cv=none; b=v5nEEfJZR7kdmlFZyrVRQVoFOK19sKZUFhorNTrqKiwBLG8b98FaZo8+ilreWxz7A4VZYd p96ZpyfH3uTs76R+LdTXC0SLVWduB0c3OFOchAL1AcAJYcSdifsmHMYEHI1h1dHWERnOf1 AF1MRA2x8BndzVATEPIqiHXtMP4JF2R41lr3rZmoKopnoNz5HOs/H/4sk1DDozUTDXamem EpDwvXSMBhaePNBRTPG/XnESjAnTUDNqgDNBSOcDMhCXs01+4pP4MDf08uBqn2whe3vA2V p1aHxVpIdXd8G4ap9c4x1pLFbJoNAwD3J1XRkVHYopMwQgGIcZ1BS8Y/I3+Sag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZpjNV2lLlz13Ly; Fri, 02 May 2025 07:34:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5427YIKx081063; Fri, 2 May 2025 07:34:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5427YIS4081060; Fri, 2 May 2025 07:34:18 GMT (envelope-from git) Date: Fri, 2 May 2025 07:34:18 GMT Message-Id: <202505020734.5427YIS4081060@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 071b26a179bf - main - rtld: apply some style to resolve_object_ifunc() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 071b26a179bf8174804869139c1c1fe9d3286ea7 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=071b26a179bf8174804869139c1c1fe9d3286ea7 commit 071b26a179bf8174804869139c1c1fe9d3286ea7 Author: Konstantin Belousov AuthorDate: 2025-05-01 17:22:34 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-02 07:32:56 +0000 rtld: apply some style to resolve_object_ifunc() Sponsored by: The FreeBSD Foundation --- libexec/rtld-elf/rtld.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 137d27528b46..3a9a3e800831 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -3437,12 +3437,12 @@ resolve_object_ifunc(Obj_Entry *obj, bool bind_now, int flags, if (obj_disable_relro(obj) == -1 || (obj->irelative && reloc_iresolve(obj, lockstate) == -1) || (obj->irelative_nonplt && - reloc_iresolve_nonplt(obj, lockstate) == -1) || + reloc_iresolve_nonplt(obj, lockstate) == -1) || ((obj->bind_now || bind_now) && obj->gnu_ifunc && - reloc_gnu_ifunc(obj, flags, lockstate) == -1) || + reloc_gnu_ifunc(obj, flags, lockstate) == -1) || (obj->non_plt_gnu_ifunc && - reloc_non_plt(obj, &obj_rtld, flags | SYMLOOK_IFUNC, - lockstate) == -1) || + reloc_non_plt(obj, &obj_rtld, flags | SYMLOOK_IFUNC, + lockstate) == -1) || obj_enforce_relro(obj) == -1) return (-1); return (0);