From nobody Fri Apr 24 15:29:10 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 4g2H1f4m5Nz6bSQL for ; Fri, 24 Apr 2026 15:29:10 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2H1f1wH1z3D2D for ; Fri, 24 Apr 2026 15:29:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777044550; 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=NKWCTH4fgHBUHGJgVBPdjooeOvtmr/uAZWxIhKyPdlg=; b=T5W2SScXK91VpsKClr5WKNxSgnNlQotQdujlonMrw5sKenu9+3EQfhIcyxcDnljh0fhfeP bFRirR5vuRmeN40Tj3GKi4k1pfZJXNAab1iMECAnKrykRsHNJhCbUpBZJw3rFjjBW2f9RL os3Bw+X5Vb/r1/rytYK4+nRv0DfScEw66cWZ96Id0nDy+UBZWv97tW/O6b5GGLojvMfaC+ 0aCZlHRnnSPiClL7si/AvBeeXynSWxfc/+cRCImXsBUIaTmTGQ+ehqRJS/w+Ipa4TwuqH/ gXepRZDYrF7T6VnljwJERLdw+sohTOZrnSbitWAbk4wt6y8MR0lAkVQzOX4zlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777044550; a=rsa-sha256; cv=none; b=G+gYhb19Z5aqcSyxyQ7/LZyebmmTtfgHXrzqM9eX+ZEQfQJGYfkAAzjj87whZpxJ4PDcpZ 5AS0JGvVLARZcZP+5DH8ChS5F0K0QgTMaBjFBfFcr7Dt4i3j4d+6X0Vl62mn5neMEU8xDp gB2EDrZVyH7guCvUjtaBeyghXc1AE3pMi4p/NPyF89s1Sm+1mVz9TK2lFHHHQ0iJ31jizR 16/9Sw3+4tuTU6/w4QakPUelAULSaC9gCaTmLS1dG2mezU60dgAACte72o6jlWvIy8M2GA tagsV+bzxbeCk4R8EuliOd+nBQxHjr9Yxox61EgT9/mYKW+JtCAQta+WNGCv0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777044550; 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=NKWCTH4fgHBUHGJgVBPdjooeOvtmr/uAZWxIhKyPdlg=; b=pRdvdZXUCVG1or9TQzI8vuNr0kfCmbcOI0MAT66NlrAwkEUxbhehfB1Syys45LxOvWT51S Wj5fEGi5J74igVAeJBCYqL/18rAPKzRmDMS463T2peGsHtexHjKfyWejzVeBb14RxRH1XL vwx38XMO9n72qWCfsj219GFv13sX3rUxfjqE0lMlC4yPG/0Rfc9W5XcejUBp9ky/1IEhZK qHuE0EyRLxK8InQizfyk5Ibqk0miE9YBOPEGfLaYRTN6ZBMTNZw4Uawglj4yCYpmEWYJgU fcdV3IhD11LudlE7TGF2bnFZ4kqTuxGgiKWO/YI/QDw/SA7EwZgwQ4SJcMv2zw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2H1f17zjz178V for ; Fri, 24 Apr 2026 15:29:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33b53 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 15:29:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 4f536daec8fb - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 4f536daec8fbfc05ae0097a825386848056cbbbd Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 15:29:10 +0000 Message-Id: <69eb8c46.33b53.487f66df@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4f536daec8fbfc05ae0097a825386848056cbbbd commit 4f536daec8fbfc05ae0097a825386848056cbbbd Author: John Baldwin AuthorDate: 2026-01-14 17:10:33 +0000 Commit: John Baldwin CommitDate: 2026-04-24 15:26:38 +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 (cherry picked from commit 3ea97c9de2b24c685d42be12dd57fad2f67b3f1b) --- 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")