Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/make/linux/makefiles/vm.make	Mon May 14 09:36:00 2012 -0700
     1.2 +++ b/make/linux/makefiles/vm.make	Thu May 17 09:50:59 2012 -0700
     1.3 @@ -102,9 +102,11 @@
     1.4  # a time and date. 
     1.5  vm_version.o: CXXFLAGS += ${JRE_VERSION}
     1.6  
     1.7 -ifndef JAVASE_EMBEDDED
     1.8 +ifndef JAVASE_EMBEDDED 
     1.9 +ifneq (${ARCH},arm)
    1.10  CFLAGS += -DINCLUDE_TRACE
    1.11  endif
    1.12 +endif
    1.13  
    1.14  # CFLAGS_WARN holds compiler options to suppress/enable warnings.
    1.15  CFLAGS += $(CFLAGS_WARN/BYFILE)
    1.16 @@ -153,11 +155,13 @@
    1.17  SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm
    1.18  SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm
    1.19  
    1.20 -ifndef JAVASE_EMBEDDED
    1.21 +ifndef JAVASE_EMBEDDED 
    1.22 +ifneq (${ARCH},arm)
    1.23  SOURCE_PATHS+=$(shell if [ -d $(HS_ALT_SRC)/share/vm/jfr ]; then \
    1.24    find $(HS_ALT_SRC)/share/vm/jfr -type d; \
    1.25    fi)
    1.26  endif
    1.27 +endif
    1.28  
    1.29  CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path))
    1.30  CORE_PATHS+=$(GENERATED)/jvmtifiles

     2.1 --- a/src/share/vm/runtime/arguments.cpp	Mon May 14 09:36:00 2012 -0700
     2.2 +++ b/src/share/vm/runtime/arguments.cpp	Thu May 17 09:50:59 2012 -0700
     2.3 @@ -3039,7 +3039,7 @@
     2.4      return result;
     2.5    }
     2.6  
     2.7 -#ifdef JAVASE_EMBEDDED
     2.8 +#if (defined JAVASE_EMBEDDED || defined ARM)
     2.9    UNSUPPORTED_OPTION(UseG1GC, "G1 GC");
    2.10  #endif
    2.11