[Libreoffice-commits] core.git: bridges/source
bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx |2 +-
bridges/source/cpp_uno/gcc3_linux_mips64/uno2cpp.cxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 1f99f4a9c816cc106bfbdf229e4ec2bffb343847
Author: Heiher
Date: Tue Jul 14 01:24:52 2015 +0800
bridges: mips64: Fix build failure in new codes.
Change-Id: I17fe0fb0ce9341a638b2687e7690777a8de7fa01
Reviewed-on: https://gerrit.libreoffice.org/16980
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx
b/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx
index 068bc55..8f510c8 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx
@@ -544,7 +544,7 @@ namespace
unsigned char * codeSnippet( unsigned char * code,
sal_Int32 functionIndex, sal_Int32 vtableOffset,
- bool bHasHiddenParam) SAL_THROW(())
+ bool bHasHiddenParam )
{
#ifdef BRDEBUG
fprintf(stderr,"in codeSnippet functionIndex is %d\n", functionIndex);
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips64/uno2cpp.cxx
b/bridges/source/cpp_uno/gcc3_linux_mips64/uno2cpp.cxx
index e7cd63f..859ffe5 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips64/uno2cpp.cxx
@@ -141,7 +141,7 @@ namespace
sal_uInt32 nREG)
{
// Should not happen, but...
-static_assert( MAX_GP_REGS == MAX_FP_REGS );
+static_assert(MAX_GP_REGS == MAX_FP_REGS, "must be the same size");
if ( nREG > MAX_GP_REGS )
nREG = MAX_GP_REGS;
@@ -266,7 +266,7 @@ namespace
// return
typelib_TypeDescription * pReturnTypeDescr = 0;
TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-assert( pReturnTypeDescr, "### expected return type description!" );
+assert(pReturnTypeDescr);
void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bridges/source
bridges/source/cpp_uno/gcc3_linux_mips64/call.s |2 ++ 1 file changed, 2 insertions(+) New commits: commit 291e760b7f1e128537cd81ae2c6674e590d4953f Author: Heiher Date: Fri Jul 10 23:48:23 2015 +0800 bridges: mips64: Update call frame information. Change-Id: I00bf0eaa69b3276b1baf18f4fa191ceaf1bc2f18 Reviewed-on: https://gerrit.libreoffice.org/16944 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/bridges/source/cpp_uno/gcc3_linux_mips64/call.s b/bridges/source/cpp_uno/gcc3_linux_mips64/call.s index 5787725..8f73a05 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips64/call.s +++ b/bridges/source/cpp_uno/gcc3_linux_mips64/call.s @@ -82,8 +82,10 @@ privateSnippetExecutor: .Lfinish: ld $ra,152($sp) +.cfi_restore 31 jr $ra daddiu $sp,$sp,160 +.cfi_def_cfa_offset 0 .set reorder .end privateSnippetExecutor ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/deployment/misc/dp_platform.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit e3974c1d4b86da4ae8ee43786c610cd71638ba53
Author: Heiher
Date: Tue Jul 7 17:00:18 2015 +0800
desktop: misc: Add support for mips64.
Change-Id: If00f4438804777a977cd058bbb09603c4ff0d31c
Reviewed-on: https://gerrit.libreoffice.org/16908
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/desktop/source/deployment/misc/dp_platform.cxx
b/desktop/source/deployment/misc/dp_platform.cxx
index 7f217f1..dd8648e 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -40,7 +40,9 @@
#define PLATFORM_LINUX_ARM_EABI "linux_arm_eabi"
#define PLATFORM_LINUX_ARM_OABI "linux_arm_oabi"
#define PLATFORM_LINUX_MIPS_EL "linux_mips_el"
+#define PLATFORM_LINUX_MIPS64_EL"linux_mips64_el"
#define PLATFORM_LINUX_MIPS_EB "linux_mips_eb"
+#define PLATFORM_LINUX_MIPS64_EB"linux_mips64_eb"
#define PLATFORM_LINUX_IA64 "linux_ia64"
#define PLATFORM_LINUX_M68K "linux_m68k"
#define PLATFORM_LINUX_S390 "linux_s390"
@@ -139,8 +141,12 @@ namespace
ret = checkOSandCPU("Linux", "ARM_OABI");
else if (token == PLATFORM_LINUX_MIPS_EL)
ret = checkOSandCPU("Linux", "MIPS_EL");
+else if (token == PLATFORM_LINUX_MIPS64_EL)
+ret = checkOSandCPU("Linux", "MIPS64_EL");
else if (token == PLATFORM_LINUX_MIPS_EB)
ret = checkOSandCPU("Linux", "MIPS_EB");
+else if (token == PLATFORM_LINUX_MIPS64_EB)
+ret = checkOSandCPU("Linux", "MIPS64_EB");
else if (token == PLATFORM_LINUX_IA64)
ret = checkOSandCPU("Linux", "IA64");
else if (token == PLATFORM_LINUX_M68K)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit af932bb3925910450c5c65c7531008ad2c404719 Author: Heiher Date: Tue Jul 7 17:00:54 2015 +0800 configure: Add support for mips64. Change-Id: If52e44a028b9cfd9ead4f16186810dde98a67ef1 Reviewed-on: https://gerrit.libreoffice.org/16912 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/configure.ac b/configure.ac index 87d9d76..7c362aa6 100644 --- a/configure.ac +++ b/configure.ac @@ -4234,16 +4234,16 @@ linux-gnu*) PLATFORMID=linux_mips_eb ;; mips64) -CPUNAME=GODSON -RTL_ARCH=MIPS_EB +CPUNAME=GODSON64 +RTL_ARCH=MIPS64_EB EPM_FLAGS="-a mips64" -PLATFORMID=linux_mips_eb +PLATFORMID=linux_mips64_eb ;; mips64el) -CPUNAME=GODSON -RTL_ARCH=MIPS_EL +CPUNAME=GODSON64 +RTL_ARCH=MIPS64_EL EPM_FLAGS="-a mips64el" -PLATFORMID=linux_mips_el +PLATFORMID=linux_mips64_el ;; mipsel) CPUNAME=GODSON ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/test
desktop/test/deployment/update/platform/linux_mips64_eb.oxt |binary desktop/test/deployment/update/platform/linux_mips64_el.oxt |binary desktop/test/deployment/update/platform/readme.txt |2 ++ 3 files changed, 2 insertions(+) New commits: commit 618198222a66306028834d3f6e898f73368bc103 Author: Heiher Date: Tue Jul 7 17:00:34 2015 +0800 desktop: update: Add support for mips64. Change-Id: I48c6d717e30491171936e34210e8c60b1c7f9487 Reviewed-on: https://gerrit.libreoffice.org/16909 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/desktop/test/deployment/update/platform/linux_mips64_eb.oxt b/desktop/test/deployment/update/platform/linux_mips64_eb.oxt new file mode 100644 index 000..5441216 Binary files /dev/null and b/desktop/test/deployment/update/platform/linux_mips64_eb.oxt differ diff --git a/desktop/test/deployment/update/platform/linux_mips64_el.oxt b/desktop/test/deployment/update/platform/linux_mips64_el.oxt new file mode 100644 index 000..1749909 Binary files /dev/null and b/desktop/test/deployment/update/platform/linux_mips64_el.oxt differ diff --git a/desktop/test/deployment/update/platform/readme.txt b/desktop/test/deployment/update/platform/readme.txt index 2ab102a..30c028f 100644 --- a/desktop/test/deployment/update/platform/readme.txt +++ b/desktop/test/deployment/update/platform/readme.txt @@ -7,7 +7,9 @@ linux_arm_eabi.oxt: linux_arm_eabi linux_arm_oabi.oxt: linux_arm_oabi linux_ia64.oxt: linux_ia64 linux_mips_eb.oxt: linux_mips_eb +linux_mips64_eb.oxt: linux_mips64_eb linux_mips_el.oxt: linux_mips_el +linux_mips64_el.oxt: linux_mips64_el linux_powerpc64.oxt: linux_powerpc64 linux_powerpc.oxt: linux_powerpc linux_s390.oxt: linux_s390 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: jvmfwk/inc jvmfwk/plugins
jvmfwk/inc/vendorbase.hxx| 10 -- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx |2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) New commits: commit 0f6edce22b0424d99342b73adafcaf688f044139 Author: Heiher Date: Tue Jul 7 17:49:01 2015 +0800 jvmfwk: pluginlib: Add support for mips64. Change-Id: I525266468ae2ef04976d7835cc22c930293a0dc3 Reviewed-on: https://gerrit.libreoffice.org/16911 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/jvmfwk/inc/vendorbase.hxx b/jvmfwk/inc/vendorbase.hxx index a01db56..7dc32cd 100644 --- a/jvmfwk/inc/vendorbase.hxx +++ b/jvmfwk/inc/vendorbase.hxx @@ -55,6 +55,12 @@ namespace jfw_plugin OpenJDK at least, but probably not true for Lemotes JDK */ # define JFW_PLUGIN_ARCH "mipsel" #endif +#elif defined MIPS64 +#ifdef OSL_BIGENDIAN +# define JFW_PLUGIN_ARCH "mips64" +#else +# define JFW_PLUGIN_ARCH "mips64el" +#endif #elif defined S390X #define JFW_PLUGIN_ARCH "s390x" #elif defined S390 @@ -71,9 +77,9 @@ OpenJDK at least, but probably not true for Lemotes JDK */ #define JFW_PLUGIN_ARCH "alpha" #elif defined AARCH64 #define JFW_PLUGIN_ARCH "aarch64" -#else // SPARC, INTEL, POWERPC, MIPS, ARM, IA64, M68K, HPPA, ALPHA +#else // SPARC, INTEL, POWERPC, MIPS, MIPS64, ARM, IA64, M68K, HPPA, ALPHA #error unknown platform -#endif // SPARC, INTEL, POWERPC, MIPS, ARM, IA64, M68K, HPPA, ALPHA +#endif // SPARC, INTEL, POWERPC, MIPS, MIPS64, ARM, IA64, M68K, HPPA, ALPHA class MalformedVersionException diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx index 07ec21e..9abc978 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx @@ -53,6 +53,8 @@ char const* const* GnuInfo::getJavaExePaths(int * size) #if defined(MIPS) && defined(OSL_LITENDIAN) #define GCJ_JFW_PLUGIN_ARCH "mipsel" +#elif defined(MIPS64) && defined(OSL_LITENDIAN) +#define GCJ_JFW_PLUGIN_ARCH "mips64el" #else #define GCJ_JFW_PLUGIN_ARCH JFW_PLUGIN_ARCH #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/platform/LINUX_GODSON64_GCC.mk | 16 1 file changed, 16 insertions(+) New commits: commit 14a1d4f12f6974cfcf014324a3127113b9f79d87 Author: Heiher Date: Tue Jul 7 17:47:19 2015 +0800 solenv: platform: Add support for GODSON64. Change-Id: Ifbdc6932a16b55adf6d4c9092cf8045b0b035f24 Reviewed-on: https://gerrit.libreoffice.org/16910 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/solenv/gbuild/platform/LINUX_GODSON64_GCC.mk b/solenv/gbuild/platform/LINUX_GODSON64_GCC.mk new file mode 100644 index 000..c2fe758 --- /dev/null +++ b/solenv/gbuild/platform/LINUX_GODSON64_GCC.mk @@ -0,0 +1,16 @@ +# -*- 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 or linux.mk +gb_CPUDEFS += -DMIPS64 +gb_COMPILERDEFAULTOPTFLAGS := -Os + +include $(GBUILDDIR)/platform/linux.mk + +# vim: set noet sw=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bridges/Library_cpp_uno.mk bridges/source
bridges/Library_cpp_uno.mk |9
bridges/source/cpp_uno/gcc3_linux_mips64/call.hxx| 38 +
bridges/source/cpp_uno/gcc3_linux_mips64/call.s | 132 +++
bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx | 707 +++
bridges/source/cpp_uno/gcc3_linux_mips64/except.cxx | 300
bridges/source/cpp_uno/gcc3_linux_mips64/share.hxx | 91 ++
bridges/source/cpp_uno/gcc3_linux_mips64/uno2cpp.cxx | 576 +++
7 files changed, 1853 insertions(+)
New commits:
commit 55b09bd09d1c84de64140949ae9b70e9564a6cd7
Author: Heiher
Date: Tue Jul 7 18:19:09 2015 +0800
bridges: Add support for linux mips64.
Change-Id: I71fd2f7d8bfd1b1511dec91f23b61b9f55d21472
Reviewed-on: https://gerrit.libreoffice.org/16845
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
Tested-by: Stephan Bergmann
diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index 34ecf04..2f67535 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -99,6 +99,15 @@ bridge_noopt_objects := cpp2uno uno2cpp
bridge_exception_objects := except
endif
+else ifeq ($(CPUNAME),GODSON64)
+
+ifneq ($(filter ANDROID LINUX,$(OS)),)
+bridges_SELECTED_BRIDGE := gcc3_linux_mips64
+bridge_asm_objects := call
+bridge_noopt_objects := cpp2uno uno2cpp
+bridge_exception_objects := except
+endif
+
else ifeq ($(OS)-$(CPUNAME),LINUX-POWERPC)
bridges_SELECTED_BRIDGE := gcc3_linux_powerpc
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips64/call.hxx
b/bridges/source/cpp_uno/gcc3_linux_mips64/call.hxx
new file mode 100644
index 000..0be88ee
--- /dev/null
+++ b/bridges/source/cpp_uno/gcc3_linux_mips64/call.hxx
@@ -0,0 +1,38 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_MIPS64_CALL_HXX
+#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_MIPS64_CALL_HXX
+
+#include
+
+#include
+
+namespace {
+
+ extern "C" typelib_TypeClass cpp_vtable_call(
+ sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset,
+ void ** gpreg, void ** fpreg, void ** ovrflw,
+ sal_uInt64 * pRegisterReturn /* space for register return */ );
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips64/call.s
b/bridges/source/cpp_uno/gcc3_linux_mips64/call.s
new file mode 100644
index 000..5787725
--- /dev/null
+++ b/bridges/source/cpp_uno/gcc3_linux_mips64/call.s
@@ -0,0 +1,132 @@
+/*
+ * 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+.text
+.globl privateSnippetExecutor
+.LFB0 = .
+.cfi_startproc
+.cfi_personality 0x80,DW.ref.__gxx_personality_v0
+.cfi_lsda 0,.LLSDA0
+.ent privateSnippetExecutor
+.type privateSnippetExecutor, @function
+privateSnippetExecutor:
+.set noreorder
+daddiu $sp,$sp,-160
+.cfi_def_cfa_offset 160
+sd $ra,152($sp)
+.cfi_offset 31, -8
+.LEHB0 = .
+// Save the float point registers
+sdc1 $f12,80($sp)
+sdc1 $f13,88($sp)
+sdc1 $f14,96($sp)
+sdc1 $f15,104($sp)
+sdc1 $f16,112($sp)
+sdc1 $f17,120($sp)
+sdc1 $f18,128($sp)
+sdc1 $f19,136($sp)
+// Save the general
Heiher license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. -- Best regards! Heiher http://hev.cc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
