7167625: Adjustments for SE-Embedded build process
Summary: Simple change to the SE-Embedded build rules that should not affect any other OpenJDK users.
Reviewed-by: kvn, dholmes
--- a/hotspot/make/linux/makefiles/vm.make Sat May 05 10:24:55 2012 -0400
+++ b/hotspot/make/linux/makefiles/vm.make Fri May 11 11:30:03 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/hotspot/src/share/vm/runtime/arguments.cpp Sat May 05 10:24:55 2012 -0400
+++ b/hotspot/src/share/vm/runtime/arguments.cpp Fri May 11 11:30:03 2012 -0700
@@ -3039,7 +3039,7 @@
return result;
}
-#ifdef JAVASE_EMBEDDED
+#if (defined JAVASE_EMBEDDED || defined ARM)
UNSUPPORTED_OPTION(UseG1GC, "G1 GC");
#endif