From nobody Mon Aug 15 01:05:30 2022 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 4M5bgH1lSlz4ZRHR; Mon, 15 Aug 2022 01:05:31 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M5bgH1G0Dz4JFd; Mon, 15 Aug 2022 01:05:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660525531; 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=T5I9KjSXo5EBekAnqz3zuTBQcfplKJSwSK3donROyeU=; b=FNGrGI9BCie7Q4pS8Zs6gBT6czqzT0msq1x6WqaFhzVX6A5Ji+YY6QcRiuLhwIGpJWaHfk I73kY32N5RWFBiV1O4awJsWSMr31jn2g1/anNc2NHxGTA5jJYUfLgyy8sKDQJwz8vtYCBy kA7vID9OQnzKRPqtVKgBn52UkWEvn3TfgaF+C4SoOpgEDhX0l6q17LWkxE+m86/7lYZ+zo wZvsWhtwALMuMElMds6BEJpgdFZU5TmZC1al2kNZlIZxjqO9lKatApc2if88z7cfS+UWW3 an9ikJ5e3c8MjuJehslq5E2Fm0ZBIr1A5ZLsSYXEBaBg2ojhroBUjb1gyb2Cww== 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 4M5bgH0CVZz19kZ; Mon, 15 Aug 2022 01:05:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27F15Urj021085; Mon, 15 Aug 2022 01:05:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27F15Uid021084; Mon, 15 Aug 2022 01:05:30 GMT (envelope-from git) Date: Mon, 15 Aug 2022 01:05:30 GMT Message-Id: <202208150105.27F15Uid021084@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 787be9e9c32a - stable/13 - Merge libcxxrt commit 5d8a15823a103bbc27f1bfdcf2b5aa008fab57dd 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 787be9e9c32a3cf6e9999f175555bbdcb31f61f2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660525531; 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=T5I9KjSXo5EBekAnqz3zuTBQcfplKJSwSK3donROyeU=; b=ylsiSY8YL59zSzFIna/oyc+WuleZgcenWXbqrA6HN1bq+77WuEE1V89KDLtKjI0+/Qgre6 Z+3XYQBSaICz0NbWFLBmJPG3GhuS2Jn60jDhKN766RAHF4gATGxdu6SU2vr4qyqf6Bcy/P GzjntHJZN6dJF5qvnGxIRQpDlK+G/2SpKRtfVEllyT9xUKW6uGe8693wr0y+TS5V1Vvh1H tKSolNOFjTQynYpmuFwCAdvq8CJ9cJXibMbAqYaBldZi9Pj+6smkmtoSnEnNGMW6ZRlaJN gVSDoY+PaDxjt7gquFt+lTu6etXIYkNUUhxOkc6SyiFQ44yZAYR4WDNspXOkRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660525531; a=rsa-sha256; cv=none; b=HwwIaBYJTKbt7mfeA1Hl4FmYPXnTZhxgH8oZktzSkrYaxyT+X2d5fONWZoVOW00sKPzV5r Virtx7+enoyMyqbE+37vQKZmJyEngQBLinbvWIBTHrRRcWOaJJy0jPXLVm3vnP0lcT5aw9 1CSVG9CZEzG0q5vnbo5LBbbUbxjIvqXXwMDcXLuAjPriIP89rfoLUMhkwxchhr2goBSWNI SmmCrR6uR0LwJIepyHSrsy9TNS+9j4IDHIYjrQwU6vBO1/b0FPQZ5lpqvNvcT/2m42iSfl sJn4Au6u01gMUQw5Z6aDs+X+oNmM61n3gr5VOwI+5PvsWcpBgKCtXU7EShWTxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=787be9e9c32a3cf6e9999f175555bbdcb31f61f2 commit 787be9e9c32a3cf6e9999f175555bbdcb31f61f2 Author: Mark Johnston AuthorDate: 2022-08-08 16:30:56 +0000 Commit: Mark Johnston CommitDate: 2022-08-15 01:04:23 +0000 Merge libcxxrt commit 5d8a15823a103bbc27f1bfdcf2b5aa008fab57dd Fix two bugs in __cxa_end_cleanup() Per the EHABI32 specification, __cxa_end_cleanup must take care to preserve registers before calling _Unwind_Resume(). So, libcxxrt uses an assembly stub which preserves caller-saved registers around the call to __cxa_get_cleanup(). But: - it failed to restore them properly, - it did not preserve the link register. Fix both of these problems. This is needed to fix exception unwinding on FreeBSD with LLVM 14. Note that r4 is callee-saved but is pushed onto the stack to preserve stack pointer alignment. Sponsored-by: The FreeBSD Foundation (cherry picked from commit cbd1e83154af8bae3daa3919bb2746d587436515) --- contrib/libcxxrt/exception.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/libcxxrt/exception.cc b/contrib/libcxxrt/exception.cc index f28082ab7e80..6c5196876b10 100644 --- a/contrib/libcxxrt/exception.cc +++ b/contrib/libcxxrt/exception.cc @@ -1577,8 +1577,10 @@ asm ( ".type __cxa_end_cleanup, \"function\" \n" "__cxa_end_cleanup: \n" " push {r1, r2, r3, r4} \n" +" mov r4, lr \n" " bl __cxa_get_cleanup \n" -" push {r1, r2, r3, r4} \n" +" mov lr, r4 \n" +" pop {r1, r2, r3, r4} \n" " b _Unwind_Resume \n" " bl abort \n" ".popsection \n"