equal
deleted
inserted
replaced
94 |
94 |
95 ifdef DEFAULT_LIBPATH |
95 ifdef DEFAULT_LIBPATH |
96 CPPFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\"" |
96 CPPFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\"" |
97 endif |
97 endif |
98 |
98 |
|
99 ifndef JAVASE_EMBEDDED |
|
100 CFLAGS += -DINCLUDE_TRACE |
|
101 endif |
|
102 |
99 # CFLAGS_WARN holds compiler options to suppress/enable warnings. |
103 # CFLAGS_WARN holds compiler options to suppress/enable warnings. |
100 CFLAGS += $(CFLAGS_WARN/BYFILE) |
104 CFLAGS += $(CFLAGS_WARN/BYFILE) |
101 |
105 |
102 # Do not use C++ exception handling |
106 # Do not use C++ exception handling |
103 CFLAGS += $(CFLAGS/NOEX) |
107 CFLAGS += $(CFLAGS/NOEX) |
144 \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \)) |
148 \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \)) |
145 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm |
149 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm |
146 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/posix/vm |
150 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/posix/vm |
147 SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm |
151 SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm |
148 SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm |
152 SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm |
|
153 |
|
154 ifndef JAVASE_EMBEDDED |
|
155 SOURCE_PATHS+=$(shell if [ -d $(HS_ALT_SRC)/share/vm/jfr ]; then \ |
|
156 find $(HS_ALT_SRC)/share/vm/jfr -type d; \ |
|
157 fi) |
|
158 endif |
149 |
159 |
150 CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path)) |
160 CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path)) |
151 CORE_PATHS+=$(GENERATED)/jvmtifiles |
161 CORE_PATHS+=$(GENERATED)/jvmtifiles |
152 |
162 |
153 COMPILER1_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/c1) |
163 COMPILER1_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/c1) |