diff options
| -rw-r--r-- | bridges/Library_cpp_uno.mk | 4 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/LINUX_MIPS64_GCC.mk (renamed from solenv/gbuild/platform/LINUX_GODSON64_GCC.mk) | 0 | ||||
| -rw-r--r-- | solenv/gbuild/platform/LINUX_MIPS_GCC.mk (renamed from solenv/gbuild/platform/LINUX_GODSON_GCC.mk) | 0 |
5 files changed, 8 insertions, 8 deletions
diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk index e2de3c1678b4..a5d2a72c202b 100644 --- a/bridges/Library_cpp_uno.mk +++ b/bridges/Library_cpp_uno.mk @@ -97,7 +97,7 @@ bridges_SELECTED_BRIDGE := gcc3_linux_m68k bridge_noopt_objects := cpp2uno except uno2cpp endif -else ifeq ($(CPUNAME),GODSON) +else ifeq ($(CPUNAME),MIPS) ifneq ($(filter LINUX,$(OS)),) bridges_SELECTED_BRIDGE := gcc3_linux_mips @@ -105,7 +105,7 @@ bridge_noopt_objects := cpp2uno uno2cpp bridge_exception_objects := except endif -else ifeq ($(CPUNAME),GODSON64) +else ifeq ($(CPUNAME),MIPS64) ifneq ($(filter LINUX,$(OS)),) bridges_SELECTED_BRIDGE := gcc3_linux_mips64 diff --git a/configure.ac b/configure.ac index 33dc0fb96316..52d21a3f88e3 100644 --- a/configure.ac +++ b/configure.ac @@ -5190,25 +5190,25 @@ linux-gnu*|linux-musl*) PLATFORMID=linux_ia64 ;; mips) - CPUNAME=GODSON + CPUNAME=MIPS RTL_ARCH=MIPS_EB EPM_FLAGS="-a mips" PLATFORMID=linux_mips_eb ;; mips64) - CPUNAME=GODSON64 + CPUNAME=MIPS64 RTL_ARCH=MIPS64_EB EPM_FLAGS="-a mips64" PLATFORMID=linux_mips64_eb ;; mips64el) - CPUNAME=GODSON64 + CPUNAME=MIPS64 RTL_ARCH=MIPS64_EL EPM_FLAGS="-a mips64el" PLATFORMID=linux_mips64_el ;; mipsel) - CPUNAME=GODSON + CPUNAME=MIPS RTL_ARCH=MIPS_EL EPM_FLAGS="-a mipsel" PLATFORMID=linux_mips_el @@ -8608,7 +8608,7 @@ if test "$ENABLE_JAVA" != ""; then JAVAINTERPRETER=`win_short_path_for_make "$JAVAINTERPRETER"` elif test "$cross_compiling" != "yes"; then case $CPUNAME in - AARCH64|AXP|X86_64|HPPA|IA64|POWERPC64|S390X|SPARC64|GODSON64) + AARCH64|AXP|X86_64|HPPA|IA64|POWERPC64|S390X|SPARC64|MIPS64) if test -f "$JAVAINTERPRETER" -a "`$JAVAINTERPRETER -version 2>&1 | $GREP -i 64-bit`" = "" >/dev/null; then AC_MSG_WARN([You are building 64-bit binaries but the JDK $JAVAINTERPRETER is 32-bit]) AC_MSG_ERROR([You should pass the --with-jdk-home option pointing to a 64-bit JDK]) diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 9e7fbb1398ae..cf9a3432f1ce 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -322,7 +322,7 @@ else postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/Paths-internallibnumbertextdata.xcu endif -ifneq ($(filter POWERPC INTEL ARM HPPA GODSON M68K SPARC S390,$(CPUNAME)),) +ifneq ($(filter POWERPC INTEL ARM HPPA MIPS M68K SPARC S390,$(CPUNAME)),) postprocess_FILES_main += \ $(postprocess_MOD)/org/openoffice/Office/Common-32bit.xcu endif diff --git a/solenv/gbuild/platform/LINUX_GODSON64_GCC.mk b/solenv/gbuild/platform/LINUX_MIPS64_GCC.mk index 4a0a619e41b9..4a0a619e41b9 100644 --- a/solenv/gbuild/platform/LINUX_GODSON64_GCC.mk +++ b/solenv/gbuild/platform/LINUX_MIPS64_GCC.mk diff --git a/solenv/gbuild/platform/LINUX_GODSON_GCC.mk b/solenv/gbuild/platform/LINUX_MIPS_GCC.mk index 976aaedf97fe..976aaedf97fe 100644 --- a/solenv/gbuild/platform/LINUX_GODSON_GCC.mk +++ b/solenv/gbuild/platform/LINUX_MIPS_GCC.mk |