# HG changeset patch
# User kvn
# Date 1337273459 25200
# Node ID de0cc3dd9f10a78ee176b10cc0d2f5cefa84d471
# Parent  8f972594effcb626e5a2b7b45e5805a77c21a95e# Parent  fada85d11d92c4ee9975ef1fbbd92dbbded5bb4d
Merge

diff -r 8f972594effc -r de0cc3dd9f10 make/linux/makefiles/vm.make
--- a/make/linux/makefiles/vm.make	Mon May 14 09:36:00 2012 -0700
+++ b/make/linux/makefiles/vm.make	Thu May 17 09:50:59 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
diff -r 8f972594effc -r de0cc3dd9f10 src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Mon May 14 09:36:00 2012 -0700
+++ b/src/share/vm/runtime/arguments.cpp	Thu May 17 09:50:59 2012 -0700
@@ -3039,7 +3039,7 @@
     return result;
   }
 
-#ifdef JAVASE_EMBEDDED
+#if (defined JAVASE_EMBEDDED || defined ARM)
   UNSUPPORTED_OPTION(UseG1GC, "G1 GC");
 #endif