From nobody Tue Oct 29 21:04:14 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 4XdN6R0FFHz5bvcf; Tue, 29 Oct 2024 21:04:15 +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 4XdN6Q6r3Rz4W06; Tue, 29 Oct 2024 21:04:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730235855; 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=GAuRNQXrlcksx253HCpgl0tGShv4QEDNgGwbWXMJ+qQ=; b=Uf672I3zHpr7gl7qE/kl2aF5eT1NHpJ0alqT+18UikyU5H1N4Ob121ry9y6noZ0pHRWOV+ mlW5o6ZolQeKXRh9af60B6VJf9TqA+CrYCcl5jNvw9oLfnjGV36uu7xAY/T7AdJ4o2bsGR qmO6+Vn5E0r+G4LGiYF9pMJpZYKAXs16XRkV6Rp5lIrdwEoD9xbUkvk9A05XqAFfSL6xe5 t3k9Qu9ozyRVG0f9AdYQKoWz4oOXMxxNaAugu8cIwKp2RF6IRgucew4WGCOF2ECkF4zI+B /jVzNyEcaHiK7KKjkjDEs0fM1kQg+SWSPMocUdWzPzb92jj3XgllTZAuUduXaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730235855; 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=GAuRNQXrlcksx253HCpgl0tGShv4QEDNgGwbWXMJ+qQ=; b=DMKbnkuy0Lsuvqj3JH3vJKAypWlOHkKrP69P5Q5ngAwGMeDeIUBkFt0Nw/Mlg9/gCjKeBn Ejf/SEx6GY3s5Bz6/+/gNQZ8xkeqHtBM7NCSxkYGcEHD6LkGcRJgMVvniDpu3qgmGccZeO 97DFI4EZl/LJVh6hJ2XNoYp/7vk5kUtw1GipkBljrmhfPHrUF8IEdg9ktz/qloepiWgXzO 0AL5PY1wKJzomOv/QZEmOiQntu44Hpdj8+eZqzE27r9t9JCSaUuvQaIW3YLqJYPyOEUHMC GY3mlH/+3AlNQ9IMLFnnjXElvJ5SDeTJdUu1x19+kI3DpuLaaMDXsue8oIwmJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730235855; a=rsa-sha256; cv=none; b=d8FnplNTJjBtJrYoM5tFKfortrGTltD4KELavmqZbVkMQh0IU/r6OmSZvedHvzeJeNlTIK 3j9uoMZZLJuoW9ofobyOk2mS/sRfC0yUAcnZyam/Yc4LRkqRzmAPIayFKV6mgv3R7xbzvV BWJBfzN9verQVTi/SE1alBHJZA7jSAZ+hWJang4MAYsi3H2mQIiPR/r4mpIc0eoCgQH2pd Y27qWivyvN5G02okMxLinmN/u2sVYL/UxeAdkY4v8pUU++0FYGGOs9GqeqcswTZREsyW6R 7XVhPgrVWNyjNzM9OW3xMC6OwLL4KS1tCEkhGT4Y3WD+7zx0es4zwyptMrkkkg== 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 4XdN6Q6JX2zfT6; Tue, 29 Oct 2024 21:04:14 +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 49TL4EA1078926; Tue, 29 Oct 2024 21:04:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49TL4EEQ078923; Tue, 29 Oct 2024 21:04:14 GMT (envelope-from git) Date: Tue, 29 Oct 2024 21:04:14 GMT Message-Id: <202410292104.49TL4EEQ078923@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: a1269171d71f - stable/14 - 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a1269171d71f6e03014f13ba52d4e86b6e8782a2 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a1269171d71f6e03014f13ba52d4e86b6e8782a2 commit a1269171d71f6e03014f13ba52d4e86b6e8782a2 Author: John Baldwin AuthorDate: 2024-08-21 17:37:48 +0000 Commit: Ed Maste CommitDate: 2024-10-29 20:34:21 +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++" {