From nobody Tue May 06 17:15:04 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 4ZsQ4m2bnjz5v74p; Tue, 06 May 2025 17:15:04 +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 4ZsQ4m1tDBz3gJQ; Tue, 06 May 2025 17:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746551704; 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=HbxhVCpkBzwilfvX5xkW3MJfj7rIt4Dvp90L7RRMFAQ=; b=GEgDo3fsaSi5cbxFBQ7GvTOJYFs5dUHop3ph7paECje0kqdmjUG1YBBnTzw4OYEGKLGO7L MmVO64ciuZXHeP8DvubPhoRXtPPg5l4gOBEhk/KHV9sgNwvmJuT5JuAq3YuTXteEtEHhkY VzlnrneycVta9O4RhBFtO5mgkLCPhCNLuyuUyhn8vpGp2j8qf7iZDo41wSHTuxVos3O4Mn ixWX5fZwn7TWBd364WQ7N6nm5RW1NNKWg47iLFblYvQDMVrR17i3I3gTq8cYaV8vS4919G 95HvWluZHg+Jk3A3JUhY9IEBoRYva24pkdVhao9YW0NZ5pkJ9mgme/eHjhLsWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746551704; 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=HbxhVCpkBzwilfvX5xkW3MJfj7rIt4Dvp90L7RRMFAQ=; b=C1bpX/FWdwDgqBSJMq68556fK7VD1MseHf/q+F4aYPs5YQ/rEgvH2eCa8J18CSIIKUai3x C2BaL6ahLyAbqBmwSNTSZ9hRWVTTGfGAWVyaEdujYGvPQaMNDIocZy3yYM8C82Mvm4ZXNQ 7ppMIWN5iHcA90o026RvYGXpidBvCmfdR3gX+4wczJTw5kaa38Fj9I6P7lBSrqBygWVhsl 7MI1Qs11rplnzuntVgGQrxwA8S4Wd110BX+LzHBNmOlFWXtYNC9PNVrtJGasKzCmgx0Wfz MMub9E3d3SzoBtqboiXPTjHmkUOjXXU8xhz+TGFhkkOaeuF3TcSnnw5M23Xeog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746551704; a=rsa-sha256; cv=none; b=oHD0LjK0pYvfQuFXxp7VByUq57VE3U7b5/faobPMZXVvCUHLLVy5FJvshS/Ju+iQnIVo+A u746NiV6rTpSjk8ZZczYjRxzLYgCVaYYteaWXxzxEkqzPX/qmRww2cEXUmRIXQnbo0Iq0x uxtP1yV94CqO2cEyhJalbAmoeInvNHzti1cPAhHsS2iSSZEJ6EMdX/ReSr6nl2RogsgOZC IEorbenGUa6jbRyOUHZDjgXCZHz0Vzbr4mcQVOgEr9+WTcQUt9xCzl3nZxngsNR7tfLbJ9 MJfziyAG2gk60b5NUFqZWnp50mASrSMjl3G8faVpjvwYBTUcmVjCvMkdBdiwjA== 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 4ZsQ4m1LcNz1712; Tue, 06 May 2025 17:15:04 +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 546HF4M9089261; Tue, 6 May 2025 17:15:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546HF4gT089258; Tue, 6 May 2025 17:15:04 GMT (envelope-from git) Date: Tue, 6 May 2025 17:15:04 GMT Message-Id: <202505061715.546HF4gT089258@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: 3d4c3eb6f23f - main - rtld: style 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: 3d4c3eb6f23faa9457fe4af4515c9835cb2f43b0 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3d4c3eb6f23faa9457fe4af4515c9835cb2f43b0 commit 3d4c3eb6f23faa9457fe4af4515c9835cb2f43b0 Author: Konstantin Belousov AuthorDate: 2025-05-03 07:15:17 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-06 17:14:56 +0000 rtld: style --- libexec/rtld-elf/rtld.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 59d29888d93d..0575ce19d476 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -2590,7 +2590,7 @@ initlist_add_objects(Obj_Entry *obj, Obj_Entry *tail, Objlist *list) /* Add the object to the global fini list in the reverse order. */ if ((obj->fini != (Elf_Addr)NULL || - obj->fini_array != (Elf_Addr)NULL) && + obj->fini_array != (Elf_Addr)NULL) && !obj->on_fini_list) { objlist_push_head(&list_fini, obj); obj->on_fini_list = true; @@ -3817,7 +3817,7 @@ dlopen_object(const char *name, int fd, Obj_Entry *refobj, int lo_flags, if (obj != NULL) { obj->dl_refcount++; - if (mode & RTLD_GLOBAL && + if ((mode & RTLD_GLOBAL) != 0 && objlist_find(&list_global, obj) == NULL) objlist_push_tail(&list_global, obj);