diff options
| author | Heiher <r@hev.cc> | 2015-07-07 17:49:01 +0800 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-07-10 19:50:12 +0000 |
| commit | 0f6edce22b0424d99342b73adafcaf688f044139 (patch) | |
| tree | 5c0e85495cc967f82f4d67455996d1fb3d7ec73f /jvmfwk | |
| parent | 618198222a66306028834d3f6e898f73368bc103 (diff) | |
jvmfwk: pluginlib: Add support for mips64.
Change-Id: I525266468ae2ef04976d7835cc22c930293a0dc3
Reviewed-on: https://gerrit.libreoffice.org/16911
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/inc/vendorbase.hxx | 10 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/jvmfwk/inc/vendorbase.hxx b/jvmfwk/inc/vendorbase.hxx index a01db566c4c1..7dc32cd953a3 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 07ec21e85270..9abc9787669b 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 |