From 544652338ab6867405c9f14ee345ec39530ab93f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 19 Aug 2021 21:39:49 +0100 Subject: [PATCH] add fix for arm uno bridge --- ...was-already-the-right-amount-of-byte.patch | 35 +++++++++++++++++++ libreoffice.spec | 1 + 2 files changed, 36 insertions(+) create mode 100644 0001-arm-nStackBytes-was-already-the-right-amount-of-byte.patch diff --git a/0001-arm-nStackBytes-was-already-the-right-amount-of-byte.patch b/0001-arm-nStackBytes-was-already-the-right-amount-of-byte.patch new file mode 100644 index 0000000..d0f2881 --- /dev/null +++ b/0001-arm-nStackBytes-was-already-the-right-amount-of-byte.patch @@ -0,0 +1,35 @@ +From ed428ddfef87a5641598a017e8781f107f3f3c27 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Thu, 19 Aug 2021 16:15:13 +0100 +Subject: [PATCH] arm: nStackBytes was already the right amount of bytes + +possible regression from... + +commit 6e3424ca1131fe371f63e456267de476b5eb0eae +Date: Sat Jan 2 11:03:12 2021 +0100 + + Fix some warnings for Raspberry pi 4 (part2) + +which changed that + +Change-Id: I9a19d7d6bc1e4115ffffbe32d8d62be5d275d500 +--- + bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx +index 8533415ed087..7a8adad90ead 100644 +--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx ++++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx +@@ -251,7 +251,7 @@ void callVirtualMethod( + { + // 8-bytes aligned + sal_uInt32 nStackBytes = ( ( nStack + 1 ) >> 1 ) * 8; +- sal_uInt32 *stack = static_cast(__builtin_alloca( nStackBytes * sizeof(sal_uInt32))); ++ sal_uInt32 *stack = static_cast(__builtin_alloca( nStackBytes )); + memcpy( stack, pStack, nStackBytes ); + } + +-- +2.31.1 + diff --git a/libreoffice.spec b/libreoffice.spec index 22d1ed2..d765b04 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -252,6 +252,7 @@ Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch Patch3: 0001-make-with-idlc-cpp-cpp-work-for-gcc-cpp-as-a-ucpp-re.patch Patch4: 0001-Resolves-tdf-132739-two-style-tags-where-there-shoul.patch Patch5: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch +Patch6: 0001-arm-nStackBytes-was-already-the-right-amount-of-byte.patch # not upstreamed Patch500: 0001-disable-libe-book-support.patch