|
Line
Link Here
|
|
-- a/Config.kmk |
|
|
|
Lines 3719-3729
Link Here
|
| 3719 |
$(if-expr $(intersects $(KBUILD_TARGET_ARCH),$(KBUILD_ARCHES_64)),-64,-32) \ |
3719 |
$(if-expr $(intersects $(KBUILD_TARGET_ARCH),$(KBUILD_ARCHES_64)),-64,-32) \ |
| 3720 |
-h --host-$(VBOX_HC_ARCH_BITS)-bit #-vvv |
3720 |
-h --host-$(VBOX_HC_ARCH_BITS)-bit #-vvv |
| 3721 |
define TOOL_VBoxTpG_DTRACE_HDR_CMDS |
3721 |
define TOOL_VBoxTpG_DTRACE_HDR_CMDS |
|
|
3722 |
$(QUIET)paxmark.sh -m "$(VBOX_VBOXTPG)" |
| 3722 |
$(QUIET)$(VBOX_VBOXTPG) $(flags) -o "$(out)" -s "$(source)" |
3723 |
$(QUIET)$(VBOX_VBOXTPG) $(flags) -o "$(out)" -s "$(source)" |
| 3723 |
endef |
3724 |
endef |
| 3724 |
TOOL_VBoxTpG_DTRACE_OBJ_NOT_NEEDED := |
3725 |
TOOL_VBoxTpG_DTRACE_OBJ_NOT_NEEDED := |
| 3725 |
TOOL_VBoxTpG_DTRACE_OBJ_FLAGS := -G --host-$(VBOX_HC_ARCH_BITS)-bit #-vvv |
3726 |
TOOL_VBoxTpG_DTRACE_OBJ_FLAGS := -G --host-$(VBOX_HC_ARCH_BITS)-bit #-vvv |
| 3726 |
define TOOL_VBoxTpG_DTRACE_OBJ_CMDS |
3727 |
define TOOL_VBoxTpG_DTRACE_OBJ_CMDS |
|
|
3728 |
$(QUIET)paxmark.sh -m "$(VBOX_VBOXTPG)" |
| 3727 |
$(QUIET)$(VBOX_VBOXTPG) \ |
3729 |
$(QUIET)$(VBOX_VBOXTPG) \ |
| 3728 |
$(if-expr $(intersects $(bld_trg_arch),$(KBUILD_ARCHES_64)),-64,-32) \ |
3730 |
$(if-expr $(intersects $(bld_trg_arch),$(KBUILD_ARCHES_64)),-64,-32) \ |
| 3729 |
$(flags) \ |
3731 |
$(flags) \ |
|
Lines 3738-3743
Link Here
|
| 3738 |
TOOL_VBoxTpG-Disabled_DTRACE_DEPORD = $(VBOX_VBOXTPG) |
3740 |
TOOL_VBoxTpG-Disabled_DTRACE_DEPORD = $(VBOX_VBOXTPG) |
| 3739 |
TOOL_VBoxTpG-Disabled_DTRACE_HDR_FLAGS := -h |
3741 |
TOOL_VBoxTpG-Disabled_DTRACE_HDR_FLAGS := -h |
| 3740 |
define TOOL_VBoxTpG-Disabled_DTRACE_HDR_CMDS |
3742 |
define TOOL_VBoxTpG-Disabled_DTRACE_HDR_CMDS |
|
|
3743 |
$(QUIET)paxmark.sh -m "$(VBOX_VBOXTPG)" |
| 3741 |
$(QUIET)$(VBOX_VBOXTPG) $(flags) -o "$(out)" -s "$(source)" |
3744 |
$(QUIET)$(VBOX_VBOXTPG) $(flags) -o "$(out)" -s "$(source)" |
| 3742 |
endef |
3745 |
endef |
| 3743 |
TOOL_VBoxTpG-Disabled_DTRACE_OBJ_NOT_NEEDED := $(KBUILD_OSES) |
3746 |
TOOL_VBoxTpG-Disabled_DTRACE_OBJ_NOT_NEEDED := $(KBUILD_OSES) |
|
Lines 3752-3757
Link Here
|
| 3752 |
TOOL_DTraceAndVBoxTpG_DTRACE_HDR_CMDS = |
3755 |
TOOL_DTraceAndVBoxTpG_DTRACE_HDR_CMDS = |
| 3753 |
define TOOL_DTraceAndVBoxTpG_DTRACE_HDR_CMDS |
3756 |
define TOOL_DTraceAndVBoxTpG_DTRACE_HDR_CMDS |
| 3754 |
$(TOOL_StandardDTrace_DTRACE_HDR_CMDS) |
3757 |
$(TOOL_StandardDTrace_DTRACE_HDR_CMDS) |
|
|
3758 |
$(QUIET)paxmark.sh -m "$(VBOX_VBOXTPG)" |
| 3755 |
$(QUIET)$(VBOX_VBOXTPG) --generate-wrapper-header --host-$(VBOX_HC_ARCH_BITS)-bit --ring-3-context \ |
3759 |
$(QUIET)$(VBOX_VBOXTPG) --generate-wrapper-header --host-$(VBOX_HC_ARCH_BITS)-bit --ring-3-context \ |
| 3756 |
$(filter-out -C, $(filter-out -h,$(flags))) \ |
3760 |
$(filter-out -C, $(filter-out -h,$(flags))) \ |
| 3757 |
-o "$(out).tmp" -s "$(source)" |
3761 |
-o "$(out).tmp" -s "$(source)" |
| 3758 |
-- a/src/VBox/VMM/Makefile.kmk |
|
|
|
Lines 795-800
Link Here
|
| 795 |
define def_vmm_lib_dtrace_preprocess |
795 |
define def_vmm_lib_dtrace_preprocess |
| 796 |
$$$$(VMMLibDTrace_0_OUTDIR)/$1: $2 $$(VBOX_VBOXCPP) | $$$$(dir $$$$@) |
796 |
$$$$(VMMLibDTrace_0_OUTDIR)/$1: $2 $$(VBOX_VBOXCPP) | $$$$(dir $$$$@) |
| 797 |
$$(QUIET)$$(call MSG_GENERATE,VMMLibDTrace,$$@,$$<) |
797 |
$$(QUIET)$$(call MSG_GENERATE,VMMLibDTrace,$$@,$$<) |
|
|
798 |
$$(QUIET)paxmark.sh -m "$(VBOX_VBOXCPP)" |
| 798 |
$$(QUIET)$(VBOX_VBOXCPP) -d \ |
799 |
$$(QUIET)$(VBOX_VBOXCPP) -d \ |
| 799 |
-D VBOX_FOR_DTRACE_LIB \ |
800 |
-D VBOX_FOR_DTRACE_LIB \ |
| 800 |
-D VBOX_FOR_DTRACE_LIB_$(toupper $(KBUILD_TARGET_ARCH)) \ |
801 |
-D VBOX_FOR_DTRACE_LIB_$(toupper $(KBUILD_TARGET_ARCH)) \ |
| 801 |
-- a/src/VBox/Main/Makefile.kmk |
|
|
|
Lines 522-527
Link Here
|
| 522 |
$$(VBoxSVC_0_OUTDIR)/USBIdDatabase.cpp: $$(USBIdDatabaseGenerator_1_TARGET) \ |
522 |
$$(VBoxSVC_0_OUTDIR)/USBIdDatabase.cpp: $$(USBIdDatabaseGenerator_1_TARGET) \ |
| 523 |
$(PATH_SUB_CURRENT)/src-server/usb.ids $(PATH_SUB_CURRENT)/src-server/custom.ids | $$(dir $$@) |
523 |
$(PATH_SUB_CURRENT)/src-server/usb.ids $(PATH_SUB_CURRENT)/src-server/custom.ids | $$(dir $$@) |
| 524 |
$(call MSG_GENERATE,USBIdDatabase,$@,$<) |
524 |
$(call MSG_GENERATE,USBIdDatabase,$@,$<) |
|
|
525 |
$(QUIET)paxmark.sh -m "$(USBIdDatabaseGenerator_1_TARGET)" |
| 525 |
$(QUIET)$(USBIdDatabaseGenerator_1_TARGET) -o "$@" $(filter %.ids,$^) |
526 |
$(QUIET)$(USBIdDatabaseGenerator_1_TARGET) -o "$@" $(filter %.ids,$^) |
| 526 |
|
527 |
|
| 527 |
BLDPROGS += USBIdDatabaseGenerator |
528 |
BLDPROGS += USBIdDatabaseGenerator |
