Changeset 40517 in vbox for trunk/src/VBox/Devices

Timestamp:

Mar 17, 2012 7:30:54 PM (13 years ago)

Author:

vboxsync

Message:

kBuild 2566 -> 2567: dtrace support.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox/Devices/Makefile.kmk (modified) (2 diffs)
• src/VBox/Devices/VMMDev/VMMDevHGCM.cpp (modified) (1 diff)
• src/VBox/Devices/build/VBoxDD.d (moved) (moved from trunk/src/VBox/Devices/build/VBoxDD-dtrace.d )

trunk/src/VBox/Devices/Makefile.kmk

@@ -229 +229 @@
 
  ifdef VBOX_WITH_DTRACE_R3
-  if1of ($(KBUILD_TARGET), solaris)
-   VBoxDD_SOURCES       += $(DevicesR3_0_OUTDIR)/VBoxDD-dtrace.o
-  endif
+  VBoxDD_USES           += dtrace
+  VBoxDD_SOURCES        += build/VBoxDD.d
  endif
 
@@ -471 +470 @@
 
  ifdef VBOX_WITH_DTRACE_R3
-  DevicesR3_DEFS          += VBOX_WITH_DTRACE
-  DevicesR3_INCS          += $(DevicesR3_0_OUTDIR)
-  DevicesR3_INTERMEDIATES += $(DevicesR3_0_OUTDIR)/VBoxDD-dtrace.h
-  $$(DevicesR3_0_OUTDIR)/VBoxDD-dtrace.h: $(PATH_SUB_CURRENT)/build/VBoxDD-dtrace.d | $$(dir $$@)
-        dtrace -C -h -o $@ -s $<
-
-  if1of ($(KBUILD_TARGET), solaris)
-   DevicesR3_SOURCES      += $(DevicesR3_0_OUTDIR)/VBoxDD-dtrace.o
-   DevicesR3_CLEANS       += $(DevicesR3_0_OUTDIR)/VBoxDD-dtrace.o
-   $$(DevicesR3_0_OUTDIR)/VBoxDD-dtrace.o: $(PATH_SUB_CURRENT)/build/VBoxDD-dtrace.d $$(filter-out %/VBoxDD-dtrace.o,$$(DevicesR3_2_OBJS)) | $$(dir $$@)
-        dtrace -C -G $(if-expr $(KBUILD_TARGET_ARCH) == amd64,-64,-32) -o $@ -s $< $(filter-out %/VBoxDD-dtrace.o,$(DevicesR3_2_OBJS))
-  endif
+  DevicesR3_DEFS        += VBOX_WITH_DTRACE
+  DevicesR3_USES        += dtrace
+  DevicesR3_SOURCES     += build/VBoxDD.d
  endif
 

trunk/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp

@@ -32 +32 @@
 
 #ifdef VBOX_WITH_DTRACE
-# include "VBoxDD-dtrace.h"
+# include "dtrace/VBoxDD.h"
 #else
 # define VBOXDD_HGCMCALL_ENTER(a,b,c,d)             do { } while (0)