equal
deleted
inserted
replaced
22 # or visit www.oracle.com if you need additional information or have any |
22 # or visit www.oracle.com if you need additional information or have any |
23 # questions. |
23 # questions. |
24 # |
24 # |
25 |
25 |
26 ifeq ($(call check-jvm-feature, dtrace), true) |
26 ifeq ($(call check-jvm-feature, dtrace), true) |
27 ifeq ($(OPENJDK_TARGET_OS), solaris) |
27 ifeq ($(call isTargetOs, solaris), true) |
28 |
28 |
29 ############################################################################ |
29 ############################################################################ |
30 # Integrate with libjvm. Here we generate two object files which are |
30 # Integrate with libjvm. Here we generate two object files which are |
31 # linked with libjvm.so. This step is complicated from a dependency |
31 # linked with libjvm.so. This step is complicated from a dependency |
32 # perspective. We add these two files to the linking of libjvm using |
32 # perspective. We add these two files to the linking of libjvm using |
129 $(call ExecuteWithLog, $(DTRACE_SUPPORT_DIR)/$(@F).d, \ |
129 $(call ExecuteWithLog, $(DTRACE_SUPPORT_DIR)/$(@F).d, \ |
130 ($(CPP) $(DTRACE_CPP_FLAGS) -I$(DTRACE_GENSRC_DIR) $^ \ |
130 ($(CPP) $(DTRACE_CPP_FLAGS) -I$(DTRACE_GENSRC_DIR) $^ \ |
131 > $(DTRACE_SUPPORT_DIR)/$(@F).d)) |
131 > $(DTRACE_SUPPORT_DIR)/$(@F).d)) |
132 $(call ExecuteWithLog, $@, $(DTRACE) $(DTRACE_FLAGS) -o $@ \ |
132 $(call ExecuteWithLog, $@, $(DTRACE) $(DTRACE_FLAGS) -o $@ \ |
133 -s $(DTRACE_SUPPORT_DIR)/$(@F).d) |
133 -s $(DTRACE_SUPPORT_DIR)/$(@F).d) |
134 ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc) |
134 ifeq ($(call isTargetCpuArch, sparc), true) |
135 $(call ExecuteWithLog, $@.elfedit, $(ELFEDIT) $(call GetElfeditCommands) $@) |
135 $(call ExecuteWithLog, $@.elfedit, $(ELFEDIT) $(call GetElfeditCommands) $@) |
136 endif |
136 endif |
137 |
137 |
138 endif |
138 endif |
139 endif |
139 endif |