From nobody Fri Feb 20 16:46:29 2026 X-Original-To: dev-commits-src-branches@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 4fHbjy2N98z6ScX3 for ; Fri, 20 Feb 2026 16:46:30 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fHbjx6tZlz3pWJ for ; Fri, 20 Feb 2026 16:46:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771605990; 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=pXfbO9ISmWldfxs9VVVKR8F8LAUbA0609ONYXfkX2v8=; b=DTJ54OPcITnFKeDM4Jglo5CeSkJiVNTIUWMfD9bu+KB6QusuDo36hiGf/+c3yU/JXfhGsB fgGmZ9/hwzisE1th3XMMov+Pv/vUtr1n1KYIkHV8+HnR/3Olz0AaV885brcmREdrlp28gS T1fP/+imQdHHqWJK6UjqCeHWpdD3nrnusqSbC4v8EQ3lqNibsnhhxR4qtvx7TEKsOfs5q/ XSaIbTToFCva0mUifppSQy0RCkbrdyuyuIk/OQeXgm8jkhhLFczN5AqdG5zwATr7Nviqca a11vVgFBKMq2LKrLB3WWhHOeb9oV93ZSOGbveqJXaP83w7XxzxoJepg/G2XsyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771605990; a=rsa-sha256; cv=none; b=NM10qztkQbSHGXYy+UEEXOF6a0nx7QsovHhnd2vvofswEPkg7hEKhQMxwx+nNi6GpNcnuD Y10glWenwesCg8H/n1tfgKtD35BBn+mjSREdD/qp0zDa05QTaSUoH3uePM9AN05IwvcMc7 yauXlKoAIaMF+DmRPDKqzg9P4wg2FdWEExzkbh6NF+ZYWJYDw4ZL5k2GuT8MnkTJP5Wy0R YgxnOM+g7wDfA/7lNF655IIEUAkXtlP/f4S1mKh1+VsMvdJsd9TI59yIRlMFDg8ytyPTdt NgxnWqX+c8RdtbjTafHc2asQULlpGd4R72zy3WS9YCLpT3QbIzd0IL2tnQ6+5A== 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=1771605990; 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=pXfbO9ISmWldfxs9VVVKR8F8LAUbA0609ONYXfkX2v8=; b=eHSuVFq8NQFv3aJul11DgefZ63O4xYh/VURZF0D4ZH7MQ3P0bQRBqReVS8igR6AQeCu6gw KwnARsu6/d3U201jjLTARWYFwyOuK5q0zNzt1/0/ViO4ko1ggMRqHd+vv0KGCPVkemYOed b8+rUEcirFWDliXtV1rdSLIvhNgosKejVwhm5P2BYSw6vLdoCdwUPxDrCk1c/WQUeNvBhl OoM22eVLb98YYxWhhaWW6UQyaWcMtwZKeE53HHR3NTCPccc43F2+yOYIrGfVJLlqkeqd/F /aBy+v2ySlJGNp0rDRj9xxBonRl7jE8F3KpTaocoAwLjozpxQv0tPJSHBibZ/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHbjx6Jfxzcrf for ; Fri, 20 Feb 2026 16:46:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 345be by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 16:46:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: eac62e18e83a - stable/15 - libc/arm: use __builtin_trap() instead of abort() in aeabi_unwind stubs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: eac62e18e83a15fa744b2683c3a7f1fcf659e8cc Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 16:46:29 +0000 Message-Id: <69988fe5.345be.458009ce@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=eac62e18e83a15fa744b2683c3a7f1fcf659e8cc commit eac62e18e83a15fa744b2683c3a7f1fcf659e8cc Author: Robert Clausecker AuthorDate: 2026-02-11 18:50:18 +0000 Commit: Robert Clausecker CommitDate: 2026-02-20 16:44:55 +0000 libc/arm: use __builtin_trap() instead of abort() in aeabi_unwind stubs This avoids a dependency on the abort symbol in libsys. PR: 292539 Reviewed by: mmel Approved by: markj (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55255 (cherry picked from commit 1782bc9a0a8da2d6aca31b7790981e1980c9e4b9) --- lib/libc/arm/aeabi/aeabi_unwind_cpp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libc/arm/aeabi/aeabi_unwind_cpp.c b/lib/libc/arm/aeabi/aeabi_unwind_cpp.c index efcace2c0675..3667b7d7e673 100644 --- a/lib/libc/arm/aeabi/aeabi_unwind_cpp.c +++ b/lib/libc/arm/aeabi/aeabi_unwind_cpp.c @@ -27,15 +27,15 @@ * */ +#include + /* * Provide an implementation of __aeabi_unwind_cpp_pr{0,1,2}. These are * required by libc but are implemented in libgcc_eh.a which we don't link - * against. The libgcc_eh.a version will be called so we call abort to + * against. The libgcc_eh.a version will be called so we trap to * check this. */ -#include - void __aeabi_unwind_cpp_pr0(void) __hidden; void __aeabi_unwind_cpp_pr1(void) __hidden; void __aeabi_unwind_cpp_pr2(void) __hidden; @@ -43,18 +43,18 @@ void __aeabi_unwind_cpp_pr2(void) __hidden; void __aeabi_unwind_cpp_pr0(void) { - abort(); + __builtin_trap(); } void __aeabi_unwind_cpp_pr1(void) { - abort(); + __builtin_trap(); } void __aeabi_unwind_cpp_pr2(void) { - abort(); + __builtin_trap(); }