Attachment 159445 Details for Bug 131998 – patch

[patch] patch

libreoffice.patch (text/plain), 1.99 KB, created by Mikael Urankar on 2020-04-09 11:43:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikael Urankar

Created: 2020-04-09 11:43:02 UTC

Size: 1.99 KB

patch

obsolete

>diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx
>index f9396321cb14..6114dd96702d 100644
>--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx
>+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx
>@@ -322,9 +322,16 @@ extern "C" void vtableSlotCall(
>     double fpr2, double fpr3, double fpr4, double fpr5, double fpr6,
>     double fpr7, ...)
> {
>-    register void * volatile indirectRet asm ("x8");
>-    register sal_Int32 volatile functionIndex asm ("x9");
>-    register sal_Int32 volatile vtableOffset asm ("x10");
>+    void * volatile indirectRet;
>+    sal_Int32 volatile functionIndex, vtableOffset;
>+ 
>+    asm volatile(
>+        "mov %0, x8\n\t"
>+        "mov %0, x9\n\t"
>+        "mov %0, x10\n\t"
>+        : "=r" (indirectRet), "=r" (functionIndex), "=r" (vtableOffset)
>+        ::);
>+
>     va_list ap;
>     va_start(ap, fpr7);
>     assert(sizeof (va_list) == sizeof (aarch64_va_list));
>diff --git a/configure.ac b/configure.ac
>index 5447d184fc3f..6fa6ef5ada34 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -4327,6 +4327,11 @@ freebsd*)
>     P_SEP=:
> 
>     case "$host_cpu" in
>+    aarch64)
>+        CPUNAME=AARCH64
>+        PLATFORMID=freebsd_aarch64
>+        RTL_ARCH=AARCH64
>+        ;;
>     i*86)
>         CPUNAME=INTEL
>         RTL_ARCH=x86
>diff --git a/solenv/gbuild/platform/FREEBSD_AARCH64_GCC.mk b/solenv/gbuild/platform/FREEBSD_AARCH64_GCC.mk
>new file mode 100644
>index 000000000000..6199f17b3015
>--- /dev/null
>+++ b/solenv/gbuild/platform/FREEBSD_AARCH64_GCC.mk
>@@ -0,0 +1,14 @@
>+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
>+#
>+# This file is part of the LibreOffice project.
>+#
>+# This Source Code Form is subject to the terms of the Mozilla Public
>+# License, v. 2.0. If a copy of the MPL was not distributed with this
>+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
>+#
>+
>+#please make generic modifications to unxgcc.mk
>+
>+include $(GBUILDDIR)/platform/unxgcc.mk
>+
>+# vim: set noet sw=4:

Actions: View

Attachments on bug 131998: 159445