From nobody Wed Apr 27 17:05:43 2022 X-Original-To: office@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 A5EBB199A645 for ; Wed, 27 Apr 2022 17:05:43 +0000 (UTC) (envelope-from bugzilla-noreply@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 4KpQ9z3bhCz4Z3l for ; Wed, 27 Apr 2022 17:05:43 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (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 4DBA427C9A for ; Wed, 27 Apr 2022 17:05:43 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 23RH5hiQ080938 for ; Wed, 27 Apr 2022 17:05:43 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from bugzilla@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 23RH5hDN080937 for office@FreeBSD.org; Wed, 27 Apr 2022 17:05:43 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: bugzilla set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: office@FreeBSD.org Subject: [Bug 263596] editors/libreoffice: make robust against __cxa_exception ABI changes Date: Wed, 27 Apr 2022 17:05:43 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports & Packages X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Only Me X-Bugzilla-Who: commit-hook@FreeBSD.org X-Bugzilla-Status: Open X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: office@FreeBSD.org X-Bugzilla-Flags: maintainer-feedback+ X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated List-Id: Office applications on FreeBSD List-Archive: https://lists.freebsd.org/archives/freebsd-office List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-office@freebsd.org MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651079143; 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: in-reply-to:in-reply-to:references:references; bh=IZ6SFrJcflHOzM7FLW4LkQhUFvnUuuehnKBYPDZxDEg=; b=fRKN8Zjb/V46T9j/IkjC0BoqI0RLwvtebYWCgXGBy0qvoMWY3u0SpGxXX+rjoL7yuQInGI 6XLm+lPuvwBFuevl4OBZDDcw7apDvOyD8rRB7lhcVZ3ug9Jyc9nKlbf/7uVVDevqP/ba1X TB+mORN5m4pPxD2u4MtJRIbu6J8ln3YYO2pObZfdDR4JLyzbSbdM5oWVw2nB+Gu4QXmfqL a291vUakBgbiVdOIv0D/m0xuVcon62PpZHoR4AJRA5wIZkGsRDs0X1tUkL3MmToytxSaFr CA9EanNoWYKpWk12+ULkEedqp6ebPXCSKff7XsEdbghwPYAhFEn54cgx6TO57w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651079143; a=rsa-sha256; cv=none; b=IzIs8+Trdi0NOO4p3Hhxpf3sL8FPPJBo7iav1i8pfn2oSWguo7iZhgr0kXLvFedY/QuiFs wwYjyJR4w4oV3DT6kNXjYRGdPAj6hjM1sm64CyWW+6fh5tzYqKJOCey28qfhMr+YxObhtW EfDUS3G9FNrG/mApQzLcYc0Va002VCY287ip/cfsWNJrgxx4WdhOwqOGxRl7qplzeAZLXk 0Mfxtd6KOq+yDaP/ZGEnNe9+WRHCfmIW3Dyv+8G8JyO+y47rDekKULD1xqz01m2JUJVN04 B9oFBe1jZbCmO9ni+MSqRExENImdrAmishOdY7O+zLWsMUBGZ1F4RQPBL+YFRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D263596 --- Comment #3 from commit-hook@FreeBSD.org --- A commit in branch 2022Q2 references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=3Dbd9f0cee99a8822c19b155fd7c05bdf= b5bce3c9d commit bd9f0cee99a8822c19b155fd7c05bdfb5bce3c9d Author: Tijl Coosemans AuthorDate: 2022-04-27 16:51:19 +0000 Commit: Tijl Coosemans CommitDate: 2022-04-27 17:01:40 +0000 editors/libreoffice: make robust against __cxa_exception ABI changes Patch libreoffice to replace __cxa_get_globals()->caughtExceptions, which is a pointer to the start of a struct __cxa_exception, with __cxa_current_primary_exception(), which is a pointer to the end. This allows struct __cxa_exception to be extended at the start as was recently done in FreeBSD main and stable/13 on 64-bit architectures. Recently on FreeBSD main and stable/13 __attribute__((__aligned__)) was added to struct _Unwind_Exception which changes its size on 32-bit architectures, and that of __cxa_exception as well. Patch libreoffice to detect this so packages built on 13.0 still work on 13.1. Change the LIB_DEPENDS on libunwind to a BUILD_DEPENDS because we only need unwind.h (for FreeBSD 13.0 and older where that header is hidden in /usr/include/c++/v1). PR: 263596 Approved by: office (fluffy) (cherry picked from commit 35a5054819f15db65cd25a661887805550aedbc7) editors/libreoffice/Makefile | 12 +--- ...ce_cpp__uno_gcc3__linux__aarch64_abi.cxx (gone) | 11 ---- ...cpp__uno_gcc3__linux__aarch64_uno2cpp.cxx (new) | 25 ++++++++ ...s_source_cpp__uno_gcc3__linux__intel_except.cxx | 60 ++++++++++++++++-- ..._source_cpp__uno_gcc3__linux__x86-64_except.cxx | 46 +++++++++++--- ...es-source-cpp_uno-gcc3_linux_powerpc-except.cxx | 74 ++++++++++++++----= ---- ...-source-cpp_uno-gcc3_linux_powerpc64-except.cxx | 52 ++++++++------- 7 files changed, 197 insertions(+), 83 deletions(-) --=20 You are receiving this mail because: You are the assignee for the bug.=