< prev index next >

make/hotspot/lib/JvmDtraceObjects.gmk

Print this page

        

@@ -22,11 +22,11 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
 
 ifeq ($(call check-jvm-feature, dtrace), true)
-  ifeq ($(call isTargetOs, solaris), true)
+  ifeq ($(OPENJDK_TARGET_OS), solaris)
 
     ############################################################################
     # Integrate with libjvm. Here we generate two object files which are
     # linked with libjvm.so. This step is complicated from a dependency
     # perspective. We add these two files to the linking of libjvm using

@@ -49,22 +49,19 @@
         hotspot_jni.d \
         hotspot.d \
         hs_private.d \
     )
 
-    # *.d in the objs dir is used for generated make dependency files, so use
-    # *.dt for dtrace files to avoid clashes.
-    $(JVM_OUTPUTDIR)/objs/dtrace.dt: $(DTRACE_SOURCE_FILES)
+    $(JVM_OUTPUTDIR)/objs/dtrace.d: $(DTRACE_SOURCE_FILES)
         $(call LogInfo, Generating $(@F))
         $(call MakeDir, $(@D))
         $(CAT) $^ > $@
 
     DTRACE_INSTRUMENTED_OBJS := $(addprefix $(JVM_OUTPUTDIR)/objs/, \
         ciEnv.o \
         classLoadingService.o \
         compileBroker.o \
-        gcVMOperations.o \
         hashtable.o \
         instanceKlass.o \
         java.o \
         jni.o \
         jvm.o \

@@ -75,36 +72,37 @@
         sharedRuntime.o \
         synchronizer.o \
         thread.o \
         unsafe.o \
         vmThread.o \
+        vmGCOperations.o \
     )
 
     ifeq ($(call check-jvm-feature, cmsgc), true)
       DTRACE_INSTRUMENTED_OBJS += $(addprefix $(JVM_OUTPUTDIR)/objs/, \
-          cmsVMOperations.o \
+          vmCMSOperations.o \
       )
     endif
 
     ifeq ($(call check-jvm-feature, parallelgc), true)
       DTRACE_INSTRUMENTED_OBJS += $(addprefix $(JVM_OUTPUTDIR)/objs/, \
-          psVMOperations.o \
+          vmPSOperations.o \
       )
     endif
 
     DTRACE_FLAGS := -64 -G
     DTRACE_CPP_FLAGS := -D_LP64
 
     # Make sure we run our selected compiler for preprocessing instead of letting
     # the dtrace tool pick it on it's own.
-    $(DTRACE_OBJ): $(JVM_OUTPUTDIR)/objs/dtrace.dt $(DTRACE_INSTRUMENTED_OBJS)
+    $(DTRACE_OBJ): $(JVM_OUTPUTDIR)/objs/dtrace.d $(DTRACE_INSTRUMENTED_OBJS)
         $(call LogInfo, Generating $(@F) from $(<F) and object files)
         $(call MakeDir, $(DTRACE_SUPPORT_DIR))
-        $(call ExecuteWithLog, $(DTRACE_SUPPORT_DIR)/$(@F).dt, \
-            ($(CPP) $(DTRACE_CPP_FLAGS) $< > $(DTRACE_SUPPORT_DIR)/$(@F).dt))
+        $(call ExecuteWithLog, $(DTRACE_SUPPORT_DIR)/$(@F).d, \
+            ($(CPP) $(DTRACE_CPP_FLAGS) $< > $(DTRACE_SUPPORT_DIR)/$(@F).d))
         $(call ExecuteWithLog, $@, $(DTRACE) $(DTRACE_FLAGS) -xlazyload -o $@ \
-            -s $(DTRACE_SUPPORT_DIR)/$(@F).dt $(sort $(DTRACE_INSTRUMENTED_OBJS)))
+            -s $(DTRACE_SUPPORT_DIR)/$(@F).d $(sort $(DTRACE_INSTRUMENTED_OBJS)))
 
     ############################################################################
     # Generate DTRACE_JHELPER_OBJ which is linked with libjvm.so.
 
     JHELPER_DTRACE_SRC := $(TOPDIR)/src/hotspot/os/solaris/dtrace/jhelper.d

@@ -126,16 +124,16 @@
     # Make sure we run our selected compiler for preprocessing instead of letting
     # the dtrace tool pick it on it's own.
     $(DTRACE_JHELPER_OBJ): $(JHELPER_DTRACE_SRC) $(JVM_OFFSETS_INDEX_H)
         $(call LogInfo, Running dtrace for $(<F))
         $(call MakeDir, $(DTRACE_SUPPORT_DIR))
-        $(call ExecuteWithLog, $(DTRACE_SUPPORT_DIR)/$(@F).dt, \
+        $(call ExecuteWithLog, $(DTRACE_SUPPORT_DIR)/$(@F).d, \
             ($(CPP) $(DTRACE_CPP_FLAGS) -I$(DTRACE_GENSRC_DIR) $^ \
-            > $(DTRACE_SUPPORT_DIR)/$(@F).dt))
+            > $(DTRACE_SUPPORT_DIR)/$(@F).d))
         $(call ExecuteWithLog, $@, $(DTRACE) $(DTRACE_FLAGS) -o $@ \
-            -s $(DTRACE_SUPPORT_DIR)/$(@F).dt)
-        ifeq ($(call isTargetCpuArch, sparc), true)
+            -s $(DTRACE_SUPPORT_DIR)/$(@F).d)
+        ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
           $(call ExecuteWithLog, $@.elfedit, $(ELFEDIT) $(call GetElfeditCommands) $@)
         endif
 
   endif
 endif
< prev index next >