comparison make/linux/makefiles/vm.make @ 3557:b7ae1ee1d2e4

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
author collins
date Fri, 11 May 2012 11:30:03 -0700
parents d652a62d6e03
children 4767c78f3504
comparison
equal deleted inserted replaced
23:6a99fdf4e22d 24:a81b40949da3
100 # This is VERY important! The version define must only be supplied to vm_version.o 100 # This is VERY important! The version define must only be supplied to vm_version.o
101 # If not, ccache will not re-use the cache at all, since the version string might contain 101 # If not, ccache will not re-use the cache at all, since the version string might contain
102 # a time and date. 102 # a time and date.
103 vm_version.o: CXXFLAGS += ${JRE_VERSION} 103 vm_version.o: CXXFLAGS += ${JRE_VERSION}
104 104
105 ifndef JAVASE_EMBEDDED 105 ifndef JAVASE_EMBEDDED
106 ifneq (${ARCH},arm)
106 CFLAGS += -DINCLUDE_TRACE 107 CFLAGS += -DINCLUDE_TRACE
108 endif
107 endif 109 endif
108 110
109 # CFLAGS_WARN holds compiler options to suppress/enable warnings. 111 # CFLAGS_WARN holds compiler options to suppress/enable warnings.
110 CFLAGS += $(CFLAGS_WARN/BYFILE) 112 CFLAGS += $(CFLAGS_WARN/BYFILE)
111 113
151 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm 153 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm
152 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/posix/vm 154 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/posix/vm
153 SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm 155 SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm
154 SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm 156 SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm
155 157
156 ifndef JAVASE_EMBEDDED 158 ifndef JAVASE_EMBEDDED
159 ifneq (${ARCH},arm)
157 SOURCE_PATHS+=$(shell if [ -d $(HS_ALT_SRC)/share/vm/jfr ]; then \ 160 SOURCE_PATHS+=$(shell if [ -d $(HS_ALT_SRC)/share/vm/jfr ]; then \
158 find $(HS_ALT_SRC)/share/vm/jfr -type d; \ 161 find $(HS_ALT_SRC)/share/vm/jfr -type d; \
159 fi) 162 fi)
163 endif
160 endif 164 endif
161 165
162 CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path)) 166 CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path))
163 CORE_PATHS+=$(GENERATED)/jvmtifiles 167 CORE_PATHS+=$(GENERATED)/jvmtifiles
164 168