changeset 3559:5921bdc6ce5c jdk7u6-b11

Merge
author amurillo
date Fri, 18 May 2012 11:35:57 -0700
parents 3be0dd52ccda 7eeb0ec83cd7
children 897d453d26ac
files .hgtags make/hotspot_version
diffstat 4 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu May 17 14:59:34 2012 -0700
+++ b/.hgtags	Fri May 18 11:35:57 2012 -0700
@@ -288,3 +288,4 @@
 94d7a305da4dcf46049efd81c2afca512d2afa7f jdk7u6-b09
 1fcba869fe4a932616067e051565590ff375a63b hs23.2-b01
 702b62a5e1a546ba5eea17619f9056a86fec03f1 jdk7u6-b10
+b7ae1ee1d2e49bbfbcf35587cb51c04abf2710a2 hs23.2-b02
--- a/make/hotspot_version	Thu May 17 14:59:34 2012 -0700
+++ b/make/hotspot_version	Fri May 18 11:35:57 2012 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=23
 HS_MINOR_VER=2
-HS_BUILD_NUMBER=01
+HS_BUILD_NUMBER=02
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7
--- a/make/linux/makefiles/vm.make	Thu May 17 14:59:34 2012 -0700
+++ b/make/linux/makefiles/vm.make	Fri May 18 11:35:57 2012 -0700
@@ -102,9 +102,11 @@
 # a time and date. 
 vm_version.o: CXXFLAGS += ${JRE_VERSION}
 
-ifndef JAVASE_EMBEDDED
+ifndef JAVASE_EMBEDDED 
+ifneq (${ARCH},arm)
 CFLAGS += -DINCLUDE_TRACE
 endif
+endif
 
 # CFLAGS_WARN holds compiler options to suppress/enable warnings.
 CFLAGS += $(CFLAGS_WARN/BYFILE)
@@ -153,11 +155,13 @@
 SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm
 SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm
 
-ifndef JAVASE_EMBEDDED
+ifndef JAVASE_EMBEDDED 
+ifneq (${ARCH},arm)
 SOURCE_PATHS+=$(shell if [ -d $(HS_ALT_SRC)/share/vm/jfr ]; then \
   find $(HS_ALT_SRC)/share/vm/jfr -type d; \
   fi)
 endif
+endif
 
 CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path))
 CORE_PATHS+=$(GENERATED)/jvmtifiles
--- a/src/share/vm/runtime/arguments.cpp	Thu May 17 14:59:34 2012 -0700
+++ b/src/share/vm/runtime/arguments.cpp	Fri May 18 11:35:57 2012 -0700
@@ -3023,7 +3023,7 @@
     return result;
   }
 
-#ifdef JAVASE_EMBEDDED
+#if (defined JAVASE_EMBEDDED || defined ARM)
   UNSUPPORTED_OPTION(UseG1GC, "G1 GC");
 #endif