From nobody Wed Apr 27 16:54:39 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 5E2BC19980A5 for ; Wed, 27 Apr 2022 16:54:39 +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 4KpPxB6wNSz4XQZ for ; Wed, 27 Apr 2022 16:54:38 +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 CDE2E27C0D for ; Wed, 27 Apr 2022 16:54:38 +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 23RGscuX075560 for ; Wed, 27 Apr 2022 16:54:38 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from bugzilla@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 23RGscm0075559 for office@FreeBSD.org; Wed, 27 Apr 2022 16:54:38 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 16:54:39 +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=1651078479; 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=VqLpBO8SiGcrWeVCBNwVwyGUvUueNuHRZsqyQmLBcxc=; b=dBOTGRGwndqb37J9gfOFSnywD+QYlBQlubmAn5MuXlXqLM/ljxe7CXuEMNl8iwi0Phw9BY sDVmkrjshazVRo9+u4zVCqy0ZwVDxaUsAF/UPcFGrqYfhBd3gkmCiwLXynZrzuZdkr++ge FnpgZyjIBvfvs5AjXkgnKg1iIhnS5WkVI5AyA7HjzpFDDxelaTfBhkPi3GEIF9cCIG/7V6 gvmcO6u9quA0+Py6Yb1Ph6FwkdJxJx4LSE4faef7ffS3/AuIABrNY3ijNVczi21Rva5fuj KNdykpdIr0PLsxblbEYsOGTZ6U/tgnKL3grLBYEJJgdua2kHpujtActKN5B48g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651078479; a=rsa-sha256; cv=none; b=tRuyyir1XAs3jOphQ/g0RfL358Yokp4QmseI2pbpzZ52BLqLhAiWdGf88Wu1OIqBmy4oqB NfzoWJjFX6MapszobfB9+Bu+5SB801nrnpL0lvOH8XXyHWnCZ9+7CDyoAxz8FkWm6e1ziQ jbvN4Kdw+mLMG3Li9d3VrwREwxQqpyzcBZqhItnRUv4r4+NoY8QFNpnyoC5vzlTDLDxwp7 t79q1yBmHnGq/hFgzmYxFhMmqH0HP6zth0Lxc9z/+n6OUVKft4nwL0+vv0zjCYAQG5ciMx /aJ1BW+Q99ZDrW9ta6l3ah6kFztP4ghdlde7WOONDCLtB7VwxKdt0ofRDJBekQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D263596 --- Comment #2 from commit-hook@FreeBSD.org --- A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=3D35a5054819f15db65cd25a661887805= 550aedbc7 commit 35a5054819f15db65cd25a661887805550aedbc7 Author: Tijl Coosemans AuthorDate: 2022-04-27 16:51:19 +0000 Commit: Tijl Coosemans CommitDate: 2022-04-27 16:53:04 +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) 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.=