1.1 --- a/make/linux/makefiles/defs.make Tue Jul 03 18:01:40 2018 -0700 1.2 +++ b/make/linux/makefiles/defs.make Thu Jul 26 16:04:06 2018 +0800 1.3 @@ -22,6 +22,12 @@ 1.4 # 1.5 # 1.6 1.7 +# 1.8 +# This file has been modified by Loongson Technology in 2015. These 1.9 +# modifications are Copyright (c) 2018 Loongson Technology, and are made 1.10 +# available on the same license terms set forth above. 1.11 +# 1.12 + 1.13 # The common definitions for hotspot linux builds. 1.14 # Include the top level defs.make under make directory instead of this one. 1.15 # This file is included into make/defs.make. 1.16 @@ -39,6 +45,14 @@ 1.17 ARCH := ppc64 1.18 endif 1.19 endif 1.20 +ifeq ($(ARCH), mips64el) 1.21 + ARCH=mips64 1.22 +endif 1.23 +ifeq ($(LP64), 1) 1.24 + ifeq ($(ARCH), mips) 1.25 + ARCH=mips64 1.26 + endif 1.27 +endif 1.28 1.29 PATH_SEP ?= : 1.30 1.31 @@ -83,6 +97,21 @@ 1.32 HS_ARCH = sparc 1.33 endif 1.34 1.35 +# mips 1.36 +ifeq ($(ARCH), mips64) 1.37 + ifeq ($(ARCH_DATA_MODEL), 64) 1.38 + ARCH_DATA_MODEL = 64 1.39 + MAKE_ARGS += LP64=1 1.40 + PLATFORM = linux-mips64 1.41 + VM_PLATFORM = linux_mips64 1.42 + else 1.43 + ARCH_DATA_MODEL = 32 1.44 + PLATFORM = linux-mips32 1.45 + VM_PLATFORM = linux_mips32 1.46 + endif 1.47 + HS_ARCH = mips 1.48 +endif 1.49 + 1.50 # i686/i586 and amd64/x86_64 1.51 ifneq (,$(findstring $(ARCH), amd64 x86_64 i686 i586)) 1.52 ifeq ($(ARCH_DATA_MODEL), 64) 1.53 @@ -292,13 +321,17 @@ 1.54 $(EXPORT_LIB_DIR)/sa-jdi.jar 1.55 ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ 1.56 $(EXPORT_LIB_DIR)/sa-jdi.jar 1.57 +ADD_SA_BINARIES/mips = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ 1.58 + $(EXPORT_LIB_DIR)/sa-jdi.jar 1.59 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) 1.60 ifeq ($(ZIP_DEBUGINFO_FILES),1) 1.61 ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz 1.62 ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz 1.63 + ADD_SA_BINARIES/mips += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz 1.64 else 1.65 ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo 1.66 ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo 1.67 + ADD_SA_BINARIES/mips += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo 1.68 endif 1.69 endif 1.70 ADD_SA_BINARIES/ppc =