Changeset 40828 in vbox for trunk

Timestamp:

Apr 8, 2012 6:46:03 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

77343

Message:

Config.kmk: Section merging for VBoxTpG support on windows.

File:

• trunk/Config.kmk (modified) (3 diffs)

trunk/Config.kmk

@@ -2848 +2848 @@
 TEMPLATE_VBoxR0_CFLAGS              = $(TEMPLATE_VBoxR0_CXXFLAGS)
 TEMPLATE_VBoxR0_LDFLAGS             = -Driver -Subsystem:NATIVE -Incremental:NO -Align:4096 -MapInfo:Exports -NoD $(VBOX_VCC_LD_WERR) -Debug
+ ifdef VBOX_WITH_DTRACE_R0
+TEMPLATE_VBoxR0_LDFLAGS            += -Merge:VTGPrLc.Data=VTGPrLc.Begin -Merge:VTGPrLc.End=VTGPrLc.Begin -Merge:VTGPrLc.Begin=VTGObj
+ endif
 TEMPLATE_VBoxR0_LIBS                = \
         $(PATH_STAGE_LIB)/RuntimeR0Stub$(VBOX_SUFF_LIB)
@@ -2953 +2956 @@
  TEMPLATE_VBOXR0DRV_CFLAGS             = $(TEMPLATE_VBOXR0DRV_CXXFLAGS)
  TEMPLATE_VBOXR0DRV_LDFLAGS            = -Driver -Subsystem:NATIVE -Incremental:NO -Align:4096 -MapInfo:Exports -NoD -Debug
+ ifdef VBOX_WITH_DTRACE_R0DRV
+  TEMPLATE_VBOXR0DRV_LDFLAGS          += -Merge:VTGPrLc.Data=VTGPrLc.Begin -Merge:VTGPrLc.End=VTGPrLc.Begin -Merge:VTGPrLc.Begin=VTGObj
+ endif
  TEMPLATE_VBOXR0DRV_POST_CMDS          = $(VBOX_SIGN_DRIVER_CMDS)
  ifdef VBOX_USE_VCC100 # HACK ALERT!
@@ -3224 +3230 @@
         /DISALLOWLIB:msvcrt$(VBOX_VCC_CRT_TYPE_N).lib \
         /DISALLOWLIB:msvcprt$(VBOX_VCC_CRT_TYPE_N).lib
+ ifdef VBOX_WITH_DTRACE_R3
+  TEMPLATE_VBOXR3EXE_LDFLAGS          += -Merge:VTGPrLc.Data=VTGPrLc.Begin -Merge:VTGPrLc.End=VTGPrLc.Begin -Merge:VTGPrLc.Begin=VTGObj
+ endif
 
  TEMPLATE_VBOXR3EXE_LIBS.x86           = \