1.1 --- a/make/linux/makefiles/vm.make Mon Jan 09 10:27:24 2012 +0100 1.2 +++ b/make/linux/makefiles/vm.make Wed Jan 11 17:34:02 2012 -0500 1.3 @@ -98,6 +98,10 @@ 1.4 ${JRE_VERSION} \ 1.5 ${VM_DISTRO} 1.6 1.7 +ifndef JAVASE_EMBEDDED 1.8 +CFLAGS += -DINCLUDE_TRACE 1.9 +endif 1.10 + 1.11 # CFLAGS_WARN holds compiler options to suppress/enable warnings. 1.12 CFLAGS += $(CFLAGS_WARN/BYFILE) 1.13 1.14 @@ -143,6 +147,12 @@ 1.15 SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm 1.16 SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm 1.17 1.18 +ifndef JAVASE_EMBEDDED 1.19 +SOURCE_PATHS+=$(shell if [ -d $(HS_ALT_SRC)/share/vm/jfr ]; then \ 1.20 + find $(HS_ALT_SRC)/share/vm/jfr -type d; \ 1.21 + fi) 1.22 +endif 1.23 + 1.24 CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path)) 1.25 CORE_PATHS+=$(GENERATED)/jvmtifiles 1.26