Kaydet (Commit) 0f6edce2 authored tarafından Heiher's avatar Heiher Kaydeden (comit) Caolán McNamara

jvmfwk: pluginlib: Add support for mips64.

Change-Id: I525266468ae2ef04976d7835cc22c930293a0dc3
Reviewed-on: https://gerrit.libreoffice.org/16911Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 61819822
...@@ -55,6 +55,12 @@ namespace jfw_plugin ...@@ -55,6 +55,12 @@ namespace jfw_plugin
OpenJDK at least, but probably not true for Lemotes JDK */ OpenJDK at least, but probably not true for Lemotes JDK */
# define JFW_PLUGIN_ARCH "mipsel" # define JFW_PLUGIN_ARCH "mipsel"
#endif #endif
#elif defined MIPS64
#ifdef OSL_BIGENDIAN
# define JFW_PLUGIN_ARCH "mips64"
#else
# define JFW_PLUGIN_ARCH "mips64el"
#endif
#elif defined S390X #elif defined S390X
#define JFW_PLUGIN_ARCH "s390x" #define JFW_PLUGIN_ARCH "s390x"
#elif defined S390 #elif defined S390
...@@ -71,9 +77,9 @@ OpenJDK at least, but probably not true for Lemotes JDK */ ...@@ -71,9 +77,9 @@ OpenJDK at least, but probably not true for Lemotes JDK */
#define JFW_PLUGIN_ARCH "alpha" #define JFW_PLUGIN_ARCH "alpha"
#elif defined AARCH64 #elif defined AARCH64
#define JFW_PLUGIN_ARCH "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 #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 class MalformedVersionException
......
...@@ -53,6 +53,8 @@ char const* const* GnuInfo::getJavaExePaths(int * size) ...@@ -53,6 +53,8 @@ char const* const* GnuInfo::getJavaExePaths(int * size)
#if defined(MIPS) && defined(OSL_LITENDIAN) #if defined(MIPS) && defined(OSL_LITENDIAN)
#define GCJ_JFW_PLUGIN_ARCH "mipsel" #define GCJ_JFW_PLUGIN_ARCH "mipsel"
#elif defined(MIPS64) && defined(OSL_LITENDIAN)
#define GCJ_JFW_PLUGIN_ARCH "mips64el"
#else #else
#define GCJ_JFW_PLUGIN_ARCH JFW_PLUGIN_ARCH #define GCJ_JFW_PLUGIN_ARCH JFW_PLUGIN_ARCH
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment