1.1 --- a/make/linux/makefiles/vm.make Sat Oct 06 10:25:04 2018 +0100
1.2 +++ b/make/linux/makefiles/vm.make Thu Dec 27 11:43:33 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 2018. 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 # Rules to build JVM and related libraries, included from vm.make in the build
1.14 # directory.
1.15
1.16 @@ -99,9 +105,22 @@
1.17 ${HS_LIB_ARCH} \
1.18 ${VM_DISTRO}
1.19
1.20 +ifeq ($(MIPS_ABI),n32)
1.21 + CXXFLAGS += -DN32
1.22 +else
1.23 + ifeq ($(MIPS_ABI),n64)
1.24 + CXXFLAGS += -DN64
1.25 + endif
1.26 +endif
1.27 # This is VERY important! The version define must only be supplied to vm_version.o
1.28 # If not, ccache will not re-use the cache at all, since the version string might contain
1.29 # a time and date.
1.30 +ifdef LOONGSON_RUNTIME_NAME
1.31 + LOONGSON_VM_INFO = -DLOONGSON_RUNTIME_NAME="\"$(LOONGSON_RUNTIME_NAME)\""
1.32 +else
1.33 + LOONGSON_VM_INFO = -DLOONGSON_RUNTIME_NAME="\"\""
1.34 +endif
1.35 +CXXFLAGS/vmError.o += ${LOONGSON_VM_INFO}
1.36 CXXFLAGS/vm_version.o += ${JRE_VERSION}
1.37
1.38 CXXFLAGS/BYFILE = $(CXXFLAGS/$@)
1.39 @@ -212,6 +231,12 @@
1.40 ifeq ($(Platform_arch_model), x86_64)
1.41 Src_Files_EXCLUDE += \*x86_32\*
1.42 endif
1.43 +ifeq ($(Platform_arch_model), mips_32)
1.44 +Src_Files_EXCLUDE += \*mips_64\*
1.45 +endif
1.46 +ifeq ($(Platform_arch_model), mips_64)
1.47 +Src_Files_EXCLUDE += \*mips_32\*
1.48 +endif
1.49
1.50 # Alternate vm.make
1.51 # This has to be included here to allow changes to the source
