Mercurial > hg > truffle
comparison make/linux/makefiles/vm.make @ 4800:94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
Summary: Added a nop tracing infrastructure, JFR makefile changes and other infrastructure used only by JFR.
Reviewed-by: acorn, sspitsyn
Contributed-by: markus.gronlund@oracle.com
author | phh |
---|---|
date | Wed, 11 Jan 2012 17:34:02 -0500 |
parents | da0999c4b733 |
children | c77d473e71f7 |
comparison
equal
deleted
inserted
replaced
4773:4f25538b54c9 | 4800:94ec88ca68e2 |
---|---|
96 ${BUILD_USER} \ | 96 ${BUILD_USER} \ |
97 ${HS_LIB_ARCH} \ | 97 ${HS_LIB_ARCH} \ |
98 ${JRE_VERSION} \ | 98 ${JRE_VERSION} \ |
99 ${VM_DISTRO} | 99 ${VM_DISTRO} |
100 | 100 |
101 ifndef JAVASE_EMBEDDED | |
102 CFLAGS += -DINCLUDE_TRACE | |
103 endif | |
104 | |
101 # CFLAGS_WARN holds compiler options to suppress/enable warnings. | 105 # CFLAGS_WARN holds compiler options to suppress/enable warnings. |
102 CFLAGS += $(CFLAGS_WARN/BYFILE) | 106 CFLAGS += $(CFLAGS_WARN/BYFILE) |
103 | 107 |
104 # Do not use C++ exception handling | 108 # Do not use C++ exception handling |
105 CFLAGS += $(CFLAGS/NOEX) | 109 CFLAGS += $(CFLAGS/NOEX) |
140 \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \)) | 144 \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \)) |
141 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm | 145 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm |
142 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/posix/vm | 146 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/posix/vm |
143 SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm | 147 SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm |
144 SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm | 148 SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm |
149 | |
150 ifndef JAVASE_EMBEDDED | |
151 SOURCE_PATHS+=$(shell if [ -d $(HS_ALT_SRC)/share/vm/jfr ]; then \ | |
152 find $(HS_ALT_SRC)/share/vm/jfr -type d; \ | |
153 fi) | |
154 endif | |
145 | 155 |
146 CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path)) | 156 CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path)) |
147 CORE_PATHS+=$(GENERATED)/jvmtifiles | 157 CORE_PATHS+=$(GENERATED)/jvmtifiles |
148 | 158 |
149 COMPILER1_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/c1) | 159 COMPILER1_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/c1) |