rename GODSON/GODSON64 to MIPS/MIPS64
as that what it actually is and the compiler defines are already -DMIPS/-DMIPS64 anyway (as are the PLATFORMID and the bridges' name mips/mips64) Change-Id: I274e7a3b0e140375a8e697c1790cbdb972251d29 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137489 Tested-by: René Engelhard <rene@debian.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: René Engelhard <rene@debian.org>
This commit is contained in:
parent
93f28ca499
commit
c559dbd864
5 changed files with 8 additions and 8 deletions
|
@ -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
|
||||
|
|
10
configure.ac
10
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])
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue