diff -r f90c822e73f8 -r 2d8a650513c2 make/linux/makefiles/vm.make --- a/make/linux/makefiles/vm.make Wed Apr 27 01:25:04 2016 +0800 +++ b/make/linux/makefiles/vm.make Fri Apr 29 00:06:10 2016 +0800 @@ -22,6 +22,12 @@ # # +# +# This file has been modified by Loongson Technology in 2015. These +# modifications are Copyright (c) 2015 Loongson Technology, and are made +# available on the same license terms set forth above. +# + # Rules to build JVM and related libraries, included from vm.make in the build # directory. @@ -98,6 +104,13 @@ ${HS_LIB_ARCH} \ ${VM_DISTRO} +ifeq ($(MIPS_ABI),n32) + CXXFLAGS += -DN32 +else + ifeq ($(MIPS_ABI),n64) + CXXFLAGS += -DN64 + endif +endif # This is VERY important! The version define must only be supplied to vm_version.o # If not, ccache will not re-use the cache at all, since the version string might contain # a time and date. @@ -211,6 +224,12 @@ ifeq ($(Platform_arch_model), x86_64) Src_Files_EXCLUDE += \*x86_32\* endif +ifeq ($(Platform_arch_model), mips_32) +Src_Files_EXCLUDE += \*mips_64\* +endif +ifeq ($(Platform_arch_model), mips_64) +Src_Files_EXCLUDE += \*mips_32\* +endif # Alternate vm.make # This has to be included here to allow changes to the source