From nobody Wed Jan 14 17:10:52 2026 X-Original-To: dev-commits-src-all@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 4drt191FZDz6Ng7d for ; Wed, 14 Jan 2026 17:10:53 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4drt185dYnz3QQy for ; Wed, 14 Jan 2026 17:10:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768410652; 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=S7AFVHt5PP7YvHs3lhvOa2O3xkbnpQrrC0OskDAo+ok=; b=Ud6k09dd7ssNZL1iW+Z93TaTV5aJgC1WbjvMgR9ssIuMaDPhRVbAKvUPB0qYLwtR4j26OV ewhJD3DRcUVOOcv7VB2Q1cMmGjXu34howfH89Hv0IZtKCGSKdr552uL3aHLMY43OjJDN3f cgEYPhNpnOea5WzZQnJsnc5MHWe1xf3oJZVX+QS77kFxWtA74NUK8M8FnVhP10ihRuljOY iSJ3T3qLr66Djo59FoXOXiL+DvqEZSJyb3k+AJ27poUI5MUnw7M9ewl56qOQrsLTb6swd7 PAxcWf6Q6gcjAm8VtHKS4OwYXSCERXLNAzxEuzF3bR4tTRpa652/doeIsCmupg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768410652; 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=S7AFVHt5PP7YvHs3lhvOa2O3xkbnpQrrC0OskDAo+ok=; b=uD/SPCkB+XooLsTsGj9+0Tu+1EozSO1htbf88DmNNFAAZBYo4VBtKs1TjYEgL6rgTuyD0O yeRd9bkAP4bhYwL4TlG2SGiYbNiguOzrI5cAQer4IMlN8pIRn4ALxx7pCMmqLlU8UQV9MR G8sYq9DKxciU7ZbHx9mhRM86cAGJ9xkxy1WT7rKMd2YaY7mOe6DfHzVeZdnKn8odeE8oHd Z7CtFSmBO10Kw+LLv2RZqbtup9MrGlwnDjtQgE/pn9GLCkBYToTkV8/hp+DdZxEMnY7feI 00AClS8dyFc4pvayjiDH7byRn1Z43SYRjVLOxXvSpXzpIZsPKy6e/pFOJ6jxNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768410652; a=rsa-sha256; cv=none; b=qcxQvp4J8uMIjCQMycHYsILnEEmWgZOFP+epveRTd3juJU/1TWWLGw1J9ZUwgekPZqp/Wx iT4NuSn/h3zUyR0jtf91LHrb7bkDSxmqS3ssSfD3J3TxqredhDCyasnTZRMbPNAK6vSo+q SFkxYnHsHeXzfKp6btTCf3TerXjtZyHMUpNA2pDz/c5Y3g8raOgJBbP/C7CU4ft9cLyaT4 ngkoE271+GbdTnC8kIlbdXL/PPj4AIPJwxPdsmADuCESd664AEcIeSzBowjhzENBfSIHuI regMbSVdOT/INeCK3d443n0fcqf2qoYw16N+D9JfQIXhDngqJ0ssfd4T3VdnFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4drt185CB5z16Bg for ; Wed, 14 Jan 2026 17:10:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 333a0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 14 Jan 2026 17:10:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 3ea97c9de2b2 - main - rtld: Switch to using for assert List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ea97c9de2b24c685d42be12dd57fad2f67b3f1b Auto-Submitted: auto-generated Date: Wed, 14 Jan 2026 17:10:52 +0000 Message-Id: <6967ce1c.333a0.712a2178@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3ea97c9de2b24c685d42be12dd57fad2f67b3f1b commit 3ea97c9de2b24c685d42be12dd57fad2f67b3f1b Author: John Baldwin AuthorDate: 2026-01-14 17:10:33 +0000 Commit: John Baldwin CommitDate: 2026-01-14 17:10:33 +0000 rtld: Switch to using for assert The stock assert() works because rtld-libc includes a custom implementation of __assert(). Reviewed by: imp, kib Obtained from: CheriBSD Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D54712 --- libexec/rtld-elf/debug.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libexec/rtld-elf/debug.h b/libexec/rtld-elf/debug.h index 1a019f07750a..09de6057e1e7 100644 --- a/libexec/rtld-elf/debug.h +++ b/libexec/rtld-elf/debug.h @@ -33,7 +33,7 @@ #define DEBUG_H 1 #include - +#include #include #include "rtld_paths.h" #include "rtld_printf.h" @@ -47,9 +47,6 @@ extern int debug; #define dbg(...) ((void) 0) #endif -#define assert(cond) ((cond) ? (void) 0 : \ - (msg(_BASENAME_RTLD ": assert failed: " __FILE__ ":" \ - __XSTRING(__LINE__) "\n"), abort())) #define msg(s) rtld_putstr(s) #define trace() msg(_BASENAME_RTLD ": " __XSTRING(__LINE__) "\n")