From nobody Sun May 01 08:43:10 2022 X-Original-To: dev-commits-ports-main@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 002DD1AC3FCD; Sun, 1 May 2022 08:43:11 +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 4KrfrG6Wqwz4qlc; Sun, 1 May 2022 08:43:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651394590; 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=aALizyrKIRhS67k4UOW1sGV8q8r2txrf0N6nSoAF04A=; b=ZFWhDLhKiBHDTBVyhjVqJ+j5jX4mK6MhVhl/+/crLNYb+jptEjdDylpRo6Ng+R0AblWHJv X9pgjj2F0xUf5oDfRsXQ+mdWlUNBBh0HSA5XVW67+QNvPIu9DlqIOcoh62FT1heW4mUs7T 2nib1IJpPQfgjFuuTT/wMM020wiC81HcuSemyV/jic25c8VAg+SfTB+lFujGz0aFB73Gbv hirW03RJai7llu7HcdzzY6p+Zjo3agfPh778AwOVAO0ePDv7MKtU7q4fcke1mV+TZ86fs4 8vyBbi3oziBC35P6Vlis3fbQ3ovjB2ecZwXNJ3LEuy54J0mpf2A2HP90rKkq0w== 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 C0EFC12554; Sun, 1 May 2022 08:43:10 +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 2418hASv060141; Sun, 1 May 2022 08:43:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2418hAqm060140; Sun, 1 May 2022 08:43:10 GMT (envelope-from git) Date: Sun, 1 May 2022 08:43:10 GMT Message-Id: <202205010843.2418hAqm060140@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tijl Coosemans Subject: git: ca1c4839224a - main - editors/libreoffice: fix i386/powerpc libcxxrt ABI change detection List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tijl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca1c4839224a639c0ddd602a21b942efa4ca0952 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651394590; 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=aALizyrKIRhS67k4UOW1sGV8q8r2txrf0N6nSoAF04A=; b=iOc8qtcAAV7oUYEJQKutVQJ8C6VvjRCp9LpPOcAyE+WXobWXwH4MxAqpMDyIyfs/DsK3TM zl8aw2WFoSYOByvCd1IN/R+S1bhTz6hB8wTuBjYLCuDLszmAMduvWowgS2W9NivLTAjEm8 wKLrvhFEcskZlxTHfH19P1Gbx13de7ot+CNlssNk3/0wWoagVR9pUSyqYlOlHrkdlcFjGf pIN56UVCgol8p2vhQ5PRYrTrcDXYViqKED2Nu228PDxgfkdVRov6fgF5lR7uasT/Q5/e6A euNmlQxig2pfPAeVLvaQwcaSwmR5Iax+Nj69OgD4VZdsprVc6hfW7V9GegfVzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651394590; a=rsa-sha256; cv=none; b=BSRAGmFLnBT8JGA7y1vlK6KZnHj1WYPJeWgMwTOGm4lIjs1DB95BGfaB6M0xROB0JXDFcw gViqFVvkSboQ/vbuZZyn6j4vnlXrHJpq9hH0Ht3hWZp7PbtoFsi3uh44SApx2eUdjh7y7d Cw9j6qb4+gQk6br1+3DPugkpwbhLuST/78LiGagGWn4HV+1fYKFsVQW0NB/Hkd2gHEVPXO h+7KU8mzne+vgPdAO5uB7FE01m7IS6JLN+xRiusdNtZaAfcmY9UeUZKkB2kMJkXfdXmzPQ ZbI/xBw/4blPa5R8bO9ZSHDk+IcFryyl4d5HELkYeGjb5ietmXLbNxjDoGEKfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tijl: URL: https://cgit.FreeBSD.org/ports/commit/?id=ca1c4839224a639c0ddd602a21b942efa4ca0952 commit ca1c4839224a639c0ddd602a21b942efa4ca0952 Author: Tijl Coosemans AuthorDate: 2022-04-30 17:03:16 +0000 Commit: Tijl Coosemans CommitDate: 2022-05-01 08:27:53 +0000 editors/libreoffice: fix i386/powerpc libcxxrt ABI change detection This makes the bundled bridgetest_server/bridgetest_client working. Recently the size of struct __cxa_exception changed on 32 bit architectures. A patch committed in 35a5054819f1 lets libreoffice detect this by comparing a field of the struct against a known value. In the bridgetest it turns out this value isn't always the same, so use a different field instead. PR: 263596 --- editors/libreoffice/Makefile | 2 +- ...h-bridges_source_cpp__uno_gcc3__linux__intel_except.cxx | 14 +++++++++----- ...ch-bridges-source-cpp_uno-gcc3_linux_powerpc-except.cxx | 10 +++++++--- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index d55af9c4a08f..1b7db73f0279 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 4 +PORTREVISION= 5 .include "${.CURDIR}/Makefile.common" diff --git a/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__intel_except.cxx b/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__intel_except.cxx index 439b9ea3adf4..ad195a344ce0 100644 --- a/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__intel_except.cxx +++ b/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__intel_except.cxx @@ -18,7 +18,7 @@ ::typelib_typedescription_getByName( &pTD, unoName.pData ); assert(pTD && "### unknown exception type! leaving out destruction => leaking!!!"); if (pTD) -@@ -262,8 +268,19 @@ void fillUnoException(uno_Any * pUnoExc, uno_Mapping * +@@ -262,8 +268,23 @@ void fillUnoException(uno_Any * pUnoExc, uno_Mapping * void fillUnoException(uno_Any * pUnoExc, uno_Mapping * pCpp2Uno) { @@ -29,10 +29,14 @@ + __cxxabiv1::__cxa_current_primary_exception()); + if (header) { + __cxxabiv1::__cxa_decrement_exception_refcount(header); -+ if (header[-1].exceptionDestructor != &deleteException) { ++ uint64_t exc_class = header[-1].unwindHeader.exception_class ++ & 0xffffffffffffff00; ++ if (exc_class != /* "GNUCC++" */ 0x474e5543432b2b00) { + header = reinterpret_cast<__cxxabiv1::__cxa_exception *>( + reinterpret_cast(header) - 12); -+ if (header[-1].exceptionDestructor != &deleteException) { ++ exc_class = header[-1].unwindHeader.exception_class ++ & 0xffffffffffffff00; ++ if (exc_class != /* "GNUCC++" */ 0x474e5543432b2b00) { + header = nullptr; + } + } @@ -40,7 +44,7 @@ if (! header) { RuntimeException aRE( "no exception header!" ); -@@ -273,7 +290,7 @@ void fillUnoException(uno_Any * pUnoExc, uno_Mapping * +@@ -273,7 +294,7 @@ void fillUnoException(uno_Any * pUnoExc, uno_Mapping * return; } @@ -49,7 +53,7 @@ typelib_TypeDescription * pExcTypeDescr = nullptr; OUString unoName( toUNOname( exceptionType->name() ) ); -@@ -292,7 +309,7 @@ void fillUnoException(uno_Any * pUnoExc, uno_Mapping * +@@ -292,7 +313,7 @@ void fillUnoException(uno_Any * pUnoExc, uno_Mapping * else { // construct uno exception any diff --git a/editors/libreoffice/files/powerpc64/patch-bridges-source-cpp_uno-gcc3_linux_powerpc-except.cxx b/editors/libreoffice/files/powerpc64/patch-bridges-source-cpp_uno-gcc3_linux_powerpc-except.cxx index c656588cb0a5..4c6e5f0a6941 100644 --- a/editors/libreoffice/files/powerpc64/patch-bridges-source-cpp_uno-gcc3_linux_powerpc-except.cxx +++ b/editors/libreoffice/files/powerpc64/patch-bridges-source-cpp_uno-gcc3_linux_powerpc-except.cxx @@ -48,7 +48,7 @@ ::typelib_typedescription_getByName( &pTD, unoName.pData ); assert(pTD && "### unknown exception type! leaving out destruction => leaking!!!"); if (pTD) -@@ -218,39 +225,68 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * +@@ -218,39 +225,72 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * if (! pTypeDescr) terminate(); @@ -86,10 +86,14 @@ + __cxxabiv1::__cxa_current_primary_exception()); + if (header) { + __cxxabiv1::__cxa_decrement_exception_refcount(header); -+ if (header[-1].exceptionDestructor != &deleteException) { ++ uint64_t exc_class = header[-1].unwindHeader.exception_class ++ & 0xffffffffffffff00; ++ if (exc_class != /* "GNUCC++" */ 0x474e5543432b2b00) { + header = reinterpret_cast<__cxxabiv1::__cxa_exception *>( + reinterpret_cast(header) - 12); -+ if (header[-1].exceptionDestructor != &deleteException) { ++ exc_class = header[-1].unwindHeader.exception_class ++ & 0xffffffffffffff00; ++ if (exc_class != /* "GNUCC++" */ 0x474e5543432b2b00) { + header = nullptr; + } + }