Date: Fri, 2 May 2025 07:34:18 GMT From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 071b26a179bf - main - rtld: apply some style to resolve_object_ifunc() Message-ID: <202505020734.5427YIS4081060@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=071b26a179bf8174804869139c1c1fe9d3286ea7 commit 071b26a179bf8174804869139c1c1fe9d3286ea7 Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2025-05-01 17:22:34 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> 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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202505020734.5427YIS4081060>