diff -r 9bf9a733246b -r 04ff2f6cd0eb make/defs.make --- a/make/defs.make Thu Aug 06 00:08:57 2015 -0700 +++ b/make/defs.make Tue Oct 17 12:58:25 2017 +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. +# + # The common definitions for hotspot builds. # Optionally include SPEC file generated by configure. @@ -273,13 +279,14 @@ # Use uname output for SRCARCH, but deal with platform differences. If ARCH # is not explicitly listed below, it is treated as x86. - SRCARCH ?= $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 ppc64 zero,$(ARCH))) + SRCARCH ?= $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 ppc64 mips64 zero,$(ARCH))) ARCH/ = x86 ARCH/sparc = sparc ARCH/sparc64= sparc ARCH/ia64 = ia64 ARCH/amd64 = x86 ARCH/x86_64 = x86 + ARCH/mips64 = mips ARCH/ppc64 = ppc ARCH/zero = zero @@ -302,6 +309,9 @@ BUILDARCH = ppc64 endif endif + ifeq ($(BUILDARCH), mips) + BUILDARCH = mips64 + endif # LIBARCH is 1:1 mapping from BUILDARCH LIBARCH ?= $(LIBARCH/$(BUILDARCH)) @@ -311,9 +321,10 @@ LIBARCH/sparcv9 = sparcv9 LIBARCH/ia64 = ia64 LIBARCH/ppc64 = ppc64 + LIBARCH/mips64 = mips64 LIBARCH/zero = $(ZERO_LIBARCH) - LP64_ARCH += sparcv9 amd64 ia64 ppc64 zero + LP64_ARCH += sparcv9 amd64 ia64 ppc64 mips64 zero endif # Required make macro settings for all platforms