Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/make/linux/Makefile	Thu Dec 17 17:18:59 2015 -0800
     1.2 +++ b/make/linux/Makefile	Fri Dec 18 10:11:58 2015 -0800
     1.3 @@ -67,8 +67,12 @@
     1.4    endif
     1.5  endif
     1.6  # C1 is not ported on ppc64, so we cannot build a tiered VM:
     1.7 -ifeq ($(ARCH),ppc64)
     1.8 -  FORCE_TIERED=0
     1.9 +# Notice: after 8046471 ARCH will be 'ppc' for top-level ppc64 builds but
    1.10 +# 'ppc64' for HotSpot-only ppc64 builds. Need to detect both variants here!
    1.11 +ifneq (,$(findstring $(ARCH), ppc ppc64))
    1.12 +  ifeq ($(ARCH_DATA_MODEL), 64)
    1.13 +    FORCE_TIERED=0
    1.14 +  endif
    1.15  endif
    1.16  
    1.17  ifdef LP64

     2.1 --- a/make/linux/makefiles/defs.make	Thu Dec 17 17:18:59 2015 -0800
     2.2 +++ b/make/linux/makefiles/defs.make	Fri Dec 18 10:11:58 2015 -0800
     2.3 @@ -99,7 +99,9 @@
     2.4  endif
     2.5  
     2.6  # PPC
     2.7 -ifneq (,$(findstring $(ARCH), ppc))
     2.8 +# Notice: after 8046471 ARCH will be 'ppc' for top-level ppc64 builds but
     2.9 +# 'ppc64' for HotSpot-only ppc64 builds. Need to detect both variants here!
    2.10 +ifneq (,$(findstring $(ARCH), ppc ppc64))
    2.11    ifeq ($(ARCH_DATA_MODEL), 64)
    2.12      MAKE_ARGS        += LP64=1
    2.13      PLATFORM         = linux-ppc64