equal
deleted
inserted
replaced
91 |
91 |
92 # Do not use C++ exception handling |
92 # Do not use C++ exception handling |
93 CFLAGS += $(CFLAGS/NOEX) |
93 CFLAGS += $(CFLAGS/NOEX) |
94 |
94 |
95 # Extra flags from gnumake's invocation or environment |
95 # Extra flags from gnumake's invocation or environment |
96 CFLAGS += $(EXTRA_CFLAGS) |
96 CFLAGS += $(EXTRA_CFLAGS) -DINCLUDE_TRACE |
97 |
97 |
98 # Math Library (libm.so), do not use -lm. |
98 # Math Library (libm.so), do not use -lm. |
99 # There might be two versions of libm.so on the build system: |
99 # There might be two versions of libm.so on the build system: |
100 # libm.so.1 and libm.so.2, and we want libm.so.1. |
100 # libm.so.1 and libm.so.2, and we want libm.so.1. |
101 # Depending on the Solaris release being used to build with, |
101 # Depending on the Solaris release being used to build with, |
157 \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \)) |
157 \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \)) |
158 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm |
158 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm |
159 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/posix/vm |
159 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/posix/vm |
160 SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm |
160 SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm |
161 SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm |
161 SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm |
|
162 |
|
163 SOURCE_PATHS+=$(shell if [ -d $(HS_ALT_SRC)/share/vm/jfr ]; then \ |
|
164 find $(HS_ALT_SRC)/share/vm/jfr -type d; \ |
|
165 fi) |
162 |
166 |
163 CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path)) |
167 CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path)) |
164 CORE_PATHS+=$(GENERATED)/jvmtifiles |
168 CORE_PATHS+=$(GENERATED)/jvmtifiles |
165 |
169 |
166 COMPILER1_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/c1) |
170 COMPILER1_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/c1) |