From nobody Sat Nov 30 20:12:47 2024 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 4Y11SJ2L8Bz5fbd0; Sat, 30 Nov 2024 20:12:48 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y11SH5vSLz4TQr; Sat, 30 Nov 2024 20:12:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732997567; 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=9Gbdrt0sL6ccNdDK1ZqWc3XPGl27YJMLFTfwxan0goU=; b=PEtyWdZLPizOZeDPFeF6yxaBFjiZlvUqX/SEBFYNCUpRneAuh3204ZektBP9tySX2EL0AS /rE9bzTFZpmal12NEeqmMJ1tSsF00bHGuEvnqrroNaYo7cPGfAGtJOI2MVcGVUOdyNdFWd k1o28in5ssheEZlYfifjrVqfBYIloTIJOgaS/cqTcc+uGW0iLfnJhvM5qaiO+6RK+hqenV BWgilbF247Ev0Sy4qnlofhy10SklUYwoqdDLdyhkINF1JWWEATbiuKgV2p5t+V6sdz/boB xdHKGSzxeifIHGVAHG2rrtjuxFQNoCKETNR6wi/8v3uUGrBTp4tje8pLlHQ8Zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732997567; 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=9Gbdrt0sL6ccNdDK1ZqWc3XPGl27YJMLFTfwxan0goU=; b=cLZ6l8qtJENm3ffE4EbJuxnZZiP8T4srJFvTAPIW6oHAThHOapGMccdXAnE5F3eLQq8q95 HjsmP0uwMWQuIkBbOrFRlyN2FjcNK3C0sY5pvTUEBoV0L7wP8KYM7IwDB1lXxgzvcbQTXA mEAt4ksXRJMDK4f6XVW0eXMkMOnJ8BqNiEGrIQ7NwJ9lvFdq6EayE/Y38xRU7aE+jEEc4+ 09wS/2gQw0BuX6A6lRVvkKQZHnSo4lEt6l7vVzQkNh6BjopehMY94y/B/wQ+sQaENI+0wv DOPzbHZzLbIzuP5NDSw06wgTD8P1Z0zPH68MTjo0Y3k0ozBO4GjXgmtLp8wrPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732997567; a=rsa-sha256; cv=none; b=I34j1fwsAc/kqC/au8sxMpGvz9Iueza3axPJbeAhPQvbyeyUDXWrGWf08eQMfZ26Fg87dv LeJ7NSr5pUW+LPaawz4TPcY41DZ+4Ik0G7C7Dum/L1fGi7tTkV/d/sFRVYvRN8wYoI5Kkm Po7VOnZVGPu/6qLlJ0eBnkOczpd/lUnSPI3TsM2kEItQnXGb1AmrsYTp+ii9Ut6cT7VFgH EWJHhJQMeIxY2bj5nlRFwA7v4aWhf+ac/AwLNESx7LqLEoiF5R0aZIWdrfi1Wse8RjMqtN cQWHkQKkVz+5iOd7kGNly7BQeBvgx2nL+zIV+bL7Xm4CK04IfVh5KovYcdf4OA== 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 4Y11SH5T9FzMYn; Sat, 30 Nov 2024 20:12:47 +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 4AUKClCP026638; Sat, 30 Nov 2024 20:12:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AUKCl2B026635; Sat, 30 Nov 2024 20:12:47 GMT (envelope-from git) Date: Sat, 30 Nov 2024 20:12:47 GMT Message-Id: <202411302012.4AUKCl2B026635@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 6b5a9d287d03 - stable/13 - libcxxrt: Add a stub implementation of __cxa_call_terminate 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/13 X-Git-Reftype: branch X-Git-Commit: 6b5a9d287d03fde3801afa9809b0a9640ec6bf89 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6b5a9d287d03fde3801afa9809b0a9640ec6bf89 commit 6b5a9d287d03fde3801afa9809b0a9640ec6bf89 Author: John Baldwin AuthorDate: 2024-08-21 17:37:48 +0000 Commit: John Baldwin CommitDate: 2024-11-30 19:53:22 +0000 libcxxrt: Add a stub implementation of __cxa_call_terminate This function is called by GCC 14 if a destructor invoked during exception unwinding throws an exception. Reviewed by: emaste Obtained from: libcxxrt commit 391a3dcc1054e18c2f0dff4e14d6d79ac95399d7 Differential Revision: https://reviews.freebsd.org/D46004 (cherry picked from commit 297a9e552b9a5adf07d195eae9649b0758f395af) --- contrib/libcxxrt/exception.cc | 13 +++++++++++++ lib/libcxxrt/Version.map | 4 ++++ 2 files changed, 17 insertions(+) diff --git a/contrib/libcxxrt/exception.cc b/contrib/libcxxrt/exception.cc index 35ff997dd445..b56333e979a2 100644 --- a/contrib/libcxxrt/exception.cc +++ b/contrib/libcxxrt/exception.cc @@ -1433,6 +1433,19 @@ extern "C" void __cxa_call_unexpected(void*exception) abort(); } +/** + * ABI function, called when an object destructor exits due to an + * exception during stack unwinding. + * + * This function does not return. + */ +extern "C" void __cxa_call_terminate(void *exception) throw() +{ + std::terminate(); + // Should not be reached. + abort(); +} + /** * ABI function, returns the adjusted pointer to the exception object. */ diff --git a/lib/libcxxrt/Version.map b/lib/libcxxrt/Version.map index a54b6a4daad5..39a54f4868a9 100644 --- a/lib/libcxxrt/Version.map +++ b/lib/libcxxrt/Version.map @@ -287,6 +287,10 @@ CXXABI_1.3.11 { __cxa_init_primary_exception; } CXXABI_1.3.9; +CXXABI_1.3.15 { + __cxa_call_terminate; +} CXXABI_1.3.11; + CXXRT_1.0 { extern "C++" {