Mercurial > hg > truffle
comparison make/solaris/makefiles/dtrace.make @ 15280:417e2ae45b89
Merge
author | Michael Van De Vanter <michael.van.de.vanter@oracle.com> |
---|---|
date | Tue, 22 Apr 2014 18:22:40 -0700 |
parents | 4ca6dc0799b6 |
children | 7848fc12602b |
comparison
equal
deleted
inserted
replaced
15279:0c6d8a08e31b | 15280:417e2ae45b89 |
---|---|
34 dtraceCheck: | 34 dtraceCheck: |
35 $(QUIETLY) echo "**NOTICE** Dtrace support disabled for gcc builds" | 35 $(QUIETLY) echo "**NOTICE** Dtrace support disabled for gcc builds" |
36 | 36 |
37 else | 37 else |
38 | 38 |
39 DtraceOutDir = $(GENERATED)/dtracefiles | |
40 | |
41 JVM_DB = libjvm_db | 39 JVM_DB = libjvm_db |
42 LIBJVM_DB = libjvm_db.so | 40 LIBJVM_DB = libjvm_db.so |
43 | 41 |
44 LIBJVM_DB_DEBUGINFO = libjvm_db.debuginfo | 42 LIBJVM_DB_DEBUGINFO = libjvm_db.debuginfo |
45 LIBJVM_DB_DIZ = libjvm_db.diz | 43 LIBJVM_DB_DIZ = libjvm_db.diz |
53 JVMOFFS = JvmOffsets | 51 JVMOFFS = JvmOffsets |
54 JVMOFFS.o = $(JVMOFFS).o | 52 JVMOFFS.o = $(JVMOFFS).o |
55 GENOFFS = generate$(JVMOFFS) | 53 GENOFFS = generate$(JVMOFFS) |
56 | 54 |
57 DTRACE_SRCDIR = $(GAMMADIR)/src/os/$(Platform_os_family)/dtrace | 55 DTRACE_SRCDIR = $(GAMMADIR)/src/os/$(Platform_os_family)/dtrace |
58 DTRACE_COMMON_SRCDIR = $(GAMMADIR)/src/os/posix/dtrace | |
59 DTRACE = dtrace | 56 DTRACE = dtrace |
60 DTRACE.o = $(DTRACE).o | 57 DTRACE.o = $(DTRACE).o |
61 | 58 |
62 # to remove '-g' option which causes link problems | 59 # to remove '-g' option which causes link problems |
63 # also '-z nodefs' is used as workaround | 60 # also '-z nodefs' is used as workaround |
252 $(ZIPEXE) -q -y $(LIBJVM_DTRACE_DIZ) $(LIBJVM_DTRACE_DEBUGINFO) | 249 $(ZIPEXE) -q -y $(LIBJVM_DTRACE_DIZ) $(LIBJVM_DTRACE_DEBUGINFO) |
253 $(RM) $(LIBJVM_DTRACE_DEBUGINFO) | 250 $(RM) $(LIBJVM_DTRACE_DEBUGINFO) |
254 endif | 251 endif |
255 endif | 252 endif |
256 | 253 |
257 $(DTRACE).d: $(DTRACE_COMMON_SRCDIR)/hotspot.d $(DTRACE_COMMON_SRCDIR)/hotspot_jni.d \ | 254 $(DTRACE).d: $(DTRACE_SRCDIR)/hotspot.d $(DTRACE_SRCDIR)/hotspot_jni.d \ |
258 $(DTRACE_COMMON_SRCDIR)/hs_private.d $(DTRACE_SRCDIR)/jhelper.d | 255 $(DTRACE_SRCDIR)/hs_private.d $(DTRACE_SRCDIR)/jhelper.d |
259 $(QUIETLY) cat $^ > $@ | 256 $(QUIETLY) cat $^ > $@ |
260 | 257 |
261 DTraced_Files = ciEnv.o \ | 258 DTraced_Files = ciEnv.o \ |
262 classLoadingService.o \ | 259 classLoadingService.o \ |
263 compileBroker.o \ | 260 compileBroker.o \ |
327 # changed their contents. | 324 # changed their contents. |
328 $(QUIETLY) if [ -f lib$(GENOFFS).so ]; then touch lib$(GENOFFS).so; fi | 325 $(QUIETLY) if [ -f lib$(GENOFFS).so ]; then touch lib$(GENOFFS).so; fi |
329 $(QUIETLY) if [ -f $(GENOFFS) ]; then touch $(GENOFFS); fi | 326 $(QUIETLY) if [ -f $(GENOFFS) ]; then touch $(GENOFFS); fi |
330 $(QUIETLY) if [ -f $(JVMOFFS.o) ]; then touch $(JVMOFFS.o); fi | 327 $(QUIETLY) if [ -f $(JVMOFFS.o) ]; then touch $(JVMOFFS.o); fi |
331 | 328 |
332 | |
333 $(DtraceOutDir): | |
334 mkdir $(DtraceOutDir) | |
335 | |
336 $(DtraceOutDir)/hotspot.h: $(DTRACE_COMMON_SRCDIR)/hotspot.d | $(DtraceOutDir) | |
337 $(QUIETLY) $(DTRACE_PROG) $(DTRACE_OPTS) -C -I. -h -o $@ -s $(DTRACE_COMMON_SRCDIR)/hotspot.d | |
338 | |
339 $(DtraceOutDir)/hotspot_jni.h: $(DTRACE_COMMON_SRCDIR)/hotspot_jni.d | $(DtraceOutDir) | |
340 $(QUIETLY) $(DTRACE_PROG) $(DTRACE_OPTS) -C -I. -h -o $@ -s $(DTRACE_COMMON_SRCDIR)/hotspot_jni.d | |
341 | |
342 $(DtraceOutDir)/hs_private.h: $(DTRACE_COMMON_SRCDIR)/hs_private.d | $(DtraceOutDir) | |
343 $(QUIETLY) $(DTRACE_PROG) $(DTRACE_OPTS) -C -I. -h -o $@ -s $(DTRACE_COMMON_SRCDIR)/hs_private.d | |
344 | |
345 dtrace_gen_headers: $(DtraceOutDir)/hotspot.h $(DtraceOutDir)/hotspot_jni.h $(DtraceOutDir)/hs_private.h | |
346 | |
347 | |
348 .PHONY: dtraceCheck | 329 .PHONY: dtraceCheck |
349 | 330 |
350 SYSTEM_DTRACE_H = /usr/include/dtrace.h | 331 SYSTEM_DTRACE_H = /usr/include/dtrace.h |
351 SYSTEM_DTRACE_PROG = /usr/sbin/dtrace | 332 SYSTEM_DTRACE_PROG = /usr/sbin/dtrace |
352 PATCH_DTRACE_PROG = /opt/SUNWdtrd/sbin/dtrace | 333 PATCH_DTRACE_PROG = /opt/SUNWdtrd/sbin/dtrace |