Changeset 40868 in vbox

Timestamp:

Apr 11, 2012 2:49:13 PM (12 years ago)

Author:

vboxsync

Message:

Config.kmk: Changed VBOXR0DRV a little on darwin to make 32-bit kexts link and load correctly with DTrace support enabled. Enabled DTrace on darwin.

File:

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

trunk/Config.kmk

@@ -617 +617 @@
 endif
 # Set this to enable kernel driver dtrace probes.
-if1of ($(KBUILD_TARGET), solaris)
+if1of ($(KBUILD_TARGET), darwin solaris)
  VBOX_WITH_DTRACE_R0DRV = 1
 endif
 # Set this to enable all kernel driver dtrace probes.
-if1of ($(KBUILD_TARGET), solaris)
+if1of ($(KBUILD_TARGET), darwin solaris)
  VBOX_WITH_NATIVE_DTRACE_R0DRV = 1
 endif
 # Set this to enable dtrace probes in platform agnostic kernel code.
-if1of ($(KBUILD_TARGET), solaris)
+if1of ($(KBUILD_TARGET), darwin solaris)
  VBOX_WITH_DTRACE_R0 = 1
 endif
@@ -2936 +2936 @@
  TEMPLATE_VBOXR0DRV_DTRACETOOL         = VBoxTpG
  TEMPLATE_VBOXR0DRV_DEFS              += VBOX_WITH_DTRACE VBOX_WITH_DTRACE_R0DRV
- ifdef VBOX_WITH_NATIVE_DTRACE_R0DRV                                                              
+ ifdef VBOX_WITH_NATIVE_DTRACE_R0DRV
   TEMPLATE_VBOXR0DRV_DEFS             += VBOX_WITH_NATIVE_DTRACE_R0DRV
  endif
@@ -2976 +2976 @@
 TEMPLATE_VBOXR0DRV_TOOL                = $(VBOX_GCC_TOOL)
 TEMPLATE_VBOXR0DRV_INSTTYPE.linux      = none
-TEMPLATE_VBOXR0DRV_DEFS               += __KERNEL__ MODULE 
+TEMPLATE_VBOXR0DRV_DEFS               += __KERNEL__ MODULE
 TEMPLATE_VBOXR0DRV_INCS                = $(VBOX_LINUX_INCS)
 TEMPLATE_VBOXR0DRV_CFLAGS              = -nostdinc -iwithprefix include $(VBOX_LINUX_INCLUDE) \
@@ -3029 +3029 @@
 TEMPLATE_VBOXR0DRV_CFLAGS.amd64        = -m64 -mkernel -mno-red-zone -gdwarf-2
 TEMPLATE_VBOXR0DRV_CFLAGS.x86          = -m32 -static
-TEMPLATE_VBOXR0DRV_LDFLAGS             =  $(filter-out $(VBOX_DARWIN_NO_COMPACT_LINKEDIT),$(VBOX_DARWIN_DEF_SDK_LDFLAGS)) -static -nostdlib -r -Wl,-Y,1455 -keep_private_extern
-TEMPLATE_VBOXR0DRV_LDFLAGS.amd64       = -m64 -Xlinker -kext
+TEMPLATE_VBOXR0DRV_LDFLAGS             =  $(filter-out $(VBOX_DARWIN_NO_COMPACT_LINKEDIT),$(VBOX_DARWIN_DEF_SDK_LDFLAGS)) \
+        -nostdlib -Wl,-kext,-new_linker -Wl,-Y,1455 -keep_private_extern
+TEMPLATE_VBOXR0DRV_LDFLAGS.amd64       = -m64
 TEMPLATE_VBOXR0DRV_LDFLAGS.x86         = -m32
 TEMPLATE_VBOXR0DRV_LIBS                = kmodc++ kmod cc_kext cpp_kext $(VBOX_GCC_LIBGCC)