diff -r e134dc1879b7 -r 04d83ba48607 make/linux/makefiles/defs.make --- a/make/linux/makefiles/defs.make Thu Sep 22 13:16:27 2016 -0700 +++ b/make/linux/makefiles/defs.make Thu May 24 17:06:56 2018 +0800 @@ -22,6 +22,12 @@ # # +# +# This file has been modified by Loongson Technology in 2018. These +# modifications are Copyright (c) 2015 Loongson Technology, and are made +# available on the same license terms set forth above. +# + # The common definitions for hotspot linux builds. # Include the top level defs.make under make directory instead of this one. # This file is included into make/defs.make. @@ -39,6 +45,9 @@ ARCH := ppc64 endif endif +ifeq ($(ARCH), mips64el) + ARCH=mips64 +endif PATH_SEP ?= : @@ -114,6 +123,15 @@ HS_ARCH = ppc endif +# mips +ifeq ($(ARCH), mips64) + ARCH_DATA_MODEL = 64 + MAKE_ARGS += LP64=1 + VM_PLATFORM = linux_mips64 + PLATFORM = linux-mips64 + HS_ARCH = mips +endif + # On 32 bit linux we build server and client, on 64 bit just server. ifeq ($(JVM_VARIANTS),) ifeq ($(ARCH_DATA_MODEL), 32) @@ -292,13 +310,17 @@ $(EXPORT_LIB_DIR)/sa-jdi.jar ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ $(EXPORT_LIB_DIR)/sa-jdi.jar +ADD_SA_BINARIES/mips = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ + $(EXPORT_LIB_DIR)/sa-jdi.jar ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ifeq ($(ZIP_DEBUGINFO_FILES),1) ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz + ADD_SA_BINARIES/mips += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz else ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo + ADD_SA_BINARIES/mips += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo endif endif ADD_SA_BINARIES/ppc =