Index: /trunk/Config.kmk
===================================================================
--- /trunk/Config.kmk	(revision 92508)
+++ /trunk/Config.kmk	(revision 92509)
@@ -5441,4 +5441,5 @@
  TEMPLATE_VBOXR0DRV_CFLAGS    += -include $(PATH_ROOT)/include/VBox/SUPDrvMangling.h
  TEMPLATE_VBOXR0DRV_CXXFLAGS  += -include $(PATH_ROOT)/include/VBox/SUPDrvMangling.h
+ TEMPLATE_VBOXR0DRV_ASMDEFS   += RT_MANGLER_PREFIX=VBoxHost_
 endif
 
@@ -8111,4 +8112,5 @@
  TEMPLATE_VBOXGUESTR0_CFLAGS     = $(patsubst %/VBox/SUPDrvMangling.h,%/VBox/VBoxGuestMangling.h,$(TEMPLATE_VBOXR0DRV_CFLAGS))
  TEMPLATE_VBOXGUESTR0_CXXFLAGS   = $(patsubst %/VBox/SUPDrvMangling.h,%/VBox/VBoxGuestMangling.h,$(TEMPLATE_VBOXR0DRV_CXXFLAGS))
+ TEMPLATE_VBOXGUESTR0_ASMDEFS    = $(patsubst RT_MANGLER_PREFIX=%,RT_MANGLER_PREFIX=VBoxGuest_,$(TEMPLATE_VBOXR0DRV_ASMDEFS))
 endif
 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC120" # Do not use SSE so the binaries might works on NT4 and earlier.
Index: /trunk/include/iprt/asmdefs.mac
===================================================================
--- /trunk/include/iprt/asmdefs.mac	(revision 92508)
+++ /trunk/include/iprt/asmdefs.mac	(revision 92509)
@@ -363,5 +363,9 @@
 ; This is handy when you've got some kind of template code.
 %ifndef NAME_OVERLOAD
- %define NAME_OVERLOAD(name) name
+ %ifdef RT_MANGLER_PREFIX
+  %define NAME_OVERLOAD(name) RT_MANGLER_PREFIX %+ name
+ %else
+  %define NAME_OVERLOAD(name) name
+ %endif
 %endif