Changeset 98397 in vbox

Timestamp:

Feb 1, 2023 2:44:15 PM (2 years ago)

Author:

vboxsync

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

155641

Message:

/Config.kmk: Automatic scm cleanups. bugref:10348

File:

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

trunk/Config.kmk

@@ -174 +174 @@
 VBOX_PATH_ADDITIONS_ISO = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_ISO))
 VBOX_PATH_ADDITIONS_LIB = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_LIB))
-VBOX_PATH_EXTPACK_PUEL= $(patsubst %/,%,$(PATH_STAGE)/$(INST_EXTPACK_PUEL))
+VBOX_PATH_EXTPACK_PUEL = $(patsubst %/,%,$(PATH_STAGE)/$(INST_EXTPACK_PUEL))
 VBOX_PATH_PACKAGES    = $(patsubst %/,%,$(PATH_STAGE)/$(INST_PACKAGES))
 VBOX_PATH_TOOLS       = $(patsubst %/,%,$(PATH_STAGE)/$(VBOX_INST_TOOLS))
@@ -193 +193 @@
 # Notify about important kBuild updates.
 #
-if  $(KBUILD_VERSION_MAJOR) == 0 \
- && (   $(KBUILD_VERSION_MINOR) >= 2 \
-     || (   $(KBUILD_VERSION_MINOR) == 1 \
-         && $(KBUILD_VERSION_PATCH) >= 999))
+if   $(KBUILD_VERSION_MAJOR) == 0 \
+  && (   $(KBUILD_VERSION_MINOR) >= 2 \
+      || (   $(KBUILD_VERSION_MINOR) == 1 \
+  && $(KBUILD_VERSION_PATCH) >= 999))
  VBOX_MIN_KMK_REVISION        := 3093
  VBOX_MIN_KBUILD_KMK_REVISION := $(if-expr "$(KBUILD_HOST)" == "win",3097,$(if-expr "$(KBUILD_HOST).$(KBUILD_HOST_ARCH)" == "solaris.sparc64",2511,3074))
@@ -264 +264 @@
 # @returns 1 if true, 0 if false.  For use with 'if'.
 VBOX_VERSION_PREREQ = $(expr $(call VBOX_FULL_VERSION_MAKE,$(VBOX_VERSION_MAJOR),$(VBOX_VERSION_MINOR),$(VBOX_VERSION_BUILD)) \
-                             >= $(call VBOX_FULL_VERSION_MAKE,$1,$2,$3))
+        >= $(call VBOX_FULL_VERSION_MAKE,$1,$2,$3))
 
 
 # Force the additions.sh script to get an exact additions build when we're doing the release.
 if $(VBOX_VERSION_BUILD) % 2 == 0
-  ifeq ($(VBOX_VERSION_PRERELEASE),)
-    VBOX_RELEASE_EXACT_MATCH=1
-  endif
+ ifeq ($(VBOX_VERSION_PRERELEASE),)
+  VBOX_RELEASE_EXACT_MATCH  = 1
+ endif
 endif
 ifneq ($(VBOX_RELEASE_EXACT_MATCH),)
@@ -307 +307 @@
 #
 ifeq ($(KBUILD_TARGET),win)
-  VBOX_PACKAGE_OS = WINDOWS
+ VBOX_PACKAGE_OS  = WINDOWS
 else ifeq ($(KBUILD_TARGET),linux)
-  VBOX_PACKAGE_OS = LINUX
+ VBOX_PACKAGE_OS  = LINUX
 else ifeq ($(KBUILD_TARGET),darwin)
-  VBOX_PACKAGE_OS = DARWIN
+ VBOX_PACKAGE_OS  = DARWIN
 else ifeq ($(KBUILD_TARGET),solaris)
-  VBOX_PACKAGE_OS = SOLARIS
+ VBOX_PACKAGE_OS  = SOLARIS
 else ifeq ($(KBUILD_TARGET),os2)
-  VBOX_PACKAGE_OS = OS2
+ VBOX_PACKAGE_OS  = OS2
 else ifeq ($(KBUILD_TARGET),haiku)
-  VBOX_PACKAGE_OS = HAIKU
+ VBOX_PACKAGE_OS  = HAIKU
 else if1of ($(KBUILD_TARGET), dragonfly freebsd netbsd openbsd)
-  VBOX_PACKAGE_OS = BSD
+ VBOX_PACKAGE_OS  = BSD
 else
-  $(error Cannot determine VBOX_PACKAGE_OS)
+ $(error Cannot determine VBOX_PACKAGE_OS)
 endif
 ifeq ($(KBUILD_TARGET_ARCH),x86)
-  VBOX_PACKAGE_ARCH = 32BITS
+ VBOX_PACKAGE_ARCH  = 32BITS
 else
-  VBOX_PACKAGE_ARCH = 64BITS
+ VBOX_PACKAGE_ARCH  = 64BITS
 endif
 # distribution, mostly for Linux/Solaris where we support different distributions
@@ -350 +350 @@
 
 # Indicate VBOX_ONLY build if any of the VBOX_ONLY_* variables are set.
-VBOX_ONLY_BUILD := $(strip $(foreach x, ADDITIONS DOCS EXTPACKS SDK VALIDATIONKIT\
+VBOX_ONLY_BUILD := $(strip $(foreach x, ADDITIONS DOCS EXTPACKS SDK VALIDATIONKIT \
         , $(if-expr defined(VBOX_ONLY_$(x)),VBOX_ONLY_$(x))))
 if $(words $(VBOX_ONLY_BUILD)) > 1
@@ -359 +359 @@
 ifeq ($(KBUILD_HOST),darwin)
  if "$(KBUILD_TARGET_ARCH)" == "arm64"
-VBOX_WITH_EVEN_NEWER_XCODE := 1
+  VBOX_WITH_EVEN_NEWER_XCODE := 1
  else if !defined(VBOX_WITH_EVEN_NEWER_XCODE) && !defined(VBOX_WITHOUT_EVEN_NEWER_XCODE) && !defined(VBOX_WITH_NEW_XCODE) && $(KBUILD_HOST_VERSION_MAJOR) >= 16 # (OS X 10.12 Sierra)
-VBOX_WITH_EVEN_NEWER_XCODE := 1
+  VBOX_WITH_EVEN_NEWER_XCODE := 1
  else if !defined(VBOX_WITH_NEW_XCODE) && !defined(VBOX_WITHOUT_NEW_XCODE) && $(KBUILD_HOST_VERSION_MAJOR) >= 13 # (OS X 10.9 Mavericks)
-VBOX_WITH_NEW_XCODE := 1
+  VBOX_WITH_NEW_XCODE := 1
  endif
 endif
@@ -425 +425 @@
 # VBOX_ONLY_RPM_ADDITIONS = 1
 ifdef VBOX_ONLY_RPM_ADDITIONS
- VBOX_ONLY_ADDITIONS=1
- VBOX_ONLY_ADDITIONS_WITHOUT_RTISOMAKER=1
+ VBOX_ONLY_ADDITIONS = 1
+ VBOX_ONLY_ADDITIONS_WITHOUT_RTISOMAKER = 1
  # We build the RPMs using public sources.
- VBOX_OSE=1
+ VBOX_OSE = 1
  # We want to re-use parts of the packing pass, but not all.
- VBOX_WITHOUT_LINUX_GUEST_PACKAGE=1
- VBOX_WITHOUT_ADDITIONS_ISO=1
+ VBOX_WITHOUT_LINUX_GUEST_PACKAGE = 1
+ VBOX_WITHOUT_ADDITIONS_ISO = 1
 endif
 
@@ -605 +605 @@
 # Enable vmsvga (svga2) graphics device variant, 3D part, VGPU10 DX commands
 ifdef VBOX_WITH_VMSVGA3D
- VBOX_WITH_VMSVGA3D_DX=1
+ VBOX_WITH_VMSVGA3D_DX = 1
  # Enable DXVK library for supporting VGPU10 DX on non Windows hosts
  if1of ($(KBUILD_TARGET), linux)
@@ -629 +629 @@
  VBOX_WITH_VDMA = 1
 else ifdef VBOX_WITH_VDMA
-  undefine VBOX_WITH_VDMA
+ undefine VBOX_WITH_VDMA
 endif
 # Gallium based WDDM driver
@@ -665 +665 @@
 ifdef VBOX_WITH_USB
  VBOX_WITH_VUSB = 1
- VBOX_WITH_XHCI_IMPL=1
+ VBOX_WITH_XHCI_IMPL = 1
 endif
 ifdef VBOX_WITH_EHCI
@@ -775 +775 @@
 # Whether to enable message translation in VBoxManage.
 #ifndef VBOX_ONLY_BUILD
- VBOX_WITH_VBOXMANAGE_NLS = 1
+VBOX_WITH_VBOXMANAGE_NLS  = 1
 #endif
 # Set this to prefix all C symbols in XPCOM, to avoid dynamic linking problems
@@ -1006 +1006 @@
 if1of ($(KBUILD_TARGET), darwin linux solaris)
  if1of ($(KBUILD_TARGET_ARCH), x86 amd64) ## @todo bugref:9898
-VBOX_WITH_DTRACE_R3 := 1
-VBOX_WITH_DTRACE_R3_MAIN := 1
+  VBOX_WITH_DTRACE_R3 := 1
+  VBOX_WITH_DTRACE_R3_MAIN := 1
  endif
 endif
@@ -1013 +1013 @@
 if1of ($(KBUILD_TARGET), darwin solaris)
  if1of ($(KBUILD_TARGET_ARCH), x86 amd64) ## @todo bugref:9898
-VBOX_WITH_DTRACE_R0DRV := 1
+  VBOX_WITH_DTRACE_R0DRV := 1
  endif
 endif
@@ -1019 +1019 @@
 ifn1of ($(KBUILD_TARGET), os2)
  if1of ($(KBUILD_TARGET_ARCH), x86 amd64) ## @todo bugref:9898
-VBOX_WITH_DTRACE_R0 := 1
+  VBOX_WITH_DTRACE_R0 := 1
  endif
 endif
@@ -1025 +1025 @@
 if1of ($(KBUILD_TARGET), linux solaris)
  if1of ($(KBUILD_TARGET_ARCH), x86 amd64) ## @todo bugref:9898
-VBOX_WITH_DTRACE_RC := 1
+  VBOX_WITH_DTRACE_RC := 1
  endif
 endif
@@ -1033 +1033 @@
 if1of ($(KBUILD_TARGET), darwin solaris)
  if1of ($(KBUILD_TARGET_ARCH), x86 amd64) ## @todo bugref:9898
-VBOX_WITH_NATIVE_DTRACE := 1
+  VBOX_WITH_NATIVE_DTRACE := 1
  endif
 endif
@@ -1183 +1183 @@
 # when multiple VBoxSVC starts for the same user
 # it is enabled for windows build only
-ifeq  ($(KBUILD_TARGET),win)
+ifeq ($(KBUILD_TARGET),win)
  VBOX_WITH_SDS = 1
 endif
@@ -1233 +1233 @@
 ifdef VBOX_QUICK
  # undefine variables by assigning blank.
- VBOX_WITH_ADDITIONS=
- VBOX_WITH_VALIDATIONKIT=
- VBOX_WITH_TESTCASES=
- VBOX_WITH_VBOXSDL=
- VBOX_WITH_HEADLESS=
- VBOX_WITH_VRDP=
- VBOX_WITH_VRDP_RDESKTOP=
- VBOX_WITH_DOCS=
- VBOX_WITH_WEBSERVICES=
- VBOX_WITH_32_ON_64_MAIN_API=
+ VBOX_WITH_ADDITIONS =
+ VBOX_WITH_VALIDATIONKIT =
+ VBOX_WITH_TESTCASES =
+ VBOX_WITH_VBOXSDL =
+ VBOX_WITH_HEADLESS =
+ VBOX_WITH_VRDP =
+ VBOX_WITH_VRDP_RDESKTOP =
+ VBOX_WITH_DOCS =
+ VBOX_WITH_WEBSERVICES =
+ VBOX_WITH_32_ON_64_MAIN_API =
 endif # VBOX_QUICK
 
 # Only AMD64 is supported for the main product, so disable most of the other bits.
 ifn1of ($(KBUILD_TARGET_ARCH), $(VBOX_SUPPORTED_HOST_ARCHS))
- VBOX_WITH_MAIN=
- VBOX_WITH_QTGUI=
- VBOX_WITH_VBOXSDL=
- VBOX_WITH_VBOXHEADLESS=
- VBOX_WITH_WEBSERVICES=
- VBOX_WITH_DEBUGGER_GUI=
+ VBOX_WITH_MAIN =
+ VBOX_WITH_QTGUI =
+ VBOX_WITH_VBOXSDL =
+ VBOX_WITH_VBOXHEADLESS =
+ VBOX_WITH_WEBSERVICES =
+ VBOX_WITH_DEBUGGER_GUI =
 endif
 
 ifeq ($(KBUILD_TARGET),darwin)
- VBOX_WITH_VRDP_RDESKTOP=
+ VBOX_WITH_VRDP_RDESKTOP =
  # Permanent (no working SDL).
- VBOX_WITH_VBOXSDL=
+ VBOX_WITH_VBOXSDL =
 
  ifeq ($(KBUILD_TARGET_ARCH),arm64)
@@ -1281 +1281 @@
 
 ifeq ($(KBUILD_TARGET),freebsd)
- VBOX_WITH_DOCS=
+ VBOX_WITH_DOCS =
 endif
 
 ifeq ($(KBUILD_TARGET),haiku)
- VBOX_WITH_VRDP_RDESKTOP=
+ VBOX_WITH_VRDP_RDESKTOP =
  # Permanent (no working SDL).
- VBOX_WITH_VBOXSDL=
- VBOX_WITH_DOCS=
- VBOX_WITH_VBOXDRV=
- VBOX_WITH_VRDP=
- VBOX_WITH_HEADLESS=
- VBOX_WITH_VBOXSDL=
- VBOX_WITH_QTGUI=
-# VBOX_WITH_MAIN=
- VBOX_WITH_DOCS=
- VBOX_WITH_ISCSI=
- VBOX_WITH_INIP=
- VBOX_WITH_INTERNAL_NETWORKING=
- VBOX_WITH_PDM_ASYNC_COMPLETION=
- VBOX_WITH_HARDENING=
+ VBOX_WITH_VBOXSDL =
+ VBOX_WITH_DOCS =
+ VBOX_WITH_VBOXDRV =
+ VBOX_WITH_VRDP =
+ VBOX_WITH_HEADLESS =
+ VBOX_WITH_VBOXSDL =
+ VBOX_WITH_QTGUI =
+ # VBOX_WITH_MAIN=
+ VBOX_WITH_DOCS =
+ VBOX_WITH_ISCSI =
+ VBOX_WITH_INIP =
+ VBOX_WITH_INTERNAL_NETWORKING =
+ VBOX_WITH_PDM_ASYNC_COMPLETION =
+ VBOX_WITH_HARDENING =
 endif
 
 
 ifeq ($(KBUILD_TARGET),os2)
- VBOX_WITH_WEBSERVICES=
- VBOX_WITH_INSTALLER=
- VBOX_WITH_VRDP_AUTHMOD=
- VBOX_WITH_VRDP_RDESKTOP=
- VBOX_WITH_VALIDATIONKIT=
- VBOX_WITH_QTGUI=
- VBOX_WITH_USB=
- VBOX_WITH_EHCI=
- VBOX_WITH_DOCS=
- VBOX_WITH_PDM_ASYNC_COMPLETION=
- VBOX_WITH_HARDENING=
+ VBOX_WITH_WEBSERVICES =
+ VBOX_WITH_INSTALLER =
+ VBOX_WITH_VRDP_AUTHMOD =
+ VBOX_WITH_VRDP_RDESKTOP =
+ VBOX_WITH_VALIDATIONKIT =
+ VBOX_WITH_QTGUI =
+ VBOX_WITH_USB =
+ VBOX_WITH_EHCI =
+ VBOX_WITH_DOCS =
+ VBOX_WITH_PDM_ASYNC_COMPLETION =
+ VBOX_WITH_HARDENING =
 endif
 
 ifeq ($(KBUILD_TARGET),win)
- VBOX_WITH_VRDP_RDESKTOP=
+ VBOX_WITH_VRDP_RDESKTOP =
 endif
 
 ifn1of ($(KBUILD_TARGET_ARCH), x86 amd64 arm64)
- VBOX_WITH_ADDITION_DRIVERS=
- VBOX_WITH_DEBUGGER=
- VBOX_WITH_DOCS=
- VBOX_WITH_EHCI=
- VBOX_WITH_HARDENING=
- VBOX_WITH_HEADLESS=
- VBOX_WITH_HGCM=
- VBOX_WITH_HGSMI=
- VBOX_WITH_INIP=
- VBOX_WITH_INSTALLER=
- VBOX_WITH_INTERNAL_NETWORKING=
- VBOX_WITH_ISCSI=
- VBOX_WITH_MAIN=
- VBOX_WITH_PDM_ASYNC_COMPLETION=
- VBOX_WITH_QTGUI=
- VBOX_WITH_RAW_MODE=
- VBOX_WITH_VALIDATIONKIT=
- VBOX_WITH_USB=
- VBOX_WITH_VBOXDRV=
- VBOX_WITH_VBOXSDL=
- VBOX_WITH_WEBSERVICES=
- VBOX_WITH_XPCOM=
- VBOX_WITHOUT_HARDENING=1
+ VBOX_WITH_ADDITION_DRIVERS =
+ VBOX_WITH_DEBUGGER =
+ VBOX_WITH_DOCS =
+ VBOX_WITH_EHCI =
+ VBOX_WITH_HARDENING =
+ VBOX_WITH_HEADLESS =
+ VBOX_WITH_HGCM =
+ VBOX_WITH_HGSMI =
+ VBOX_WITH_INIP =
+ VBOX_WITH_INSTALLER =
+ VBOX_WITH_INTERNAL_NETWORKING =
+ VBOX_WITH_ISCSI =
+ VBOX_WITH_MAIN =
+ VBOX_WITH_PDM_ASYNC_COMPLETION =
+ VBOX_WITH_QTGUI =
+ VBOX_WITH_RAW_MODE =
+ VBOX_WITH_VALIDATIONKIT =
+ VBOX_WITH_USB =
+ VBOX_WITH_VBOXDRV =
+ VBOX_WITH_VBOXSDL =
+ VBOX_WITH_WEBSERVICES =
+ VBOX_WITH_XPCOM =
+ VBOX_WITHOUT_HARDENING = 1
  # remove later:
- VBOX_WITH_VRDP=
- VBOX_WITH_VRDP_AUTHMOD=
- VBOX_WITH_VRDP_RDESKTOP=
+ VBOX_WITH_VRDP =
+ VBOX_WITH_VRDP_AUTHMOD =
+ VBOX_WITH_VRDP_RDESKTOP =
 endif
 
@@ -1396 +1396 @@
 # Indicate VBOX_ONLY build if any of the VBOX_ONLY_* variables are set.
 #
-VBOX_ONLY_BUILD_NEW := $(strip $(foreach x, ADDITIONS DOCS EXTPACKS SDK VALIDATIONKIT\
+VBOX_ONLY_BUILD_NEW := $(strip $(foreach x, ADDITIONS DOCS EXTPACKS SDK VALIDATIONKIT \
         , $(if-expr defined(VBOX_ONLY_$(x)),VBOX_ONLY_$(x))))
 ifneq ($(VBOX_ONLY_BUILD),$(VBOX_ONLY_BUILD_NEW))
@@ -1431 +1431 @@
 #
 ifdef VBOX_OSE
- VBOX_WITH_VRDP=
- VBOX_WITH_USB_VIDEO_IMPL=
- VBOX_WITH_NVME_IMPL=
- VBOX_WITH_EXTPACK_PUEL=
- VBOX_WITH_EXTPACK_PUEL_BUILD=
- VBOX_WITH_PCI_PASSTHROUGH_IMPL=
- VBOX_WITH_OS2_ADDITIONS_BIN=
- VBOX_WITH_LIBSSH=
+ VBOX_WITH_VRDP =
+ VBOX_WITH_USB_VIDEO_IMPL =
+ VBOX_WITH_NVME_IMPL =
+ VBOX_WITH_EXTPACK_PUEL =
+ VBOX_WITH_EXTPACK_PUEL_BUILD =
+ VBOX_WITH_PCI_PASSTHROUGH_IMPL =
+ VBOX_WITH_OS2_ADDITIONS_BIN =
+ VBOX_WITH_LIBSSH =
  # not yet
- VBOX_WITH_PLUGIN_CRYPT=
- VBOX_WITH_DRAG_AND_DROP_PROMISES=
+ VBOX_WITH_PLUGIN_CRYPT =
+ VBOX_WITH_DRAG_AND_DROP_PROMISES =
  ifn1of ($(KBUILD_TARGET), linux)
-  VBOX_WITH_DOCS=
-  VBOX_WITH_DOCS_PACKING=
+  VBOX_WITH_DOCS =
+  VBOX_WITH_DOCS_PACKING =
  endif
  if1of ($(KBUILD_TARGET), solaris)
-  VBOX_WITH_32_ON_64_MAIN_API=
+  VBOX_WITH_32_ON_64_MAIN_API =
  endif
  if1of ($(KBUILD_TARGET), win)
   # tar/gzip uncommon on Windows
-  VBOX_WITH_EXTPACK_VBOXDTRACE=
+  VBOX_WITH_EXTPACK_VBOXDTRACE =
  endif
  # Enable any translations in OSE, even partial ones.
@@ -1457 +1457 @@
   VBOX_WITH_DOCS_TRANSLATIONS = 1
  endif
- VBOX_WITH_INTEL_PXE=
+ VBOX_WITH_INTEL_PXE =
  # Disable for OSE, requires snv_159+.
- VBOX_WITH_NETFLT_CROSSBOW=
+ VBOX_WITH_NETFLT_CROSSBOW =
  ifn1of ($(KBUILD_TARGET), darwin linux solaris win)
-  VBOX_WITH_INSTALLER=
+  VBOX_WITH_INSTALLER =
  endif
  if1of ($(KBUILD_TARGET), win)
   # Undefine codec libraries which are not needed.
-  VBOX_WITH_LIBVPX=
-  VBOX_WITH_LIBVORBIS=
-  VBOX_WITH_LIBOGG=
+  VBOX_WITH_LIBVPX =
+  VBOX_WITH_LIBVORBIS =
+  VBOX_WITH_LIBOGG =
   # Disable recording (with audio support).
-  VBOX_WITH_RECORDING=
-  VBOX_WITH_AUDIO_RECORDING=
+  VBOX_WITH_RECORDING =
+  VBOX_WITH_AUDIO_RECORDING =
  endif
  # branding
@@ -1503 +1503 @@
 #
 ifdef VBOX_WITHOUT_HARDENING
- VBOX_WITH_HARDENING=
+ VBOX_WITH_HARDENING =
  ifeq ($(VBOX_WITH_HARDENING),)
-  VBOX_PATH_APP_PRIVATE=
-  VBOX_PATH_APP_PRIVATE_ARCH=
-  VBOX_PATH_APP_PRIVATE_ARCH_TOP=
-  VBOX_PATH_SHARED_LIBS=
-  VBOX_PATH_APP_DOCS=
-  VBOX_WITH_RUNPATH=
+  VBOX_PATH_APP_PRIVATE =
+  VBOX_PATH_APP_PRIVATE_ARCH =
+  VBOX_PATH_APP_PRIVATE_ARCH_TOP =
+  VBOX_PATH_SHARED_LIBS =
+  VBOX_PATH_APP_DOCS =
+  VBOX_WITH_RUNPATH =
   if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # duplicated up above
    VBOX_WITH_ORIGIN = 1
@@ -1567 +1567 @@
 #
 ifdef VBOX_HEADLESS
- VBOX_WITH_QTGUI=
- VBOX_WITH_VBOXSDL=
- VBOX_WITH_VRDP_RDESKTOP=
+ VBOX_WITH_QTGUI =
+ VBOX_WITH_VBOXSDL =
+ VBOX_WITH_VRDP_RDESKTOP =
 endif
 
@@ -1576 +1576 @@
 #
 ifndef VBOX_WITH_MAIN
- VBOX_WITH_VBOXSDL=
- VBOX_WITH_QTGUI=
- VBOX_WITH_DEBUGGER_GUI=
- VBOX_WITH_HEADLESS=
+ VBOX_WITH_VBOXSDL =
+ VBOX_WITH_QTGUI =
+ VBOX_WITH_DEBUGGER_GUI =
+ VBOX_WITH_HEADLESS =
  ifdef VBOX_ONLY_DOCS
   $(error Oh, does VBOX_ONLY_DOCS actually end up here. sweet.)
  endif
- VBOX_WITH_DOCS=
+ VBOX_WITH_DOCS =
 endif
 
@@ -1604 +1604 @@
 #
 ifdef VBOX_OSE
-# This can be overridden (e.g. in LocalConfig.kmk) by whoever publishes a set
-# of VirtualBox binaries.  We request though that you always use something that
-# clearly identifies your build and makes it clear that it is not one done by
-# the VirtualBox team.
+ # This can be overridden (e.g. in LocalConfig.kmk) by whoever publishes a set
+ # of VirtualBox binaries.  We request though that you always use something that
+ # clearly identifies your build and makes it clear that it is not one done by
+ # the VirtualBox team.
  VBOX_BUILD_PUBLISHER ?= _OSE
 endif
@@ -1614 +1614 @@
 # Changed with every new version, so beware!
 if $(VBOX_VERSION_BUILD) < 51
-  VBOX_API_VERSION          = $(VBOX_VERSION_MAJOR)_$(VBOX_VERSION_MINOR)
+ VBOX_API_VERSION           = $(VBOX_VERSION_MAJOR)_$(VBOX_VERSION_MINOR)
 else
-  VBOX_API_VERSION          = $(VBOX_VERSION_MAJOR)_$(expr $(VBOX_VERSION_MINOR) + 1)
+ VBOX_API_VERSION           = $(VBOX_VERSION_MAJOR)_$(expr $(VBOX_VERSION_MINOR) + 1)
 endif
 VBOX_API_SUFFIX             = _$(VBOX_API_VERSION)
@@ -1630 +1630 @@
  VBOX_GUI_USE_QGL = 1
 else
- VBOX_GUI_USE_QGL=
+ VBOX_GUI_USE_QGL =
 endif
 
 # Collection macro mainly for deciding whether VBoxDTrace needs shipping.
 VBOX_WITH_DTRACE := $(if-expr defined(VBOX_WITH_DTRACE_R0) || defined(VBOX_WITH_DTRACE_R0DRV) \
-                            || defined(VBOX_WITH_DTRACE_R3) || defined(VBOX_WITH_DTRACE_RC),1,)
+        || defined(VBOX_WITH_DTRACE_R3) || defined(VBOX_WITH_DTRACE_RC),1,)
 
 # kSubmit / kWorker is only available on windows.
@@ -1642 +1642 @@
   TOOL_VCC142AMD64_USE_KSUBMIT := 1
   TOOL_VCC142X86_USE_KSUBMIT   := 1
-#  TOOL_VCC120AMD64_USE_KSUBMIT := 1
-#  TOOL_VCC120X86_USE_KSUBMIT   := 1
+  #  TOOL_VCC120AMD64_USE_KSUBMIT := 1
+  #  TOOL_VCC120X86_USE_KSUBMIT   := 1
   TOOL_VCC100AMD64_USE_KSUBMIT := 1
   TOOL_VCC100X86_USE_KSUBMIT   := 1
@@ -1725 +1725 @@
  ifeq ($(VBOX_LDR_FMT),elf)
   ifeq ($(KBUILD_TARGET_ARCH),x86)
-VBOX_ASFLAGS_FMT = -f elf32 -DASM_FORMAT_ELF
+   VBOX_ASFLAGS_FMT = -f elf32 -DASM_FORMAT_ELF
   else
-VBOX_ASFLAGS_FMT = -f elf64 -DASM_FORMAT_ELF
-  endif
-VBOX_ASFLAGS_DBFINFO = -g dwarf2
+   VBOX_ASFLAGS_FMT = -f elf64 -DASM_FORMAT_ELF
+  endif
+  VBOX_ASFLAGS_DBFINFO = -g dwarf2
  endif
  ifeq ($(VBOX_LDR_FMT),lx)
-VBOX_ASFLAGS_FMT = -f obj -DASM_FORMAT_OMF
-VBOX_ASFLAGS_DBFINFO = -g stabs
+  VBOX_ASFLAGS_FMT = -f obj -DASM_FORMAT_OMF
+  VBOX_ASFLAGS_DBFINFO = -g stabs
  endif
  ifeq ($(VBOX_LDR_FMT),macho)
   ifeq ($(KBUILD_TARGET_ARCH),x86)
-VBOX_ASFLAGS_FMT = -f macho32 -DASM_FORMAT_MACHO
+   VBOX_ASFLAGS_FMT = -f macho32 -DASM_FORMAT_MACHO
   else
-VBOX_ASFLAGS_FMT = -f macho64 -DASM_FORMAT_MACHO
-  endif
-VBOX_ASFLAGS_DBFINFO = -g dwarf2
+   VBOX_ASFLAGS_FMT = -f macho64 -DASM_FORMAT_MACHO
+  endif
+  VBOX_ASFLAGS_DBFINFO = -g dwarf2
  endif
  ifeq ($(VBOX_LDR_FMT),pe)
   ifeq ($(KBUILD_TARGET_ARCH),x86)
-VBOX_ASFLAGS_FMT = -f win32 -DASM_FORMAT_PE
+   VBOX_ASFLAGS_FMT = -f win32 -DASM_FORMAT_PE
   else
-VBOX_ASFLAGS_FMT = -f win64 -DASM_FORMAT_PE
-  endif
-VBOX_ASFLAGS_DBFINFO = -g cv8
+   VBOX_ASFLAGS_FMT = -f win64 -DASM_FORMAT_PE
+  endif
+  VBOX_ASFLAGS_DBFINFO = -g cv8
  endif
  ifndef VBOX_ASFLAGS_FMT
@@ -1756 +1756 @@
 
  ifeq ($(VBOX_LDR_FMT32),elf)
-VBOX_ASFLAGS_FMT32 = -f elf32 -DASM_FORMAT_ELF
-VBOX_ASFLAGS_DBFINFO32 = -g dwarf2
+  VBOX_ASFLAGS_FMT32 = -f elf32 -DASM_FORMAT_ELF
+  VBOX_ASFLAGS_DBFINFO32 = -g dwarf2
  endif
  ifeq ($(VBOX_LDR_FMT32),lx)
-VBOX_ASFLAGS_FMT32 = -f obj -DASM_FORMAT_OMF
-VBOX_ASFLAGS_DBFINFO32 = -g stabs
+  VBOX_ASFLAGS_FMT32 = -f obj -DASM_FORMAT_OMF
+  VBOX_ASFLAGS_DBFINFO32 = -g stabs
  endif
  ifeq ($(VBOX_LDR_FMT32),macho)
-VBOX_ASFLAGS_FMT32 = -f macho32 -DASM_FORMAT_MACHO
-VBOX_ASFLAGS_DBFINFO32 = -g dwarf2
+  VBOX_ASFLAGS_FMT32 = -f macho32 -DASM_FORMAT_MACHO
+  VBOX_ASFLAGS_DBFINFO32 = -g dwarf2
  endif
  ifeq ($(VBOX_LDR_FMT32),pe)
-VBOX_ASFLAGS_FMT32 = -f win32 -DASM_FORMAT_PE
-VBOX_ASFLAGS_DBFINFO32 = -g cv8
+  VBOX_ASFLAGS_FMT32 = -f win32 -DASM_FORMAT_PE
+  VBOX_ASFLAGS_DBFINFO32 = -g cv8
  endif
  ifndef VBOX_ASFLAGS_FMT32
@@ -1776 +1776 @@
 
  ifeq ($(VBOX_LDR_FMT64),elf)
-VBOX_ASFLAGS_FMT64 = -f elf64 -DASM_FORMAT_ELF
-VBOX_ASFLAGS_DBFINFO64 = -g dwarf2
+  VBOX_ASFLAGS_FMT64 = -f elf64 -DASM_FORMAT_ELF
+  VBOX_ASFLAGS_DBFINFO64 = -g dwarf2
  endif
  ifeq ($(VBOX_LDR_FMT64),macho)
-VBOX_ASFLAGS_FMT64 = -f macho64 -DASM_FORMAT_MACHO
-VBOX_ASFLAGS_DBFINFO64 = -g dwarf2
+  VBOX_ASFLAGS_FMT64 = -f macho64 -DASM_FORMAT_MACHO
+  VBOX_ASFLAGS_DBFINFO64 = -g dwarf2
  endif
  ifeq ($(VBOX_LDR_FMT64),pe)
-VBOX_ASFLAGS_FMT64 = -f win64 -DASM_FORMAT_PE
-VBOX_ASFLAGS_DBFINFO64 = -g cv8
+  VBOX_ASFLAGS_FMT64 = -f win64 -DASM_FORMAT_PE
+  VBOX_ASFLAGS_DBFINFO64 = -g cv8
  endif
  ifndef VBOX_ASFLAGS_FMT64
@@ -1792 +1792 @@
 
  ifndef DONT_USE_YASM
-VBOX_ASTOOL    = YASM
-VBOX_LDR_FMT_2_YASM_DBGINFO.elf   = -g dwarf2
-VBOX_LDR_FMT_2_YASM_DBGINFO.lx    = -g stabs
-VBOX_LDR_FMT_2_YASM_DBGINFO.macho =
-VBOX_LDR_FMT_2_YASM_DBGINFO.pe    = -g cv8
-VBOX_ASFLAGS   = $(VBOX_ASFLAGS_FMT)   -D__YASM__ -Worphan-labels $(VBOX_YASM_Wno-segreg-in-64bit) $(VBOX_LDR_FMT_2_YASM_DBGINFO.$(VBOX_LDR_FMT))
-VBOX_ASFLAGS32 = $(VBOX_ASFLAGS_FMT32) -D__YASM__ -Worphan-labels $(VBOX_YASM_Wno-segreg-in-64bit) $(VBOX_LDR_FMT_2_YASM_DBGINFO.$(VBOX_LDR_FMT32))
-VBOX_ASFLAGS64 = $(VBOX_ASFLAGS_FMT64) -D__YASM__ -Worphan-labels $(VBOX_YASM_Wno-segreg-in-64bit) $(VBOX_LDR_FMT_2_YASM_DBGINFO.$(VBOX_LDR_FMT64))
+  VBOX_ASTOOL  = YASM
+  VBOX_LDR_FMT_2_YASM_DBGINFO.elf = -g dwarf2
+  VBOX_LDR_FMT_2_YASM_DBGINFO.lx  = -g stabs
+  VBOX_LDR_FMT_2_YASM_DBGINFO.macho =
+  VBOX_LDR_FMT_2_YASM_DBGINFO.pe  = -g cv8
+  VBOX_ASFLAGS = $(VBOX_ASFLAGS_FMT)   -D__YASM__ -Worphan-labels $(VBOX_YASM_Wno-segreg-in-64bit) $(VBOX_LDR_FMT_2_YASM_DBGINFO.$(VBOX_LDR_FMT))
+  VBOX_ASFLAGS32 = $(VBOX_ASFLAGS_FMT32) -D__YASM__ -Worphan-labels $(VBOX_YASM_Wno-segreg-in-64bit) $(VBOX_LDR_FMT_2_YASM_DBGINFO.$(VBOX_LDR_FMT32))
+  VBOX_ASFLAGS64 = $(VBOX_ASFLAGS_FMT64) -D__YASM__ -Worphan-labels $(VBOX_YASM_Wno-segreg-in-64bit) $(VBOX_LDR_FMT_2_YASM_DBGINFO.$(VBOX_LDR_FMT64))
  else
-VBOX_ASTOOL    = NASM
-VBOX_ASFLAGS   = $(subst elf32,elf,$(VBOX_ASFLAGS_FMT))   -D__NASM__ -w+orphan-labels -g
-VBOX_ASFLAGS32 = $(subst elf32,elf,$(VBOX_ASFLAGS_FMT32)) -D__NASM__ -w+orphan-labels -g
-VBOX_ASFLAGS64 = $(VBOX_ASFLAGS_FMT64) -D__NASM__ -w+orphan-labels -g
+  VBOX_ASTOOL  = NASM
+  VBOX_ASFLAGS = $(subst elf32,elf,$(VBOX_ASFLAGS_FMT))   -D__NASM__ -w+orphan-labels -g
+  VBOX_ASFLAGS32 = $(subst elf32,elf,$(VBOX_ASFLAGS_FMT32)) -D__NASM__ -w+orphan-labels -g
+  VBOX_ASFLAGS64 = $(VBOX_ASFLAGS_FMT64) -D__NASM__ -w+orphan-labels -g
  endif
 else  # ifn1of ($(KBUILD_TARGET_ARCH), amd64 x86)
-VBOX_ASTOOL =# No tool, just use the compiler one.
-VBOX_LDR_FMT_2_FLAGS.elf   := -DASM_FORMAT_ELF
-VBOX_LDR_FMT_2_FLAGS.macho := -DASM_FORMAT_MACHO
-VBOX_LDR_FMT_2_FLAGS.pe    := -DASM_FORMAT_PE
-VBOX_ASFLAGS   := -g $(VBOX_LDR_FMT_2_FLAGS.$(VBOX_LDR_FMT))
-VBOX_ASFLAGS32 := -g $(VBOX_LDR_FMT_2_FLAGS.$(VBOX_LDR_FMT32))
-VBOX_ASFLAGS64 := -g $(VBOX_LDR_FMT_2_FLAGS.$(VBOX_LDR_FMT64))
+ VBOX_ASTOOL =# No tool, just use the compiler one.
+ VBOX_LDR_FMT_2_FLAGS.elf  := -DASM_FORMAT_ELF
+ VBOX_LDR_FMT_2_FLAGS.macho := -DASM_FORMAT_MACHO
+ VBOX_LDR_FMT_2_FLAGS.pe   := -DASM_FORMAT_PE
+ VBOX_ASFLAGS  := -g $(VBOX_LDR_FMT_2_FLAGS.$(VBOX_LDR_FMT))
+ VBOX_ASFLAGS32 := -g $(VBOX_LDR_FMT_2_FLAGS.$(VBOX_LDR_FMT32))
+ VBOX_ASFLAGS64 := -g $(VBOX_LDR_FMT_2_FLAGS.$(VBOX_LDR_FMT64))
  if1of ($(KBUILD_TARGET_ARCH), sparc32 sparc64)
-VBOX_ASFLAGS += -m$(VBOX_HC_ARCH_BITS)
-VBOX_ASFLAGS32 += -m32
-VBOX_ASFLAGS64 += -m64
+  VBOX_ASFLAGS += -m$(VBOX_HC_ARCH_BITS)
+  VBOX_ASFLAGS32 += -m32
+  VBOX_ASFLAGS64 += -m64
  endif
 endif # ifn1of ($(KBUILD_TARGET_ARCH), amd64 x86)
@@ -1858 +1858 @@
   ifeq ($(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH),x86.amd64) ## @todo mixing target/host here!
    VBOX_GCC_TOOL := GXX32
-   VBOX_WITH_VBOXDRV=
+   VBOX_WITH_VBOXDRV =
   else ifeq ($(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH),amd64.x86)
    VBOX_GCC_TOOL := GXX64
-   VBOX_WITH_VBOXDRV=
+   VBOX_WITH_VBOXDRV =
   endif
  endif
@@ -2111 +2111 @@
 # ARCH_BITS_DEFS.
 #
-if1of ($(KBUILD_TARGET_ARCH),amd64 sparc64 arm64)
+if1of ($(KBUILD_TARGET_ARCH), amd64 sparc64 arm64)
  VBOX_HC_ARCH_BITS := 64
  ARCH_BITS_DEFS    := HC_ARCH_BITS=64
-else if1of ($(KBUILD_TARGET_ARCH),x86 sparc32)
+else if1of ($(KBUILD_TARGET_ARCH), x86 sparc32)
  VBOX_HC_ARCH_BITS := 32
  ARCH_BITS_DEFS    := HC_ARCH_BITS=32
@@ -2141 +2141 @@
 endif
 ifeq ($(KBUILD_HOST),win)
-  # This check is a bit hacky, but avoids problems with PATH being changed
-  # again when the makefiles are reread because some automatically generated
-  # makefile has been modified.
-  ifeq ($(findstring $(PATH_STAGE_BIN);$(PATH_STAGE_LIB);,$(PATH)),)
-   export PATH:=$(PATH_STAGE_BIN);$(PATH_STAGE_LIB);$(PATH)
-  endif
+ # This check is a bit hacky, but avoids problems with PATH being changed
+ # again when the makefiles are reread because some automatically generated
+ # makefile has been modified.
+ ifeq ($(findstring $(PATH_STAGE_BIN);$(PATH_STAGE_LIB);,$(PATH)),)
+  export PATH:=$(PATH_STAGE_BIN);$(PATH_STAGE_LIB);$(PATH)
+ endif
 endif
 
@@ -2217 +2217 @@
 VBOX_LIB_RUNTIME_STATIC_X86     = $(PATH_STAGE_LIB)/RuntimeR3-x86$(VBOX_SUFF_LIB)
 if "$(KBUILD_TARGET)" == "win" && "$(KBUILD_TYPE)" == "asan"
-VBOX_LIB_RUNTIME_STATIC_NO_ASAN = $(PATH_STAGE_LIB)/RuntimeR3NoAsan$(VBOX_SUFF_LIB)
+ VBOX_LIB_RUNTIME_STATIC_NO_ASAN = $(PATH_STAGE_LIB)/RuntimeR3NoAsan$(VBOX_SUFF_LIB)
 else
-VBOX_LIB_RUNTIME_STATIC_NO_ASAN = $(VBOX_LIB_RUNTIME_STATIC)
+ VBOX_LIB_RUNTIME_STATIC_NO_ASAN = $(VBOX_LIB_RUNTIME_STATIC)
 endif
 
@@ -2230 +2230 @@
  if1of ($(KBUILD_HOST), win)
   VBOX_BLD_PYTHON := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS)/win.x86/python/v*/python$(HOSTSUFF_EXE))) \
-                                   python-not-found.exe)
+        python-not-found.exe)
  else ifndef VBOX_WITH_PYTHON2_PREFERENCE
   VBOX_BLD_PYTHON := $(firstword \
-        $(which python3$(HOSTSUFF_EXE)) \
-        $(which python3.10$(HOSTSUFF_EXE)) \
-        $(which python3.9$(HOSTSUFF_EXE)) \
-        $(which python3.8$(HOSTSUFF_EXE)) \
-        $(which python3.7$(HOSTSUFF_EXE)) \
-        $(which python3.6$(HOSTSUFF_EXE)) \
-        $(which python3.5$(HOSTSUFF_EXE)) \
-        $(which python3.4$(HOSTSUFF_EXE)) \
-        $(which python2.7$(HOSTSUFF_EXE)) \
-        $(which python$(HOSTSUFF_EXE)) \
-        $(which python2.6$(HOSTSUFF_EXE)) \
-        python-not-found$(HOSTSUFF_EXE) )
+        $(which python3$(HOSTSUFF_EXE)) \
+        $(which python3.10$(HOSTSUFF_EXE)) \
+        $(which python3.9$(HOSTSUFF_EXE)) \
+        $(which python3.8$(HOSTSUFF_EXE)) \
+        $(which python3.7$(HOSTSUFF_EXE)) \
+        $(which python3.6$(HOSTSUFF_EXE)) \
+        $(which python3.5$(HOSTSUFF_EXE)) \
+        $(which python3.4$(HOSTSUFF_EXE)) \
+        $(which python2.7$(HOSTSUFF_EXE)) \
+        $(which python$(HOSTSUFF_EXE)) \
+        $(which python2.6$(HOSTSUFF_EXE)) \
+        python-not-found$(HOSTSUFF_EXE) )
  else
   VBOX_BLD_PYTHON := $(firstword \
-        $(which python2.7$(HOSTSUFF_EXE)) \
-        $(which python2.6$(HOSTSUFF_EXE)) \
-        $(which python$(HOSTSUFF_EXE)) \
-        $(which python3$(HOSTSUFF_EXE)) \
-        python-not-found$(HOSTSUFF_EXE) )
+        $(which python2.7$(HOSTSUFF_EXE)) \
+        $(which python2.6$(HOSTSUFF_EXE)) \
+        $(which python$(HOSTSUFF_EXE)) \
+        $(which python3$(HOSTSUFF_EXE)) \
+        python-not-found$(HOSTSUFF_EXE) )
  endif
 endif
@@ -2297 +2297 @@
  ifndef VBOX_PYLINT_VERSION
   ifdef VBOX_WITH_PYLINT_PRE_V1_0
-   VBOX_PYLINT_VERSION =  9999
+   VBOX_PYLINT_VERSION = 9999
   else ifdef VBOX_WITH_PYLINT_V1_2_1_PLUS
    VBOX_PYLINT_VERSION = 10201
@@ -2308 +2308 @@
 endif
 VBOX_PYLINT_FLAGS = $(if-expr $(VBOX_PYLINT_VERSION) >= 10500,--reports=n,--report=n) \
-        $(if-expr $(VBOX_PYLINT_VERSION) >= 10000\
-          ,--msg-template='{path}:{line}: <{msg_id}>({obj}:{symbol}): {msg}' \
-          ,--output-format=msvs --include-ids=y) \
+        $(if-expr $(VBOX_PYLINT_VERSION) >= 10000 \
+        ,--msg-template='{path}:{line}: <{msg_id}>({obj}:{symbol}): {msg}' \
+        ,--output-format=msvs --include-ids=y) \
         --persistent=n \
         --rcfile=$(PATH_ROOT)/tools/pylintrc \
@@ -2321 +2321 @@
         --max-args=9 \
         --max-module-lines=4096 \
-       --max-locals=32 \
+        --max-locals=32 \
         $(if-expr $(VBOX_PYLINT_VERSION) >= 10500,--max-bool-expr=99,) \
-       --min-public-methods=0 \
+        --min-public-methods=0 \
         --function-rgx='[a-z_][a-zA-Z0-9_]{2,40}$(DOLLAR)' \
         --method-rgx='[a-z_][a-zA-Z0-9_]{2,40}$(DOLLAR)' \
@@ -2335 +2335 @@
         $(if-expr $(VBOX_PYLINT_VERSION) >= 10000,--class-attribute-rgx='(k[abcdefhmnpilorstu]+[A-Z0-9][a-zA-Z0-9_]{0,32}|[A-Z_][A-Z0-9_]{2,32})',) \
         $(if-expr $(VBOX_PYLINT_VERSION) >= 10500,--max-nested-blocks=9,) \
-       $(if-expr $(VBOX_PYLINT_VERSION) >= 10100,--disable=bad-whitespace,) \
-       $(if-expr $(VBOX_PYLINT_VERSION) >= 10201,--disable=bad-continuation --disable=eval-used,) \
-       $(if-expr $(VBOX_PYLINT_VERSION) >= 10201 && $(VBOX_PYLIN_VERSION) < 10500,--disable=bad-option-value,) \
-       $(if-expr $(VBOX_PYLINT_VERSION) >= 10500,--disable=wrong-import-position --disable=E0012 --disable=locally-enabled,) \
-       $(if-expr $(VBOX_PYLINT_VERSION) >= 10600,--disable=missing-docstring --disable=trailing-newlines --disable=ungrouped-imports,) \
-       $(if-expr $(VBOX_PYLINT_VERSION) >= 10800,--disable=redundant-keyword-arg,) \
-       $(if-expr $(VBOX_PYLINT_VERSION) >= 20000,--disable=useless-object-inheritance --disable=useless-return,) \
-       $(if-expr $(VBOX_PYLINT_VERSION) >= 20400,--disable=import-outside-toplevel,) \
-       $(if-expr $(VBOX_PYLINT_VERSION) >= 20900,--disable=super-with-arguments --disable=raise-missing-from,) \
-       $(if-expr $(VBOX_PYLINT_VERSION) >= 21200,--disable=consider-using-f-string --disable=unnecessary-semicolon --disable=redundant-u-string-prefix) \
+        $(if-expr $(VBOX_PYLINT_VERSION) >= 10100,--disable=bad-whitespace,) \
+        $(if-expr $(VBOX_PYLINT_VERSION) >= 10201,--disable=bad-continuation --disable=eval-used,) \
+        $(if-expr $(VBOX_PYLINT_VERSION) >= 10201 && $(VBOX_PYLIN_VERSION) < 10500,--disable=bad-option-value,) \
+        $(if-expr $(VBOX_PYLINT_VERSION) >= 10500,--disable=wrong-import-position --disable=E0012 --disable=locally-enabled,) \
+        $(if-expr $(VBOX_PYLINT_VERSION) >= 10600,--disable=missing-docstring --disable=trailing-newlines --disable=ungrouped-imports,) \
+        $(if-expr $(VBOX_PYLINT_VERSION) >= 10800,--disable=redundant-keyword-arg,) \
+        $(if-expr $(VBOX_PYLINT_VERSION) >= 20000,--disable=useless-object-inheritance --disable=useless-return,) \
+        $(if-expr $(VBOX_PYLINT_VERSION) >= 20400,--disable=import-outside-toplevel,) \
+        $(if-expr $(VBOX_PYLINT_VERSION) >= 20900,--disable=super-with-arguments --disable=raise-missing-from,) \
+        $(if-expr $(VBOX_PYLINT_VERSION) >= 21200,--disable=consider-using-f-string --disable=unnecessary-semicolon --disable=redundant-u-string-prefix) \
         --disable=unnecessary-semicolon,invalid-encoded-data,global-statement,bare-except,broad-except,multiple-statements,no-self-use,fixme \
         --disable=I0011 \
-        --ignored-classes=testdriver.vboxcon \
+        --ignored-classes=testdriver.vboxcon
 
 
@@ -2354 +2354 @@
  VBOX_FN_MAKE_WIN_PATH = "$(quote-sh-dq $(subst /,\,$(requote unq, $(1))))"
 else
-  # Z: is always FS root for Wine.
-  VBOX_FN_MAKE_WIN_PATH = $(subst /,\\,$(patsubst /%,Z:/%,$(1)))
+ # Z: is always FS root for Wine.
+ VBOX_FN_MAKE_WIN_PATH  = $(subst /,\\,$(patsubst /%,Z:/%,$(1)))
 endif #!VBOX_ONLY_SDK
 
@@ -2474 +2474 @@
 else ifeq ($(KBUILD_HOST),darwin) # Xcode 7.3.1 nm doesn't like -t, and -x behaves very differently.  Throwing in -B (bsd) to make sure.
  VBOX_NM ?= $(subst $(REDIRECT_INT),$(REDIRECT_EXT),$(TOOL_$(VBOX_GCC_TOOL)_ENV_SETUP) $(PATH_TOOL_$(VBOX_GCC_TOOL)_TOOLCHAIN_BIN_SLASH)nm) -p \
-        $(if-expr $(VBOX_XCODE_VERSION_MAJOR) > 7 || ($(VBOX_XCODE_VERSION_MAJOR) == 7 && $(VBOX_XCODE_VERSION_MINOR) >= 3),-B,)
+        $(if-expr $(VBOX_XCODE_VERSION_MAJOR) > 7 || ($(VBOX_XCODE_VERSION_MAJOR) == 7 && $(VBOX_XCODE_VERSION_MINOR) >= 3),-B,)
 else
  VBOX_NM ?= nm -p -t x
@@ -2492 +2492 @@
 VBOX_PATH_WIX       ?= $(KBUILD_DEVTOOLS)/win.x86/wix/v3.11.2
 ifdef VBOX_WITH_NEW_WINDOWS_SDK
-VBOX_PATH_MSITRAN   ?= $(PATH_SDK_$(VBOX_WINPSDK)_BIN)/../x86/MsiTran.Exe
-VBOX_PATH_MSIDB     ?= $(PATH_SDK_$(VBOX_WINPSDK)_BIN)/../x86/MsiDb.Exe
-VBOX_PATH_WISUBSTG  ?= $(PATH_SDK_$(VBOX_WINPSDK)_BIN)/WiSubStg.vbs
-VBOX_PATH_WISUMINFO ?= $(PATH_SDK_$(VBOX_WINPSDK)_BIN)/WiSumInf.vbs
+ VBOX_PATH_MSITRAN  ?= $(PATH_SDK_$(VBOX_WINPSDK)_BIN)/../x86/MsiTran.Exe
+ VBOX_PATH_MSIDB    ?= $(PATH_SDK_$(VBOX_WINPSDK)_BIN)/../x86/MsiDb.Exe
+ VBOX_PATH_WISUBSTG ?= $(PATH_SDK_$(VBOX_WINPSDK)_BIN)/WiSubStg.vbs
+ VBOX_PATH_WISUMINFO ?= $(PATH_SDK_$(VBOX_WINPSDK)_BIN)/WiSumInf.vbs
 else
-VBOX_PATH_MSITRAN   ?= $(KBUILD_DEVTOOLS)/win.x86/sdk/v7.1/Bin/MsiTran.Exe
-VBOX_PATH_MSIDB     ?= $(KBUILD_DEVTOOLS)/win.x86/sdk/v7.1/Bin/MsiDb.Exe
-VBOX_PATH_WISUBSTG  ?= $(KBUILD_DEVTOOLS)/win.x86/sdk/v7.1/Samples/sysmgmt/msi/scripts/WiSubStg.vbs
-VBOX_PATH_WISUMINFO ?= $(KBUILD_DEVTOOLS)/win.x86/sdk/v7.1/Samples/sysmgmt/msi/scripts/WiSumInf.vbs
+ VBOX_PATH_MSITRAN  ?= $(KBUILD_DEVTOOLS)/win.x86/sdk/v7.1/Bin/MsiTran.Exe
+ VBOX_PATH_MSIDB    ?= $(KBUILD_DEVTOOLS)/win.x86/sdk/v7.1/Bin/MsiDb.Exe
+ VBOX_PATH_WISUBSTG ?= $(KBUILD_DEVTOOLS)/win.x86/sdk/v7.1/Samples/sysmgmt/msi/scripts/WiSubStg.vbs
+ VBOX_PATH_WISUMINFO ?= $(KBUILD_DEVTOOLS)/win.x86/sdk/v7.1/Samples/sysmgmt/msi/scripts/WiSumInf.vbs
 endif
 VBOX_PATH_DIFX      ?= $(KBUILD_DEVTOOLS)/win.$(KBUILD_TARGET_ARCH)/DIFx/v2.1-r3
@@ -2515 +2515 @@
 ifeq ($(KBUILD_HOST),win)
  ifndef TOOL_BISON_YACC
-TOOL_BISON_YACC     := $(firstfile $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS)/win.x86/win_flex_bison/v*/*bison*$(HOSTSUFF_EXE))) bison.exe)
+  TOOL_BISON_YACC   := $(firstfile $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS)/win.x86/win_flex_bison/v*/*bison*$(HOSTSUFF_EXE))) bison.exe)
  endif
  ifndef TOOL_FLEX_LEX
-TOOL_FLEX_LEX       := $(firstfile $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS)/win.x86/win_flex_bison/v*/*flex*$(HOSTSUFF_EXE))) flex.exe)
+  TOOL_FLEX_LEX     := $(firstfile $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS)/win.x86/win_flex_bison/v*/*flex*$(HOSTSUFF_EXE))) flex.exe)
  endif
 endif
@@ -2538 +2538 @@
 # forgets to quote it when creating the commandline and cl.exe gets very confused.
 if1of (quote, $(KMK_FEATURES))
-VBOX_MIDL_REDIRECT     = $(REDIRECT) --prepend "$(quote-sh-dq PATH=$(PATH_TOOL_$(VBOX_VCC_TOOL)_BIN);$(qaddsuffix ,;,$(PATH_TOOL_$(VBOX_VCC_TOOL)_DLL_BIN)))" --
-VBOX_MIDL_REDIRECT_X86 = $(REDIRECT) --prepend "$(quote-sh-dq PATH=$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_BIN);$(qaddsuffix ,;,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_DLL_BIN)))" --
+ VBOX_MIDL_REDIRECT    = $(REDIRECT) --prepend "$(quote-sh-dq PATH=$(PATH_TOOL_$(VBOX_VCC_TOOL)_BIN);$(qaddsuffix ,;,$(PATH_TOOL_$(VBOX_VCC_TOOL)_DLL_BIN)))" --
+ VBOX_MIDL_REDIRECT_X86 = $(REDIRECT) --prepend "$(quote-sh-dq PATH=$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_BIN);$(qaddsuffix ,;,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_DLL_BIN)))" --
 else
-VBOX_MIDL_REDIRECT     = $(REDIRECT) --prepend 'PATH=$(PATH_TOOL_$(VBOX_VCC_TOOL)_BIN);$(PATH)' --
-VBOX_MIDL_REDIRECT_X86 = $(REDIRECT) --prepend 'PATH=$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_BIN);$(PATH)' --
+ VBOX_MIDL_REDIRECT    = $(REDIRECT) --prepend 'PATH=$(PATH_TOOL_$(VBOX_VCC_TOOL)_BIN);$(PATH)' --
+ VBOX_MIDL_REDIRECT_X86 = $(REDIRECT) --prepend 'PATH=$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_BIN);$(PATH)' --
 endif
 VBOX_MIDL_CPP_CMD      = $(lastword $(notdir ,$(subst $(EXEC_X86_WIN32),,$(TOOL_$(VBOX_VCC_TOOL)_CC))))
@@ -2583 +2583 @@
  endif
  VBOX_PATH_XPCOM_IDL ?= $(VBOX_PATH_SDK)/bindings/xpcom/idl
- VBOX_XPCOM_INCS     ?=                         \
-        $(VBOX_PATH_SDK)/bindings/xpcom/include \
-        $(VBOX_PATH_SDK)/bindings/xpcom/include/xpcom   \
-        $(VBOX_PATH_SDK)/bindings/xpcom/include/string  \
-        $(VBOX_PATH_SDK)/bindings/xpcom/include/xpcom   \
+ VBOX_XPCOM_INCS     ?= \
+        $(VBOX_PATH_SDK)/bindings/xpcom/include \
+        $(VBOX_PATH_SDK)/bindings/xpcom/include/xpcom \
+        $(VBOX_PATH_SDK)/bindings/xpcom/include/string \
+        $(VBOX_PATH_SDK)/bindings/xpcom/include/xpcom \
         $(VBOX_PATH_SDK)/bindings/xpcom/include/nsprpub \
         $(VBOX_PATH_SDK)/bindings/xpcom/include/ipcd
@@ -2648 +2648 @@
    VBOX_XCODE_VERSION := 4.1
   else
-  # Fallback - system / LocalConfig.kmk.
+   # Fallback - system / LocalConfig.kmk.
    VBOX_PATH_MACOSX_DEVEL_ROOT     ?= /Developer
    VBOX_PATH_MACOSX_SDK_ROOT       ?= $(VBOX_PATH_MACOSX_DEVEL_ROOT)/SDKs
@@ -2663 +2663 @@
   ifndef VBOX_PATH_MACOSX_SDK_ROOT
    VBOX_PATH_MACOSX_SDK_ROOT := $(firstword $(wildcard \
-                $(PATH_TOOL_$(VBOX_GCC_TOOL)_SDKS) \
-                $(VBOX_PATH_MACOSX_DEVEL_ROOT)/SDKs/. \
-                /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/. \
-                /Developer/SDKs/. \
-                /Library/Developer/CommandLineTools/SDKs/. ))
+        $(PATH_TOOL_$(VBOX_GCC_TOOL)_SDKS) \
+        $(VBOX_PATH_MACOSX_DEVEL_ROOT)/SDKs/. \
+        /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/. \
+        /Developer/SDKs/. \
+        /Library/Developer/CommandLineTools/SDKs/. ))
   endif
   ifndef VBOX_PATH_MACOSX_TOOLCHAIN_ROOT
    VBOX_PATH_MACOSX_TOOLCHAIN_ROOT := $(firstword $(wildcard \
-                $(PATH_TOOL_$(VBOX_GCC_TOOL)_TOOLCHAIN) \
-                $(VBOX_PATH_MACOSX_DEVEL_ROOT)/Library/Developer/CommandLineTools/. \
-                $(VBOX_PATH_MACOSX_DEVEL_ROOT)/Toolchains/XcodeDefault.xctoolchain/. \
-                /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/. \
-               /Library/Developer/CommandLineTools/. \
-                ) /. )
+        $(PATH_TOOL_$(VBOX_GCC_TOOL)_TOOLCHAIN) \
+        $(VBOX_PATH_MACOSX_DEVEL_ROOT)/Library/Developer/CommandLineTools/. \
+        $(VBOX_PATH_MACOSX_DEVEL_ROOT)/Toolchains/XcodeDefault.xctoolchain/. \
+        /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/. \
+        /Library/Developer/CommandLineTools/. \
+        ) /. )
   endif
  else
@@ -2700 +2700 @@
  endif
  if !defined(VBOX_PATH_MACOSX_SDK) && !defined(VBOX_WITH_EVEN_NEWER_XCODE) # newer xcode handles this above
-VBOX_PATH_MACOSX_SDK_ROOT_DIRS ?= \
-        $(VBOX_PATH_MACOSX_SDK_ROOT) \
-        $(KBUILD_DEVTOOLS)/darwin.x86/SDKs/ \
-        $(KBUILD_DEVTOOLS)/darwin.amd64/SDKs/ \
-        $(KBUILD_DEVTOOLS)/darwin.x86/xcode/v4.1/SDKs \
-        $(KBUILD_DEVTOOLS)/darwin.x86/xcode/v3.2.6/SDKs
+  VBOX_PATH_MACOSX_SDK_ROOT_DIRS ?= \
+        $(VBOX_PATH_MACOSX_SDK_ROOT) \
+        $(KBUILD_DEVTOOLS)/darwin.x86/SDKs/ \
+        $(KBUILD_DEVTOOLS)/darwin.amd64/SDKs/ \
+        $(KBUILD_DEVTOOLS)/darwin.x86/xcode/v4.1/SDKs \
+        $(KBUILD_DEVTOOLS)/darwin.x86/xcode/v3.2.6/SDKs
   ifeq ($(VBOX_DEF_MACOSX_VERSION_MIN),10.4)
-VBOX_PATH_MACOSX_SDK := $(firstword $(wildcard $(addsuffix /MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN)u.sdk, $(VBOX_PATH_MACOSX_SDK_ROOT_DIRS))) \
-        $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN)u.sdk )
+   VBOX_PATH_MACOSX_SDK := $(firstword $(wildcard $(addsuffix /MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN)u.sdk, $(VBOX_PATH_MACOSX_SDK_ROOT_DIRS))) \
+        $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN)u.sdk )
   else
-VBOX_PATH_MACOSX_SDK := $(firstword $(wildcard $(addsuffix /MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk, $(VBOX_PATH_MACOSX_SDK_ROOT_DIRS))) \
-        $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk )
+   VBOX_PATH_MACOSX_SDK := $(firstword $(wildcard $(addsuffix /MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk, $(VBOX_PATH_MACOSX_SDK_ROOT_DIRS))) \
+        $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk )
   endif
  endif
@@ -2818 +2818 @@
  else
   VBOX_DARWIN_DEF_SDK_DEFS        := MAC_OS_X_VERSION_MIN_REQUIRED=$(VBOX_DEF_MACOSX_VERSION_MIN_NO_DOT)0 \
-                                     MAC_OS_X_VERSION_MAX_ALLOWED=$(VBOX_DEF_MACOSX_VERSION_MIN_NO_DOT)0
+        MAC_OS_X_VERSION_MAX_ALLOWED=$(VBOX_DEF_MACOSX_VERSION_MIN_NO_DOT)0
   VBOX_DARWIN_DEF_SDK_CFLAGS      := -mmacosx-version-min=$(VBOX_DEF_MACOSX_VERSION_MIN) -isysroot "$(VBOX_PATH_MACOSX_SDK)"
   VBOX_DARWIN_DEF_SDK_CXXFLAGS    := -mmacosx-version-min=$(VBOX_DEF_MACOSX_VERSION_MIN) -isysroot "$(VBOX_PATH_MACOSX_SDK)"
@@ -2968 +2968 @@
 ifeq ($(KBUILD_TYPE),asan)
  if "$(KBUILD_TARGET)" == "linux"
-VBOX_WITH_GCC_SANITIZER := 1
+  VBOX_WITH_GCC_SANITIZER := 1
  else if "$(KBUILD_TARGET)" == "darwin"
-VBOX_WITH_GCC_SANITIZER := 1
+  VBOX_WITH_GCC_SANITIZER := 1
  else if "$(KBUILD_TARGET)" == "win"
-VBOX_WITH_VCC_SANITIZER := 1
+  VBOX_WITH_VCC_SANITIZER := 1
  else
-VBOX_WITH_EF_WRAPS := 1
+  VBOX_WITH_EF_WRAPS := 1
  endif
 endif
@@ -3070 +3070 @@
 
 ifndef VBOX_NOINC_DYNAMIC_CONFIG_KMK
-#
-# GCC and YASM dynamic properties.
-# Most of this is resolved on first kmk invocation and cached in PATH_OUT.
-#
-# Note! That a harmless warning is printed if the file doesn't exist.
-# Note! Changes in GCC are not detected automatically (yet).
-#
-if $(pos VBox,$(VBOX_GCC_TOOL)) > 0
- include $(KBUILD_TOOL_PATHS)/$(VBOX_GCC_TOOL).kmk
-else
- include $(KBUILD_PATH)/tools/$(VBOX_GCC_TOOL).kmk
-endif
-ifneq ($(VBOX_GCC_TOOL),$(VBOX_GCC32_TOOL))
- if $(pos VBox,$(VBOX_GCC32_TOOL)) > 0
-  include $(KBUILD_TOOL_PATHS)/$(VBOX_GCC32_TOOL).kmk
+ #
+ # GCC and YASM dynamic properties.
+ # Most of this is resolved on first kmk invocation and cached in PATH_OUT.
+ #
+ # Note! That a harmless warning is printed if the file doesn't exist.
+ # Note! Changes in GCC are not detected automatically (yet).
+ #
+ if $(pos VBox,$(VBOX_GCC_TOOL)) > 0
+  include $(KBUILD_TOOL_PATHS)/$(VBOX_GCC_TOOL).kmk
  else
-  include $(KBUILD_PATH)/tools/$(VBOX_GCC32_TOOL).kmk
- endif
-endif
-
-# These tests never worked on Windows because of /dev/null, so, there
-# can be no harm in just dropping them until cygwin is mp safe.
-ifeq ($(KBUILD_HOST),win)
- VBOX_GCC_CHECK_EX_CC  = $(3)
- VBOX_GCC_CHECK_EX_CXX = $(3)
- VBOX_GCC_CHECK_EX_LD  = $(3)
- VBOX_GCC_CHECK_CC = $(2)
- VBOX_GCC_CHECK_CXX = $(2)
- VBOX_GCC_CHECK_LD = $(2)
- VBOX_GCC32_CHECK_CXX = $(2)
-else
- # Note! The chcking for 'error: unknown warning option' is for clang on darwin not giving us a
- #       non-zero exit code when using an invalid option here, but it does later on.
- ifndef CLOSEPAR
-  CLOSEPAR := )
- endif
- VBOX_GCC_CHECK_EX_CC_CXX = $(shell \
-    if $(1) $(subst -Wno-,-W,$(2)) -Werror -c -o /dev/null $(4) > /dev/null 2>&1; then \
-        case "`LC_ALL=C $(1) $(subst -Wno-,-W,$(2)) -Werror -c -o /dev/null $(4) 2>&1`" in \
-            "error: unknown warning option"*$(CLOSEPAR) echo "$(3)";; \
-            *$(CLOSEPAR) echo "$(2)";; \
-         esac; \
-    else echo "$(3)"; fi; )
- VBOX_GCC_CHECK_EX_CC  = $(call VBOX_GCC_CHECK_EX_CC_CXX,$(1),$(2),$(3),-xc   $(PATH_OUT)/DynamicConfig.c)
- VBOX_GCC_CHECK_EX_CXX = $(call VBOX_GCC_CHECK_EX_CC_CXX,$(1),$(2),$(3),-xc++ $(PATH_OUT)/DynamicConfig.cpp)
- VBOX_GCC_CHECK_EX_LD = $(shell \
-    if $(1) -Wl,$(2) $(if $(eq $(KBUILD_HOST),darwin),-Wl$(COMMA)-u$(COMMA)start -Wl$(COMMA)-undefined$(COMMA)dynamic_lookup,) \
-            -nostdlib -o /dev/null -xc /dev/null > /dev/null 2>&1; \
-    then echo "-Wl,$(2)"; else echo "$(3)"; fi; )
-
- VBOX_GCC_CHECK_CC    = $(call VBOX_GCC_CHECK_EX_CC,  $(TOOL_$(VBOX_GCC_TOOL)_ENV_SETUP) $(TOOL_$(VBOX_GCC_TOOL)_CC),$1,$2)
- VBOX_GCC_CHECK_CXX   = $(call VBOX_GCC_CHECK_EX_CXX, $(TOOL_$(VBOX_GCC_TOOL)_ENV_SETUP) $(TOOL_$(VBOX_GCC_TOOL)_CXX),$1,$2)
- VBOX_GCC_CHECK_LD    = $(call VBOX_GCC_CHECK_EX_LD,  $(TOOL_$(VBOX_GCC_TOOL)_ENV_SETUP) $(TOOL_$(VBOX_GCC_TOOL)_LD),$1,$2)
- VBOX_GCC32_CHECK_CXX = $(call VBOX_GCC_CHECK_EX_CXX, $(TOOL_$(VBOX_GCC32_TOOL)_ENV_SETUP) $(TOOL_$(VBOX_GCC32_TOOL)_CXX),$1,$2)
-endif
-
-ifeq ($(KBUILD_HOST),win)
- # We're not using gcc on windows anymore, just cook the result.
- VBOX_GCC_VERSION := $(expr 10000 * 3 + 100 * 3 + 3)
-else
- # This is kind of bad, the returned string needs to be re-evaluated before use.
- # The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)).
- # Some versions of gcc (e.g. openSUSE11) return only major.minor on `gcc -dumpversion`.
- # gcc-5 of openSUSE42.1 only returns the major version on `gcc -dumpversion`!
- VBOX_GCC_VERSION = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1) -dumpversion) | \
-    $(SED_EXT) 's|\([0-9][0-9]*\)\.\{0,1\}\([0-9]\{0,\}\)\.\{0,1\}\([0-9]\{0,\}\).*|$$(expr 10000 * \1 + 100 * $$(firstword \2 0) + $$(firstword \3 0))|' )
- ifeq ($(KBUILD_TARGET), darwin)
-  VBOX_CLANG_VERSION = $(shell $(1) --version | \
-    $(SED_EXT) -n 's|.*version \([0-9][0-9]*\)\.\{0,1\}\([0-9]\{0,\}\)\.\{0,1\}\([0-9]\{0,\}\).*|$$(expr 10000 * \1 + 100 * $$(firstword \2 0) + $$(firstword \3 0))|p' )
- endif
-endif
-
-# YASM macros
-ifndef DONT_USE_YASM
- include $(KBUILD_PATH)/tools/YASM.kmk
- if1of ($(KBUILD_HOST), win os2)
-  VBOX_YASM_CHECK = $(if-expr "$(shell $(TOOL_YASM_AS) -e -o nul $1 - < /dev/null 2>&1)" == "",$(1),)
+  include $(KBUILD_PATH)/tools/$(VBOX_GCC_TOOL).kmk
+ endif
+ ifneq ($(VBOX_GCC_TOOL),$(VBOX_GCC32_TOOL))
+  if $(pos VBox,$(VBOX_GCC32_TOOL)) > 0
+   include $(KBUILD_TOOL_PATHS)/$(VBOX_GCC32_TOOL).kmk
+  else
+   include $(KBUILD_PATH)/tools/$(VBOX_GCC32_TOOL).kmk
+  endif
+ endif
+
+ # These tests never worked on Windows because of /dev/null, so, there
+ # can be no harm in just dropping them until cygwin is mp safe.
+ ifeq ($(KBUILD_HOST),win)
+  VBOX_GCC_CHECK_EX_CC = $(3)
+  VBOX_GCC_CHECK_EX_CXX = $(3)
+  VBOX_GCC_CHECK_EX_LD = $(3)
+  VBOX_GCC_CHECK_CC = $(2)
+  VBOX_GCC_CHECK_CXX = $(2)
+  VBOX_GCC_CHECK_LD = $(2)
+  VBOX_GCC32_CHECK_CXX = $(2)
  else
-  VBOX_YASM_CHECK = $(if-expr "$(shell $(TOOL_YASM_AS) -e -o /dev/null $1 - < /dev/null 2>&1)" == "",$(1),)
- endif
-else
- VBOX_YASM_CHECK =
-endif
-
-# NASM macros (input and output must differ with recent versions (strcmp)).
-ifndef DONT_USE_NASM
- include $(KBUILD_PATH)/tools/NASM.kmk
- if1of ($(KBUILD_HOST), win os2)
-  VBOX_NASM_CHECK = $(if-expr "$(shell $(TOOL_NASM_AS) -e -o nul $1 NUL 2>&1)" == "",$(1),$(2))
+  # Note! The chcking for 'error: unknown warning option' is for clang on darwin not giving us a
+  #       non-zero exit code when using an invalid option here, but it does later on.
+  ifndef CLOSEPAR
+   CLOSEPAR := )
+  endif
+  VBOX_GCC_CHECK_EX_CC_CXX = $(shell \
+        if $(1) $(subst -Wno-,-W,$(2)) -Werror -c -o /dev/null $(4) > /dev/null 2>&1; then \
+        case "`LC_ALL=C $(1) $(subst -Wno-,-W,$(2)) -Werror -c -o /dev/null $(4) 2>&1`" in \
+        "error: unknown warning option"*$(CLOSEPAR) echo "$(3)";; \
+        *$(CLOSEPAR) echo "$(2)";; \
+        esac; \
+        else echo "$(3)"; fi; )
+  VBOX_GCC_CHECK_EX_CC = $(call VBOX_GCC_CHECK_EX_CC_CXX,$(1),$(2),$(3),-xc   $(PATH_OUT)/DynamicConfig.c)
+  VBOX_GCC_CHECK_EX_CXX = $(call VBOX_GCC_CHECK_EX_CC_CXX,$(1),$(2),$(3),-xc++ $(PATH_OUT)/DynamicConfig.cpp)
+  VBOX_GCC_CHECK_EX_LD = $(shell \
+        if $(1) -Wl,$(2) $(if $(eq $(KBUILD_HOST),darwin),-Wl$(COMMA)-u$(COMMA)start -Wl$(COMMA)-undefined$(COMMA)dynamic_lookup,) \
+        -nostdlib -o /dev/null -xc /dev/null > /dev/null 2>&1; \
+        then echo "-Wl,$(2)"; else echo "$(3)"; fi; )
+
+  VBOX_GCC_CHECK_CC   = $(call VBOX_GCC_CHECK_EX_CC,  $(TOOL_$(VBOX_GCC_TOOL)_ENV_SETUP) $(TOOL_$(VBOX_GCC_TOOL)_CC),$1,$2)
+  VBOX_GCC_CHECK_CXX  = $(call VBOX_GCC_CHECK_EX_CXX, $(TOOL_$(VBOX_GCC_TOOL)_ENV_SETUP) $(TOOL_$(VBOX_GCC_TOOL)_CXX),$1,$2)
+  VBOX_GCC_CHECK_LD   = $(call VBOX_GCC_CHECK_EX_LD,  $(TOOL_$(VBOX_GCC_TOOL)_ENV_SETUP) $(TOOL_$(VBOX_GCC_TOOL)_LD),$1,$2)
+  VBOX_GCC32_CHECK_CXX = $(call VBOX_GCC_CHECK_EX_CXX, $(TOOL_$(VBOX_GCC32_TOOL)_ENV_SETUP) $(TOOL_$(VBOX_GCC32_TOOL)_CXX),$1,$2)
+ endif
+
+ ifeq ($(KBUILD_HOST),win)
+  # We're not using gcc on windows anymore, just cook the result.
+  VBOX_GCC_VERSION := $(expr 10000 * 3 + 100 * 3 + 3)
  else
-  VBOX_NASM_CHECK = $(if-expr "$(shell $(TOOL_NASM_AS) -e -o /dev/./null $1 /dev/null 2>&1)" == "",$(1),$(2))
- endif
-else
- VBOX_NASM_CHECK =
-endif
-
-# Figures the pylint version.
-VBOX_PYLINT_FIGURE_VERSION = $(shell $(1) --version 2> /dev/null \
-        | $(SED_EXT) -n -e 's/pylint-[^[:blank:]]*/pylint/' \
-        -e 's|^ *pylint *\([0-9][0-9]*\).\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$(DOLLAR)|$$(expr \1 * 10000 + \2 * 100 + \3)|p' )
-
-# Java stuff.
-ifeq ($(KBUILD_TARGET), darwin)
- VBOX_JAVA_BIN_PATH = $(firstword $(wildcard \
-        /System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Commands \
-        /System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Commands \
-        $(if-expr $(VBOX_XCODE_VERSION_MAJOR) >= 4,/System/Library/Frameworks/JavaVM.framework/Versions/A/Commands,) \
-        $(if-expr $(VBOX_XCODE_VERSION_MAJOR) >= 10,/Library/Java/JavaVirtualMachines/jdk1.8.*.jdk/Contents/Home/bin,) \
-        ) /usr/bin)
- VBOX_JAVA      = $(VBOX_JAVA_BIN_PATH)/java
- VBOX_JAVAC     = $(VBOX_JAVA_BIN_PATH)/javac
- VBOX_JAVAH     = $(VBOX_JAVA_BIN_PATH)/javah
- VBOX_JAR       = $(VBOX_JAVA_BIN_PATH)/jar
- VBOX_JAVADOC   = $(VBOX_JAVA_BIN_PATH)/javadoc
- VBOX_WSIMPORT  = $(VBOX_JAVA_BIN_PATH)/wsimport
- if $(VBOX_XCODE_VERSION_MAJOR) >= 4 # Lion (4.1-preview 5) has a broken CurrentJDK link.  Blindly applying it to 4.0.
-  VBOX_JAVA_INC = $(firstword $(wildcard \
-        $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers \
-        /Library/Java/JavaVirtualMachines/jdk1.8.*.jdk/Contents/Home/include \
-        ) )
+  # This is kind of bad, the returned string needs to be re-evaluated before use.
+  # The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)).
+  # Some versions of gcc (e.g. openSUSE11) return only major.minor on `gcc -dumpversion`.
+  # gcc-5 of openSUSE42.1 only returns the major version on `gcc -dumpversion`!
+  VBOX_GCC_VERSION = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1) -dumpversion) | \
+        $(SED_EXT) 's|\([0-9][0-9]*\)\.\{0,1\}\([0-9]\{0,\}\)\.\{0,1\}\([0-9]\{0,\}\).*|$$(expr 10000 * \1 + 100 * $$(firstword \2 0) + $$(firstword \3 0))|' )
+  ifeq ($(KBUILD_TARGET),darwin)
+   VBOX_CLANG_VERSION = $(shell $(1) --version | \
+        $(SED_EXT) -n 's|.*version \([0-9][0-9]*\)\.\{0,1\}\([0-9]\{0,\}\)\.\{0,1\}\([0-9]\{0,\}\).*|$$(expr 10000 * \1 + 100 * $$(firstword \2 0) + $$(firstword \3 0))|p' )
+  endif
+ endif
+
+ # YASM macros
+ ifndef DONT_USE_YASM
+  include $(KBUILD_PATH)/tools/YASM.kmk
+  if1of ($(KBUILD_HOST), win os2)
+   VBOX_YASM_CHECK = $(if-expr "$(shell $(TOOL_YASM_AS) -e -o nul $1 - < /dev/null 2>&1)" == "",$(1),)
+  else
+   VBOX_YASM_CHECK = $(if-expr "$(shell $(TOOL_YASM_AS) -e -o /dev/null $1 - < /dev/null 2>&1)" == "",$(1),)
+  endif
  else
-  VBOX_JAVA_INC = $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Headers
- endif
-
-else # !darwin
-
- ifeq ($(KBUILD_TARGET),linux)
-  ifeq ($(origin VBOX_JAVA_HOME),undefined)
-   # Add correct detection for you distro after the /usr/../java-6-sun line.
-   VBOX_JAVA_HOME := $(firstword $(wildcard \
-        $(KBUILD_DEVTOOLS)/linux.x86/jdk1.6.0_27 \
-        /usr/lib/jvm/java-6-sun  \
-        /usr/lib/jvm/java-6-openjdk \
-        /usr/lib/jvm/java-6-openjdk-i386 \
-        /usr/lib/jvm/java-6-openjdk-amd64 \
-        /usr/lib/jvm/java-7-openjdk-i386 \
-        /usr/lib/jvm/java-7-openjdk-amd64 \
-        /usr/lib/jvm/default-java \
-        /usr/lib/jvm/java \
-        \
-        /usr/lib/jvm/sun-jdk-1.6 \
-        ) /usr/lib/jvm/java-6-sun)
-  endif
- endif
-
- ifeq ($(KBUILD_TARGET),solaris)
-  # VBOX_JAVA_HOME ?= /usr/jdk/jdk1.6.0
-  VBOX_JAVA_HOME ?= $(firstword $(abspath $(wildcard \
-        /usr/jdk/latest/include/.. \
-        /usr/jdk/instances/jdk1.8*/include/.. \
-        /usr/jdk/instances/jdk1.7*/include/.. \
-        /usr/jdk/instances/jdk1.6*/include/.. \
-        )) /usr/java)
- endif
-
- ifeq ($(KBUILD_TARGET),win)
-  VBOX_JAVA_HOME ?= c:/jdk
- endif
-
- VBOX_JAVA_BIN_PATH ?= $(VBOX_JAVA_HOME)/bin
- VBOX_JAVA          ?= "$(VBOX_JAVA_BIN_PATH)/java$(HOSTSUFF_EXE)"
- VBOX_JAVAC          = "$(VBOX_JAVA_BIN_PATH)/javac$(HOSTSUFF_EXE)"
- VBOX_JAVAH          = "$(VBOX_JAVA_BIN_PATH)/javah$(HOSTSUFF_EXE)"
- VBOX_JAR            = "$(VBOX_JAVA_BIN_PATH)/jar$(HOSTSUFF_EXE)"
- VBOX_JAVADOC        = "$(VBOX_JAVA_BIN_PATH)/javadoc$(HOSTSUFF_EXE)"
- # With Java 11 wsimport was removed, usually part of a separate install now.
- VBOX_WSIMPORT       = $(firstword $(wildcard $(VBOX_JAVA_BIN_PATH)/wsimport$(HOSTSUFF_EXE)) wsimport$(HOSTSUFF_EXE))
- # correct for targets we care about
- VBOX_MD_OS          = $(KBUILD_TARGET)
- VBOX_JAVA_INC       = \
-        $(VBOX_JAVA_HOME)/include \
-        $(VBOX_JAVA_HOME)/include/$(VBOX_MD_OS)
-endif # !darwin
-# The first transform the almost usless openjdk versions like "javac 9-Ubuntu" into something the 2nd expression groks.
-VBOX_JAVA_FIGURE_VERSION = $(shell $(1) -version 2>&1 \
-        | $(SED_EXT) -n \
-        -e 's/ \([0-9][0-9]*\)\(-[[:alpha:]][[:alpha:]]\)/ \1.0.0\2/' \
-        -e 's|^[^ ]* *\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$(DOLLAR)|$$(expr \1 * 10000 + \2 * 100 + \3)|p' )
-
-# Test C and C++ files.
-$(PATH_OUT)/DynamicConfig.c $(PATH_OUT)/DynamicConfig.cpp:
+  VBOX_YASM_CHECK =
+ endif
+
+ # NASM macros (input and output must differ with recent versions (strcmp)).
+ ifndef DONT_USE_NASM
+  include $(KBUILD_PATH)/tools/NASM.kmk
+  if1of ($(KBUILD_HOST), win os2)
+   VBOX_NASM_CHECK = $(if-expr "$(shell $(TOOL_NASM_AS) -e -o nul $1 NUL 2>&1)" == "",$(1),$(2))
+  else
+   VBOX_NASM_CHECK = $(if-expr "$(shell $(TOOL_NASM_AS) -e -o /dev/./null $1 /dev/null 2>&1)" == "",$(1),$(2))
+  endif
+ else
+  VBOX_NASM_CHECK =
+ endif
+
+ # Figures the pylint version.
+ VBOX_PYLINT_FIGURE_VERSION = $(shell $(1) --version 2> /dev/null \
+        | $(SED_EXT) -n -e 's/pylint-[^[:blank:]]*/pylint/' \
+        -e 's|^ *pylint *\([0-9][0-9]*\).\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$(DOLLAR)|$$(expr \1 * 10000 + \2 * 100 + \3)|p' )
+
+ # Java stuff.
+ ifeq ($(KBUILD_TARGET),darwin)
+  VBOX_JAVA_BIN_PATH = $(firstword $(wildcard \
+        /System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Commands \
+        /System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Commands \
+        $(if-expr $(VBOX_XCODE_VERSION_MAJOR) >= 4,/System/Library/Frameworks/JavaVM.framework/Versions/A/Commands,) \
+        $(if-expr $(VBOX_XCODE_VERSION_MAJOR) >= 10,/Library/Java/JavaVirtualMachines/jdk1.8.*.jdk/Contents/Home/bin,) \
+        ) /usr/bin)
+  VBOX_JAVA     = $(VBOX_JAVA_BIN_PATH)/java
+  VBOX_JAVAC    = $(VBOX_JAVA_BIN_PATH)/javac
+  VBOX_JAVAH    = $(VBOX_JAVA_BIN_PATH)/javah
+  VBOX_JAR      = $(VBOX_JAVA_BIN_PATH)/jar
+  VBOX_JAVADOC  = $(VBOX_JAVA_BIN_PATH)/javadoc
+  VBOX_WSIMPORT = $(VBOX_JAVA_BIN_PATH)/wsimport
+  if $(VBOX_XCODE_VERSION_MAJOR) >= 4 # Lion (4.1-preview 5) has a broken CurrentJDK link.  Blindly applying it to 4.0.
+   VBOX_JAVA_INC = $(firstword $(wildcard \
+        $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers \
+        /Library/Java/JavaVirtualMachines/jdk1.8.*.jdk/Contents/Home/include \
+        ) )
+  else
+   VBOX_JAVA_INC = $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Headers
+  endif
+
+ else # !darwin
+
+  ifeq ($(KBUILD_TARGET),linux)
+   ifeq ($(origin VBOX_JAVA_HOME),undefined)
+    # Add correct detection for you distro after the /usr/../java-6-sun line.
+    VBOX_JAVA_HOME := $(firstword $(wildcard \
+        $(KBUILD_DEVTOOLS)/linux.x86/jdk1.6.0_27 \
+        /usr/lib/jvm/java-6-sun \
+        /usr/lib/jvm/java-6-openjdk \
+        /usr/lib/jvm/java-6-openjdk-i386 \
+        /usr/lib/jvm/java-6-openjdk-amd64 \
+        /usr/lib/jvm/java-7-openjdk-i386 \
+        /usr/lib/jvm/java-7-openjdk-amd64 \
+        /usr/lib/jvm/default-java \
+        /usr/lib/jvm/java \
+        \
+        /usr/lib/jvm/sun-jdk-1.6 \
+        ) /usr/lib/jvm/java-6-sun)
+   endif
+  endif
+
+  ifeq ($(KBUILD_TARGET),solaris)
+   # VBOX_JAVA_HOME ?= /usr/jdk/jdk1.6.0
+   VBOX_JAVA_HOME ?= $(firstword $(abspath $(wildcard \
+        /usr/jdk/latest/include/.. \
+        /usr/jdk/instances/jdk1.8*/include/.. \
+        /usr/jdk/instances/jdk1.7*/include/.. \
+        /usr/jdk/instances/jdk1.6*/include/.. \
+        )) /usr/java)
+  endif
+
+  ifeq ($(KBUILD_TARGET),win)
+   VBOX_JAVA_HOME ?= c:/jdk
+  endif
+
+  VBOX_JAVA_BIN_PATH ?= $(VBOX_JAVA_HOME)/bin
+  VBOX_JAVA         ?= "$(VBOX_JAVA_BIN_PATH)/java$(HOSTSUFF_EXE)"
+  VBOX_JAVAC         = "$(VBOX_JAVA_BIN_PATH)/javac$(HOSTSUFF_EXE)"
+  VBOX_JAVAH         = "$(VBOX_JAVA_BIN_PATH)/javah$(HOSTSUFF_EXE)"
+  VBOX_JAR           = "$(VBOX_JAVA_BIN_PATH)/jar$(HOSTSUFF_EXE)"
+  VBOX_JAVADOC       = "$(VBOX_JAVA_BIN_PATH)/javadoc$(HOSTSUFF_EXE)"
+  # With Java 11 wsimport was removed, usually part of a separate install now.
+  VBOX_WSIMPORT      = $(firstword $(wildcard $(VBOX_JAVA_BIN_PATH)/wsimport$(HOSTSUFF_EXE)) wsimport$(HOSTSUFF_EXE))
+  # correct for targets we care about
+  VBOX_MD_OS         = $(KBUILD_TARGET)
+  VBOX_JAVA_INC      = \
+        $(VBOX_JAVA_HOME)/include \
+        $(VBOX_JAVA_HOME)/include/$(VBOX_MD_OS)
+ endif # !darwin
+ # The first transform the almost usless openjdk versions like "javac 9-Ubuntu" into something the 2nd expression groks.
+ VBOX_JAVA_FIGURE_VERSION = $(shell $(1) -version 2>&1 \
+        | $(SED_EXT) -n \
+        -e 's/ \([0-9][0-9]*\)\(-[[:alpha:]][[:alpha:]]\)/ \1.0.0\2/' \
+        -e 's|^[^ ]* *\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$(DOLLAR)|$$(expr \1 * 10000 + \2 * 100 + \3)|p' )
+
+ # Test C and C++ files.
+ $(PATH_OUT)/DynamicConfig.c $(PATH_OUT)/DynamicConfig.cpp:
         $(QUIET)$(MKDIR) -p $(@D)
         $(QUIET)$(APPEND) -tn "$@" "int foobar(void)" "{" "    return 42;" "}" ""
 
-# No $(QUIET) here as it's interesting to see what goes into the file.
-$(PATH_OUT)/DynamicConfig.kmk: \
-                $(PATH_ROOT)/Config.kmk \
-                $(LOCALCFG) \
-                $(AUTOCFG) \
-                $(VBOX_GCC_PATH_CC) \
-                $(VBOX_GCC_PATH_CXX) \
-                $(VBOX_GCC_LIBGCC) \
-                $(VBOX_GCC32_PATH_CC) \
-                $(VBOX_GCC32_PATH_CXX) \
-                $(VBOX_GCC32_LIBGCC) \
-                $(if-expr "$(KBUILD_HOST).$(KBUILD_HOST_ARCH)" == "solaris.amd64" && $(KBUILD_HOST_VERSION_MINOR) >= 11 \
-                        , /platform/i86pc/kernel/$(KBUILD_HOST_ARCH)/unix,) \
-                | $(PATH_OUT)/DynamicConfig.c $(PATH_OUT)/DynamicConfig.cpp
+ # No $(QUIET) here as it's interesting to see what goes into the file.
+ $(PATH_OUT)/DynamicConfig.kmk: \
+                $(PATH_ROOT)/Config.kmk \
+                $(LOCALCFG) \
+                $(AUTOCFG) \
+                $(VBOX_GCC_PATH_CC) \
+                $(VBOX_GCC_PATH_CXX) \
+                $(VBOX_GCC_LIBGCC) \
+                $(VBOX_GCC32_PATH_CC) \
+                $(VBOX_GCC32_PATH_CXX) \
+                $(VBOX_GCC32_LIBGCC) \
+                $(if-expr "$(KBUILD_HOST).$(KBUILD_HOST_ARCH)" == "solaris.amd64" && $(KBUILD_HOST_VERSION_MINOR) >= 11 \
+                , /platform/i86pc/kernel/$(KBUILD_HOST_ARCH)/unix,) \
+                | $(PATH_OUT)/DynamicConfig.c $(PATH_OUT)/DynamicConfig.cpp
         $(call MSG_GENERATE,,$@,)
         $(QUIET)$(RM) -f '$@'
         $(QUIET)$(MKDIR) -p $(@D)
         $(QUIET)$(APPEND) '$@' '# Host version: $(KBUILD_HOST_VERSION_MAJOR).$(KBUILD_HOST_VERSION_MINOR).$(KBUILD_HOST_VERSION_PATCH); full: $(KBUILD_HOST_VERSION)'
-ifneq ($(KBUILD_TARGET),win)
+ ifneq ($(KBUILD_TARGET),win)
         $(QUIET)$(APPEND) '$@' '# $(KBUILD_HOST_UNAME_SYSNAME) - $(KBUILD_HOST_UNAME_RELEASE) - $(KBUILD_HOST_UNAME_VERSION)'
-endif
-ifeq ($(KBUILD_TARGET),darwin)
+ endif
+ ifeq ($(KBUILD_TARGET),darwin)
         $(QUIET)$(APPEND) '$@' '#              VBOX_XCODE_VERSION: $(VBOX_XCODE_VERSION)'
         $(QUIET)$(APPEND) '$@' '# VBOX_PATH_MACOSX_TOOLCHAIN_ROOT: $(VBOX_PATH_MACOSX_TOOLCHAIN_ROOT)'
@@ -3282 +3282 @@
         $(QUIET)$(APPEND) '$@' 'VBOX_CLANG_VERSION_CC          ?= $(call VBOX_CLANG_VERSION,$(TOOL_$(VBOX_GCC_TOOL)_CC))'
         $(QUIET)$(APPEND) '$@' 'VBOX_CLANG_VERSION_CXX         ?= $(call VBOX_CLANG_VERSION,$(TOOL_$(VBOX_GCC_TOOL)_CXX))'
-endif
-# HC compiler switch detection.
+ endif
+ # HC compiler switch detection.
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_VERSION_CC            ?= $(call VBOX_GCC_VERSION,$(TOOL_$(VBOX_GCC_TOOL)_CC))'
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_VERSION_CXX           ?= $(call VBOX_GCC_VERSION,$(TOOL_$(VBOX_GCC_TOOL)_CXX))'
@@ -3291 +3291 @@
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-pointer-sign      ?= $(call VBOX_GCC_CHECK_CC,-Wno-pointer-sign,)'
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-array_bounds      ?= $(call VBOX_GCC_CHECK_CC,-Wno-array-bounds,)'
-# -Wextra produces additional useful warnings but includes -Wno-missing-field-initializers (too noisy)
+ # -Wextra produces additional useful warnings but includes -Wno-missing-field-initializers (too noisy)
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wextra                ?= $(call VBOX_GCC_CHECK_CC,-Wextra,)'
         $(QUIET)$(APPEND) '$@' 'ifneq ($$(VBOX_GCC_VERSION_CC),)'
@@ -3334 +3334 @@
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_fno-printf-return-value ?= $(call VBOX_GCC_CHECK_CC,-fno-printf-return-value,)'
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wa_cma_nocompress_debug_sections ?= $(call VBOX_GCC_CHECK_CC,-Wa$(COMMA)--nocompress-debug-sections,)'
-# Produce code optimized for the most common IA32/AMD64/EM64T processors. Introduced with gcc version 4.2.
+ # Produce code optimized for the most common IA32/AMD64/EM64T processors. Introduced with gcc version 4.2.
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_mtune-generic         ?= $(call VBOX_GCC_CHECK_CC,-mtune=generic,)'
         $(QUIET)$(APPEND) '$@' 'VBOX_LD_as_needed              ?= $(call VBOX_GCC_CHECK_LD,--as-needed,)'
         $(QUIET)$(APPEND) '$@' 'VBOX_LD_hash_style_sysv        ?= $(call VBOX_GCC_CHECK_LD,--hash-style=sysv,)'
         $(QUIET)$(APPEND) '$@' 'VBOX_LD_gc_sections            ?= $(call VBOX_GCC_CHECK_LD,--gc-sections,)'
-# Set default attribute for ELF and MACH-O symbols to ``hidden'' to reduce the number
-# of relocation entries and PLT indirections in shared libraries. Don't allow for gcc version < 4.
+ # Set default attribute for ELF and MACH-O symbols to ``hidden'' to reduce the number
+ # of relocation entries and PLT indirections in shared libraries. Don't allow for gcc version < 4.
         $(QUIET)$(APPEND) '$@' 'ifneq ($$(VBOX_GCC_VERSION_CC),)'
         $(QUIET)$(APPEND) '$@' ' if $$(VBOX_GCC_VERSION_CC) >= 40000'
@@ -3346 +3346 @@
         $(QUIET)$(APPEND) '$@' ' endif'
         $(QUIET)$(APPEND) '$@' 'endif'
-ifn1of ($(KBUILD_TARGET),haiku)
-# Set default attribute for inline functions to ``hidden'' to reduce the number
-# of relocation entries and PLT indirections in shared libraries. Don't allow for gcc version < 4.
+ ifn1of ($(KBUILD_TARGET), haiku)
+  # Set default attribute for inline functions to ``hidden'' to reduce the number
+  # of relocation entries and PLT indirections in shared libraries. Don't allow for gcc version < 4.
         $(QUIET)$(APPEND) '$@' 'ifneq ($$(VBOX_GCC_VERSION_CXX),)'
         $(QUIET)$(APPEND) '$@' ' if $$(VBOX_GCC_VERSION_CXX) >= 40000'
@@ -3354 +3354 @@
         $(QUIET)$(APPEND) '$@' ' endif'
         $(QUIET)$(APPEND) '$@' 'endif'
-endif
-# Prevent warnings about unused parameters as of gcc-4.8 / clang 6 as this warning is now very verbose
+ endif
+ # Prevent warnings about unused parameters as of gcc-4.8 / clang 6 as this warning is now very verbose
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-unused-parameter ?= $(call VBOX_GCC_CHECK_CC,-Wno-unused-parameter,)'
-# Clang 6.
+ # Clang 6.
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-language-extension-token ?= $(call VBOX_GCC_CHECK_CC,-Wno-language-extension-token,)'
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-extended-offsetof ?= $(call VBOX_GCC_CHECK_CC,-Wno-extended-offsetof,)'
@@ -3365 +3365 @@
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-nested-anon-types ?= $(call VBOX_GCC_CHECK_CC,-Wno-nested-anon-types,)'
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-gnu-anonymous-struct ?= $(call VBOX_GCC_CHECK_CXX,-Wno-gnu-anonymous-struct,)'
-# Clang 11.
+ # Clang 11.
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-c++17-compat-mangling ?= $(call VBOX_GCC_CHECK_CXX,-Wno-c++17-compat-mangling,)'
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-nullability-extension ?= $(call VBOX_GCC_CHECK_CXX,-Wno-nullability-extension,)'
@@ -3373 +3373 @@
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-c11-extensions ?= $(call VBOX_GCC_CHECK_CXX,-Wno-c11-extensions,)'
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-tautological-pointer-compare ?= $(call VBOX_GCC_CHECK_CC,-Wno-tautological-pointer-compare,)'
-ifeq ($(KBUILD_TARGET),solaris)
+ ifeq ($(KBUILD_TARGET),solaris)
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_msave-args            ?= $(call VBOX_GCC_CHECK_CXX,-msave-args,)'
-# Detect the solaris assembler. It is used by the the 4.x gcc compilers,
-# apparently. It will not be able to handle IEMAll via a -pipe, only when
-# passed a file. The solaris assmbler rulez ... not!
+  # Detect the solaris assembler. It is used by the the 4.x gcc compilers,
+  # apparently. It will not be able to handle IEMAll via a -pipe, only when
+  # passed a file. The solaris assmbler rulez ... not!
         $(QUIET)$(APPEND) '$@' 'VBOX_AS_VERSION                ?= $(shell `gcc -print-prog-name=as` -V -o /dev/null < /dev/null 2>&1 | kmk_sed -e '1!d' -e 's/^as: *//' )'
         $(QUIET)$(APPEND) '$@' 'if $$(pos Sun Compiler Common,$$(VBOX_AS_VERSION)) > 0'
@@ -3385 +3385 @@
         $(QUIET)$(APPEND) '$@' ' VBOX_GCC_pipe                 ?= -pipe'
         $(QUIET)$(APPEND) '$@' 'endif'
-else
+ else
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_pipe                  ?= -pipe'
-endif
-# Find the compiler includes for IPRT no-crt.
-# Note that `$(dir $(gcc -print-libgcc-file-name))/include does not work for a 64-bit cross build on a 32-bit build host.
-ifeq ($(KBUILD_HOST),win)
-# With the cygwin issues and gcc on windows returning a useless path, just skip this on windows.
+ endif
+ # Find the compiler includes for IPRT no-crt.
+ # Note that `$(dir $(gcc -print-libgcc-file-name))/include does not work for a 64-bit cross build on a 32-bit build host.
+ ifeq ($(KBUILD_HOST),win)
+  # With the cygwin issues and gcc on windows returning a useless path, just skip this on windows.
         $(QUIET)$(APPEND) '$@' 'VBOX_PATH_GCC_INCS             ?= '
-else
+ else
         $(QUIET)$(APPEND) '$@' 'VBOX_PATH_GCC_INCS             ?= $(shell LC_ALL=C $(TOOL_$(VBOX_GCC_TOOL)_CC) -print-search-dirs|$(SED_EXT) -ne 's+^install: \(.*[^/][^/]*\)/+\1+p')/include'
-endif
-# 32-bit (GC) compiler switch detection.
+ endif
+ # 32-bit (GC) compiler switch detection.
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC32_PATH_CC             ?= $(which $(TOOL_$(VBOX_GCC32_TOOL)_CC))'
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC32_PATH_CXX            ?= $(which $(TOOL_$(VBOX_GCC32_TOOL)_CXX))'
@@ -3403 +3403 @@
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC32_LIBGCC              ?= $(shell $(TOOL_$(VBOX_GCC32_TOOL)_CC) -print-libgcc-file-name)'
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC32_Wno-variadic-macros ?= $(call VBOX_GCC32_CHECK_CXX,-Wno-variadic-macros,)'
-# darwin no_compact_linkedit starting at Xcode 3.2
-ifeq ($(KBUILD_HOST),darwin)
+ # darwin no_compact_linkedit starting at Xcode 3.2
+ ifeq ($(KBUILD_HOST),darwin)
         $(QUIET)$(APPEND) '$@' 'VBOX_LD_no_compact_linkedit    ?= $(call VBOX_GCC_CHECK_LD,-no_compact_linkedit,)'
-endif
-ifn1of ($(KBUILD_TARGET_ARCH), sparc32 sparc64)
-# YASM
+ endif
+ ifn1of ($(KBUILD_TARGET_ARCH), sparc32 sparc64)
+  # YASM
         $(QUIET)$(APPEND) '$@' '# debug: TOOL_YASM_AS="$(TOOL_YASM_AS)"'
         $(QUIET)$(APPEND) '$@' 'VBOX_YASM_Wno-segreg-in-64bit  ?= $(call VBOX_YASM_CHECK,-Wno-segreg-in-64bit,)'
-# NASM (--allow-64-bit: 2.12rc2)
+  # NASM (--allow-64-bit: 2.12rc2)
         $(QUIET)$(APPEND) '$@' 'VBOX_NASM_allow_64_bit         ?= $(call VBOX_NASM_CHECK,--allow-64-bit,)'
-endif
-if1of ($(KBUILD_TARGET), linux)
- ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
+ endif
+ if1of ($(KBUILD_TARGET), linux)
+  ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
         $(QUIET)$(RM) -f -- "[email protected]" "[email protected]" '[email protected]'
         $(APPEND) -t '[email protected]' 'int foo() { return 42; }'
@@ -3423 +3423 @@
         ldd "[email protected]" | $(SED_EXT) --append '$@' -re '/lib(a|ub)san\.so/!d' -e 's/.* => //' -e 's/ \(0x[0-9a-fA-F]*\) *$(DOLLAR)/ \\/'
         $(QUIET)$(APPEND) '$@' ''
-#       $(QUIET)$(APPEND)  '$@' 'VBOX_GCC32_SANITIZER_SO_FILES := \'
-#       $(TOOL_$(VBOX_GCC32_TOOL)_ENV_SETUP) $(TOOL_$(VBOX_GCC32_TOOL)_CC) -fPIC -shared \
-#               $(VBOX_GCC_SANITIZER_FLAGS) $(VBOX_GCC_SANITIZER_LDFLAGS) -o "[email protected]" "[email protected]"
-#       ldd "[email protected]" | $(SED_EXT) --append '$@' -re '/lib(a|ub)san\.so/!d' -e 's/.* => //' -e 's/ \(0x[0-9a-fA-F]*\) *$(DOLLAR)/ \\/'
-#       $(QUIET)$(APPEND) '$@' ''
+   #    $(QUIET)$(APPEND)  '$@' 'VBOX_GCC32_SANITIZER_SO_FILES := \'
+   #    $(TOOL_$(VBOX_GCC32_TOOL)_ENV_SETUP) $(TOOL_$(VBOX_GCC32_TOOL)_CC) -fPIC -shared \
+   #            $(VBOX_GCC_SANITIZER_FLAGS) $(VBOX_GCC_SANITIZER_LDFLAGS) -o "[email protected]" "[email protected]"
+   #    ldd "[email protected]" | $(SED_EXT) --append '$@' -re '/lib(a|ub)san\.so/!d' -e 's/.* => //' -e 's/ \(0x[0-9a-fA-F]*\) *$(DOLLAR)/ \\/'
+   #    $(QUIET)$(APPEND) '$@' ''
         $(QUIET)$(RM) -f -- "[email protected]" "[email protected]" '[email protected]'
- endif
-endif
-ifdef VBOX_PATH_PREFIX_MINGW32
+  endif
+ endif
+ ifdef VBOX_PATH_PREFIX_MINGW32
         $(QUIET)$(APPEND) '$@' 'VBOX_MINGW32_VERSION_CC                  ?= $(call VBOX_GCC_VERSION,$(VBOX_PATH_PREFIX_MINGW32)gcc -m32)'
         $(QUIET)$(APPEND) '$@' 'VBOX_MINGW32_VERSION_CXX                 ?= $(call VBOX_GCC_VERSION,$(VBOX_PATH_PREFIX_MINGW32)g++ -m32)'
@@ -3438 +3438 @@
         $(QUIET)$(APPEND) '$@' 'VBOX_MINGW32_Wno-maybe-uninitialized     ?= $(call VBOX_GCC_CHECK_EX_CXX,$(VBOX_PATH_PREFIX_MINGW32)g++ -m32,-Wno-maybe-uninitialized,)'
         $(QUIET)$(APPEND) '$@' 'VBOX_MINGW32_USER_LABEL_PREFIX           ?= $(shell echo "__USER_LABEL_PREFIX__" | $(VBOX_PATH_PREFIX_MINGW32)g++ -m32 -E -xc++ - | $(SED) -e "/^$(HASH)/d")'
-endif
-ifdef VBOX_PATH_PREFIX_MINGW64
+ endif
+ ifdef VBOX_PATH_PREFIX_MINGW64
         $(QUIET)$(APPEND) '$@' 'VBOX_MINGW64_VERSION_CC                  ?= $(call VBOX_GCC_VERSION,$(VBOX_PATH_PREFIX_MINGW64)gcc -m64)'
         $(QUIET)$(APPEND) '$@' 'VBOX_MINGW64_VERSION_CXX                 ?= $(call VBOX_GCC_VERSION,$(VBOX_PATH_PREFIX_MINGW64)g++ -m64)'
@@ -3446 +3446 @@
         $(QUIET)$(APPEND) '$@' 'VBOX_MINGW64_Wno-maybe-uninitialized     ?= $(call VBOX_GCC_CHECK_EX_CXX,$(VBOX_PATH_PREFIX_MINGW64)g++ -m64,-Wno-maybe-uninitialized,)'
         $(QUIET)$(APPEND) '$@' 'VBOX_MINGW64_USER_LABEL_PREFIX           ?= $(shell echo "__USER_LABEL_PREFIX__" | $(VBOX_PATH_PREFIX_MINGW64)g++ -m64 -E -xc++ - | $(SED) -e "/^$(HASH)/d")'
-endif
-if defined(TOOL_FLEX) || defined(TOOL_BISON)
+ endif
+ if defined(TOOL_FLEX) || defined(TOOL_BISON)
         echo "Do NOT include the flex or bison tools before Config.kmk gets loaded"
         exit 1 #
-endif
+ endif
         $(QUIET)$(APPEND) '$@' 'VBOX_HAVE_FLEX    ?= $(firstfile $(TOOL_FLEX_LEX) $(which flex))'
         $(QUIET)$(APPEND) '$@' 'VBOX_HAVE_BISON   ?= $(firstfile $(TOOL_BISON_YACC) $(which bison))'
         $(QUIET)$(APPEND) '$@' 'VBOX_HAVE_XMLLINT ?= $(which xmllint)'
-if "$(KBUILD_HOST)" == "solaris" && $(KBUILD_HOST_VERSION_MAJOR) == 5 && $(KBUILD_HOST_VERSION_MINOR) == 11
-# BRANCH_VERSION format on S11 - S11.3:
-#   <trunk_id>.<update>.<sru>.<reserved>.<buildid>.<nightly_id>
-#   e.g.:  0.175.3.32.0.4.0:20180427T232405Z - N.B. trunk_id = 0.175
-# BRANCH_VERSION format on S11.4:
-#   <minor>.<update>.<sru>.<reserved>.<reserved>.<buildid>.<nightly_id>
-#   e.g.: 11.4.0.0.1.10.0:20180702T173343Z
-# We're interested in <update> and <buildid>.
+ if "$(KBUILD_HOST)" == "solaris" && $(KBUILD_HOST_VERSION_MAJOR) == 5 && $(KBUILD_HOST_VERSION_MINOR) == 11
+  # BRANCH_VERSION format on S11 - S11.3:
+  #   <trunk_id>.<update>.<sru>.<reserved>.<buildid>.<nightly_id>
+  #   e.g.:  0.175.3.32.0.4.0:20180427T232405Z - N.B. trunk_id = 0.175
+  # BRANCH_VERSION format on S11.4:
+  #   <minor>.<update>.<sru>.<reserved>.<reserved>.<buildid>.<nightly_id>
+  #   e.g.: 11.4.0.0.1.10.0:20180702T173343Z
+  # We're interested in <update> and <buildid>.
         $(QUIET)$(APPEND) '$@' "VBOX_SOLARIS_11_BRANCH_VERSION := $(shell pkg contents -H -t set -o pkg.fmri system/kernel | $(SED_EXT) -e '1!d' -e 's/^.*\-//;s/\:.*//;s/.*,//')"
         $(QUIET)$(APPEND) '$@' 'ifeq ($$(word 2, $$(subst ., ,$$(VBOX_SOLARIS_11_BRANCH_VERSION))),175)'
@@ -3469 +3469 @@
         $(QUIET)$(APPEND) '$@' 'endif'
         $(QUIET)$(APPEND) '$@' 'VBOX_SOLARIS_11_BUILD_VERSION  := $$(word 6, $$(subst ., ,$$(VBOX_SOLARIS_11_BRANCH_VERSION)))'
-endif
-if1of ($(KBUILD_HOST), darwin freebsd solaris)
+ endif
+ if1of ($(KBUILD_HOST), darwin freebsd solaris)
         $(QUIET)$(APPEND) '$@' 'VBOX_HOST_DTRACE_VERSION := $(shell dtrace -V)'
-endif
-if defined(VBOX_PYLINT) && !defined(VBOX_WITH_PYLINT_PRE_V1_0) && !defined(VBOX_WITH_PYLINT_V1_1_PLUS) && !defined(VBOX_WITH_PYLINT_V1_2_1_PLUS)
+ endif
+ if defined(VBOX_PYLINT) && !defined(VBOX_WITH_PYLINT_PRE_V1_0) && !defined(VBOX_WITH_PYLINT_V1_1_PLUS) && !defined(VBOX_WITH_PYLINT_V1_2_1_PLUS)
         $(QUIET)$(APPEND) '$@' "VBOX_PYLINT_VERSION  := $(call VBOX_PYLINT_FIGURE_VERSION, $(VBOX_PYLINT))"
-endif
-if defined(VBOX_JAVAC)
+ endif
+ if defined(VBOX_JAVAC)
         $(QUIET)$(APPEND) '$@' 'VBOX_JAVA_VERSION    := $(call VBOX_JAVA_FIGURE_VERSION, $(VBOX_JAVAC))'
-endif
+ endif
 
         $(QUIET)$(ECHO) '========= START OF $@ ========='
@@ -3484 +3484 @@
         $(QUIET)$(ECHO) '=========== END OF $@ ========='
 
-include $(PATH_OUT)/DynamicConfig.kmk
+ include $(PATH_OUT)/DynamicConfig.kmk
 endif # !VBOX_NOINC_DYNAMIC_CONFIG_KMK
 
@@ -3495 +3495 @@
 ifndef VBOX_GCC_std
  if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.arm64) # Go straight for c++17 here.
-VBOX_GCC_std := -std=c++17
-# else if "$(VBOX_CLANG_VERSION_CXX)" vge 60000 # Most language features complete by v6. Lib stuff was less complete in v6, but hopefully acceptable for out purposes.
-#VBOX_GCC_std := -std=c++17
+  VBOX_GCC_std := -std=c++17
+  # else if "$(VBOX_CLANG_VERSION_CXX)" vge 60000 # Most language features complete by v6. Lib stuff was less complete in v6, but hopefully acceptable for out purposes.
+  #VBOX_GCC_std := -std=c++17
  else if "$(VBOX_CLANG_VERSION_CXX)" vge 50000 # darwin Xcode 5 allegedly knows what C++11 is
-VBOX_GCC_std := -std=c++11
-# else if "$(VBOX_GCC_VERSION_CXX)" vge 70000 # Language feature P0512R0 was v8, rest v7 or earlier. Most lib stuff present in 7, complete in v12.
-#VBOX_GCC_std := -std=gnu++17
+  VBOX_GCC_std := -std=c++11
+  # else if "$(VBOX_GCC_VERSION_CXX)" vge 70000 # Language feature P0512R0 was v8, rest v7 or earlier. Most lib stuff present in 7, complete in v12.
+  #VBOX_GCC_std := -std=gnu++17
  else if "$(VBOX_GCC_VERSION_CXX)" vge 40800
-VBOX_GCC_std := -std=c++11
+  VBOX_GCC_std := -std=c++11
  else if "$(VBOX_GCC_VERSION_CXX)" vge 40600
-VBOX_GCC_std := -std=c++0x
+  VBOX_GCC_std := -std=c++0x
  endif
 endif
@@ -3522 +3522 @@
         $(VBOX_GCC_Wno-extended-offsetof) $(VBOX_GCC_Wno-gnu-folding-constant) $(VBOX_GCC_Wno-gnu-anonymous-struct) \
         $(VBOX_GCC_Wlogical-op) $(VBOX_GCC_Wno-string-plus-int) $(VBOX_GCC_Wno-nested-anon-types) $(VBOX_GCC_Wno-variadic-macros) \
-       $(VBOX_GCC_Wno-c++17-compat-mangling)
+        $(VBOX_GCC_Wno-c++17-compat-mangling)
 VBOX_GCC_WARN_PEDANTIC = -Wshadow $(VBOX_GCC_WARN) -Wno-long-long
 if $(VBOX_GCC_VERSION_CXX) >= 40200 || defined(VBOX_WITH_MASOCHISTIC_WARNINGS) # gcc 4.2.x+ (4.1.2 is causing trouble with the extpack & add builds)
@@ -3742 +3742 @@
 #
 if1of ($(KBUILD_TYPE), debug dbgopt strict)
-#not yet# VBOX_WITH_DEBUG_VCC_CRT = 1
+ #not yet# VBOX_WITH_DEBUG_VCC_CRT = 1
 endif
 ifdef VBOX_WITH_DEBUG_VCC_CRT
@@ -3856 +3856 @@
 VBOX_EDIT_VERSION_RULE_FN = $(eval $(value VBOX_EDIT_VERSION_RULE_DEF))
 define VBOX_EDIT_VERSION_RULE_DEF
-$$($(1)_0_OUTDIR)/$(if $(3),$(3),$(2)): $(PATH_SUB_CURRENT)/$(2) $(VBOX_SVN_REV_KMK) | $$(dir $$@)
+ $$($(1)_0_OUTDIR)/$(if $(3),$(3),$(2)): $(PATH_SUB_CURRENT)/$(2) $(VBOX_SVN_REV_KMK) | $$(dir $$@)
         $(call MSG_GENERATE,$(1),$@,$<)
         $(QUIET)$(call VBOX_EDIT_VERSION_CMD_FN,$<,$@)
-$(eval $(1)_CLEAN += $$($(1)_0_OUTDIR)/$(if $(3),$(3),$(2)))
+ $(eval $(1)_CLEAN += $$($(1)_0_OUTDIR)/$(if $(3),$(3),$(2)))
 endef
 
@@ -3897 +3897 @@
 VBOX_EDIT_VERSION_AND_BUILD_RULE_FN = $(eval $(VBOX_EDIT_VERSION_AND_BUILD_RULE_DEF))
 define VBOX_EDIT_VERSION_AND_BUILD_RULE_DEF
-$$$$($(1)_0_OUTDIR)/$(if $(3),$(3),$(2)): $$(PATH_SUB_CURRENT)/$(2) $$(VBOX_SVN_REV_KMK) | $$$$(dir $$$$@)
+ $$$$($(1)_0_OUTDIR)/$(if $(3),$(3),$(2)): $$(PATH_SUB_CURRENT)/$(2) $$(VBOX_SVN_REV_KMK) | $$$$(dir $$$$@)
         $$(call MSG_GENERATE,$(1),$$@,$$<)
         $$(QUIET)$$(call VBOX_EDIT_VERSION_AND_BUILD_CMD_FN,$$<,$$@)
-$(1)_CLEAN += $$($(1)_0_OUTDIR)/$(if $(3),$(3),$(2))
+ $(1)_CLEAN += $$($(1)_0_OUTDIR)/$(if $(3),$(3),$(2))
 endef
 
@@ -3913 +3913 @@
 VBOX_GENERATE_IMPORT_TARGET_FN = $(eval $(VBOX_GENERATE_IMPORT_TARGET_DEF))
 define VBOX_GENERATE_IMPORT_TARGET_DEF
-$(1)_TEMPLATE = VBoxR3Dll
-$(1)_INST     = $(INST_LIB)
-if $(KBUILD_TARGET) == "darwin"
- $(1)_LDFLAGS = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/$(2)$(SUFF_DLL)
-else ifn1of ($(KBUILD_TARGET), os2 win)
- $(1)_SONAME  = $(2)$(SUFF_DLL)
-endif
-if1of ($(KBUILD_TARGET), os2 win)
- $(1)_SOURCES = $$($(1)_0_OUTDIR)/$(1)Imp.def
- $(1)_CLEAN   = $$($(1)_0_OUTDIR)/$(1)Imp.def
-else
- $(1)_SOURCES = $$($(1)_0_OUTDIR)/$(1)Imp.c
- $(1)_CLEAN   = $$($(1)_0_OUTDIR)/$(1)Imp.c
-endif
-
-$$$$($(1)_SOURCES): $(addprefix $(PATH_SUB_CURRENT)/,$(3)) $(PATH_ROOT)/src/bldprogs/deftoimp.sed | $$$$(dir $$$$@)
+ $(1)_TEMPLATE = VBoxR3Dll
+ $(1)_INST    = $(INST_LIB)
+ if $(KBUILD_TARGET) == "darwin"
+  $(1)_LDFLAGS = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/$(2)$(SUFF_DLL)
+ else ifn1of ($(KBUILD_TARGET), os2 win)
+  $(1)_SONAME = $(2)$(SUFF_DLL)
+ endif
+ if1of ($(KBUILD_TARGET), os2 win)
+  $(1)_SOURCES = $$($(1)_0_OUTDIR)/$(1)Imp.def
+  $(1)_CLEAN  = $$($(1)_0_OUTDIR)/$(1)Imp.def
+ else
+  $(1)_SOURCES = $$($(1)_0_OUTDIR)/$(1)Imp.c
+  $(1)_CLEAN  = $$($(1)_0_OUTDIR)/$(1)Imp.c
+ endif
+
+ $$$$($(1)_SOURCES): $(addprefix $(PATH_SUB_CURRENT)/,$(3)) $(PATH_ROOT)/src/bldprogs/deftoimp.sed | $$$$(dir $$$$@)
         $$(call MSG_GENERATE,,$$@)
-ifeq ($(KBUILD_TARGET),os2)
+ ifeq ($(KBUILD_TARGET),os2)
         $$(SED) \
                 -e '/not-$(KBUILD_TARGET)/d' \
@@ -3938 +3938 @@
                 -e 's/[ \t]DATA[ \t]*/ /'  \
                 --output $$@ $(addprefix $(PATH_SUB_CURRENT)/,$(3))
-else ifeq ($(KBUILD_TARGET),win)
+ else ifeq ($(KBUILD_TARGET),win)
         $$(SED) \
                 -e '/not-$(KBUILD_TARGET)/d' \
                 -e '/not-$(KBUILD_TARGET_ARCH)/d' \
                 --output $$@ $(addprefix $(PATH_SUB_CURRENT)/,$(3))
-else
+ else
         $$(QUIET)$$(APPEND) -tn $$@ \
                 '#ifdef VBOX_HAVE_VISIBILITY_HIDDEN' \
@@ -3958 +3958 @@
                 -f $(PATH_ROOT)/src/bldprogs/deftoimp.sed \
                 --append $$@ $(addprefix $(PATH_SUB_CURRENT)/,$(3))
-endif
+ endif
 endef # VBOX_GENERATE_IMPORT_TARGET_DEF
 
@@ -3976 +3976 @@
  #
  VBOX_UTF8_MANIFEST_FN = \
-        $(QUIET)$(APPEND) -tn "$(1).manifest" \
-                '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' \
-                '<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">' \
-                ' <assemblyIdentity type="win32" name="$(notdir $(1))" processorArchitecture="$(2)" version="$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD).$(expr $(VBOX_SVN_REV) % 50000)" />' \
-                ' <asmv3:application>' \
-                '  <asmv3:windowsSettings>' \
-                '   <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>' \
-                '  </asmv3:windowsSettings>' \
-                ' </asmv3:application>' \
-                '</assembly>' \
-        $(NLTAB)$(QUIET)$(REDIRECT) -- $(requote sh,$(PATH_SDK_$(VBOX_WINPSDK)_BIN)/mt.exe) \
-                -nologo -manifest '$(subst /,\,$(1).manifest)' '-outputresource:$(subst /,\,$(1));$(HASH)1' \
-        $(NLTAB)$(QUIET)$(RM) -f -- "$(1).manifest"
+        $(QUIET)$(APPEND) -tn "$(1).manifest" \
+        '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' \
+        '<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">' \
+        ' <assemblyIdentity type="win32" name="$(notdir $(1))" processorArchitecture="$(2)" version="$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD).$(expr $(VBOX_SVN_REV) % 50000)" />' \
+        ' <asmv3:application>' \
+        '  <asmv3:windowsSettings>' \
+        '   <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>' \
+        '  </asmv3:windowsSettings>' \
+        ' </asmv3:application>' \
+        '</assembly>' \
+        $(NLTAB)$(QUIET)$(REDIRECT) -- $(requote sh,$(PATH_SDK_$(VBOX_WINPSDK)_BIN)/mt.exe) \
+        -nologo -manifest '$(subst /,\,$(1).manifest)' '-outputresource:$(subst /,\,$(1));$(HASH)1' \
+        $(NLTAB)$(QUIET)$(RM) -f -- "$(1).manifest"
  VBOX_UTF8_MANIFEST_CMDS ?= $(if-expr "$(tool_do)" == "LINK_PROGRAM",$(call VBOX_UTF8_MANIFEST_FN,$(out),$(bld_trg_arch)),)
 else
@@ -4026 +4026 @@
  VBOX_CCS_CLIENT_JAR := $(firstword $(rsort \
         $(wildcard $(KBUILD_DEVTOOLS)/common/ccs/v*/Client.jar)) \
-        $(KBUILD_DEVTOOLS)/common/ccs/notfound/Client.jar )
+        $(KBUILD_DEVTOOLS)/common/ccs/notfound/Client.jar )
  VBOX_CCS_USER       ?= virtualbox_grp
  VBOX_CCS_GLOBAL_UID ?= non-of-your-business
@@ -4038 +4038 @@
  VBOX_CCS_SIGN_CMD    = $(VBOX_RETRY) $(VBOX_JAVA) -jar "$(VBOX_CCS_CLIENT_JAR)" \
         sign -user "$(VBOX_CCS_USER)" -global_uid "$(VBOX_CCS_GLOBAL_UID)" \
-                -job_timeout 90 -server_timeout 75 -server "$(VBOX_CCS_SERVER)" \
-                -sign_method "$1" -file_to_sign "$2" -signed_location "$(if $3,$3,$(call VBOX_DIRX,$2))" $4
+        -job_timeout 90 -server_timeout 75 -server "$(VBOX_CCS_SERVER)" \
+        -sign_method "$1" -file_to_sign "$2" -signed_location "$(if $3,$3,$(call VBOX_DIRX,$2))" $4
 
  ifeq ($(KBUILD_HOST),win)
@@ -4145 +4145 @@
    if $(intersects win all 1,$(VBOX_WITH_CORP_CODE_SIGNING))
     VBOX_SIGN_FILE_FN     = $(call VBOX_CCS_SIGN_CMD,driver$(if-expr "$3" == "/ph",_pagehash,),$1,,-digest_algo $(if-expr "$5" == "",SHA1,SHA2)) \
-        $(if-expr "$5" == "",\
-         $(if-expr "$6" == "",$(if-expr "$4" == "2",$$(NLTAB),$(NLTAB)),$6) \
-         $(call VBOX_CCS_SIGN_CMD,driver$(if-expr "$3" == "/ph",_pagehash,),$1,,-dual_sign -digest_algo SHA2))
+        $(if-expr "$5" == "", \
+        $(if-expr "$6" == "",$(if-expr "$4" == "2",$$(NLTAB),$(NLTAB)),$6) \
+        $(call VBOX_CCS_SIGN_CMD,driver$(if-expr "$3" == "/ph",_pagehash,),$1,,-dual_sign -digest_algo SHA2))
    else ifdef VBOX_CERTIFICATE_SHA2_SUBJECT_NAME
     ifdef VBOX_CERTIFICATE_SUBJECT_NAME
      VBOX_SIGN_FILE_FN     = $(if-expr "$5" == "",$(VBOX_SIGNTOOL_SHA1) \
-        sign /fd sha1 \
-        $(VBOX_CROSS_CERTIFICATE_FILE_ARGS) \
-        $(VBOX_CERTIFICATE_STORE_ARGS) \
-        $(VBOX_CERTIFICATE_SUBJECT_NAME_ARGS) \
-        $(VBOX_CERTIFICATE_FINGERPRINT_ARGS) \
-        $(VBOX_TSA_URL_ARGS) \
-        $(if $(strip $(2)),/d "$(strip $(2))",) \
-        $(3) \
-        "$(1)" \
-       $(if-expr "$6" == "",$(if-expr "$4" == "2",$$(NLTAB),$(NLTAB)),$6))$(VBOX_SIGNTOOL_SHA2) \
-        sign $(if-expr "$5" == "",/as,) /fd sha256 \
-        $(VBOX_CROSS_CERTIFICATE_SHA2_FILE_ARGS) \
-        $(VBOX_CERTIFICATE_SHA2_STORE_ARGS) \
-        $(VBOX_CERTIFICATE_SHA2_SUBJECT_NAME_ARGS) \
-        $(VBOX_CERTIFICATE_SHA2_FINGERPRINT_ARGS) \
-        $(VBOX_TSA_SHA2_URL_ARGS) \
-        $(if $(strip $(2)),/d "$(strip $(2))",) \
-        $(3) \
-        "$(1)"
+        sign /fd sha1 \
+        $(VBOX_CROSS_CERTIFICATE_FILE_ARGS) \
+        $(VBOX_CERTIFICATE_STORE_ARGS) \
+        $(VBOX_CERTIFICATE_SUBJECT_NAME_ARGS) \
+        $(VBOX_CERTIFICATE_FINGERPRINT_ARGS) \
+        $(VBOX_TSA_URL_ARGS) \
+        $(if $(strip $(2)),/d "$(strip $(2))",) \
+        $(3) \
+        "$(1)" \
+        $(if-expr "$6" == "",$(if-expr "$4" == "2",$$(NLTAB),$(NLTAB)),$6))$(VBOX_SIGNTOOL_SHA2) \
+        sign $(if-expr "$5" == "",/as,) /fd sha256 \
+        $(VBOX_CROSS_CERTIFICATE_SHA2_FILE_ARGS) \
+        $(VBOX_CERTIFICATE_SHA2_STORE_ARGS) \
+        $(VBOX_CERTIFICATE_SHA2_SUBJECT_NAME_ARGS) \
+        $(VBOX_CERTIFICATE_SHA2_FINGERPRINT_ARGS) \
+        $(VBOX_TSA_SHA2_URL_ARGS) \
+        $(if $(strip $(2)),/d "$(strip $(2))",) \
+        $(3) \
+        "$(1)"
     else
      VBOX_SIGN_FILE_FN     = $(VBOX_SIGNTOOL_SHA2) \
-        sign /fd sha256 \
-        $(VBOX_CROSS_CERTIFICATE_SHA2_FILE_ARGS) \
-        $(VBOX_CERTIFICATE_SHA2_STORE_ARGS) \
-        $(VBOX_CERTIFICATE_SHA2_SUBJECT_NAME_ARGS) \
-        $(VBOX_CERTIFICATE_SHA2_FINGERPRINT_ARGS) \
-        $(VBOX_TSA_SHA2_URL_ARGS) \
-        $(if $(strip $(2)),/d "$(strip $(2))",) \
-        $(3) \
-        "$(1)"
+        sign /fd sha256 \
+        $(VBOX_CROSS_CERTIFICATE_SHA2_FILE_ARGS) \
+        $(VBOX_CERTIFICATE_SHA2_STORE_ARGS) \
+        $(VBOX_CERTIFICATE_SHA2_SUBJECT_NAME_ARGS) \
+        $(VBOX_CERTIFICATE_SHA2_FINGERPRINT_ARGS) \
+        $(VBOX_TSA_SHA2_URL_ARGS) \
+        $(if $(strip $(2)),/d "$(strip $(2))",) \
+        $(3) \
+        "$(1)"
     endif
    else
     VBOX_SIGN_FILE_FN     = $(VBOX_SIGNTOOL) \
-        sign /fd $(firstword $(VBOX_TEST_SIGN_ALGORITHM) sha256) \
-        $(VBOX_CROSS_CERTIFICATE_FILE_ARGS) \
-        $(VBOX_CERTIFICATE_STORE_ARGS) \
-        $(VBOX_CERTIFICATE_SUBJECT_NAME_ARGS) \
-        $(VBOX_CERTIFICATE_FINGERPRINT_ARGS) \
-        $(VBOX_TSA_URL_ARGS) \
-        $(if $(strip $(2)),/d "$(strip $(2))",) \
-        $(3) \
-        "$(1)"
+        sign /fd $(firstword $(VBOX_TEST_SIGN_ALGORITHM) sha256) \
+        $(VBOX_CROSS_CERTIFICATE_FILE_ARGS) \
+        $(VBOX_CERTIFICATE_STORE_ARGS) \
+        $(VBOX_CERTIFICATE_SUBJECT_NAME_ARGS) \
+        $(VBOX_CERTIFICATE_FINGERPRINT_ARGS) \
+        $(VBOX_TSA_URL_ARGS) \
+        $(if $(strip $(2)),/d "$(strip $(2))",) \
+        $(3) \
+        "$(1)"
    endif
   endif
@@ -4204 +4204 @@
    else ifdef VBOX_CERTIFICATE_EV_SUBJECT_NAME
     VBOX_SIGN_EV_FILE_FN  = $(VBOX_SIGNTOOL_SHA2) \
-        sign /fd sha256 \
-        $(VBOX_CERTIFICATE_EV_STORE_ARGS) \
-        $(VBOX_CERTIFICATE_EV_SUBJECT_NAME_ARGS) \
-        $(VBOX_CERTIFICATE_EV_FINGERPRINT_ARGS) \
-        $(VBOX_TSA_SHA2_URL_ARGS) \
-        "$(1)"
+        sign /fd sha256 \
+        $(VBOX_CERTIFICATE_EV_STORE_ARGS) \
+        $(VBOX_CERTIFICATE_EV_SUBJECT_NAME_ARGS) \
+        $(VBOX_CERTIFICATE_EV_FINGERPRINT_ARGS) \
+        $(VBOX_TSA_SHA2_URL_ARGS) \
+        "$(1)"
    endif
   endif
@@ -4235 +4235 @@
   #
   # @remarks The parameters are the same as VBOX_SIGN_FILE_FN.
-  VBOX_SIGN_IMAGE_WITH_EV_FN = $(call VBOX_SIGN_FILE_FN,$1,$2,$3,$4,$5)$(if-expr "$5" == "" && "$(target)" != "bldRTSignTool",\
-        $(if-expr "$4" == "2",$$(NLTAB),$(NLTAB))$(RM) -f -- "$1.dual" \
+  VBOX_SIGN_IMAGE_WITH_EV_FN = $(call VBOX_SIGN_FILE_FN,$1,$2,$3,$4,$5)$(if-expr "$5" == "" && "$(target)" != "bldRTSignTool", \
+        $(if-expr "$4" == "2",$$(NLTAB),$(NLTAB))$(RM) -f -- "$1.dual" \
         $(if-expr "$4" == "2",$$(NLTAB),$(NLTAB))$(CP) -- "$1" "$1.dual" \
         $(if-expr "$4" == "2",$$(NLTAB),$(NLTAB))$(call VBOX_CCS_SIGN_CMD,microsoftev,$1,,-digest_algo SHA2) \
@@ -4262 +4262 @@
   # @remarks The parameters are the same as VBOX_SIGN_FILE_FN.
   VBOX_SIGN_IMAGE_PLAN_B_FN = $(VBOX_SIGNTOOL_SHA1) \
-        sign /fd sha1\
+        sign /fd sha1 \
         $(VBOX_CROSS_CERTIFICATE_FILE_ARGS) \
         $(VBOX_CERTIFICATE_STORE_ARGS) \
@@ -4271 +4271 @@
         $(3) \
         "$(1)" \
-        $(if-expr "$5" == "",\
-        $(if-expr "$4" == "2",$$(NLTAB),$(NLTAB))$(RM) -f -- "$1.ccs" \
+        $(if-expr "$5" == "", \
+        $(if-expr "$4" == "2",$$(NLTAB),$(NLTAB))$(RM) -f -- "$1.ccs" \
         $(if-expr "$4" == "2",$$(NLTAB),$(NLTAB))$(CP) -- "$1" "$1.ccs" \
         $(if-expr "$4" == "2",$$(NLTAB),$(NLTAB))$(call VBOX_CCS_SIGN_CMD,driver$(if-expr "$3" == "/ph",_pagehash,),$1.ccs,,-digest_algo SHA2) \
@@ -4283 +4283 @@
   # @param 2  File description. Optional.
   # @param 3  Set to 2 if the expression will be expanded twice before chopped into commands (for _CMDS).
-  if1of (win_with_ev,$(VBOX_WITH_CORP_CODE_SIGNING))
+  if1of (win_with_ev, $(VBOX_WITH_CORP_CODE_SIGNING))
    VBOX_SIGN_IMAGE_FN        ?= $(call VBOX_SIGN_IMAGE_WITH_EV_FN,$(1),$(2),/ph,$(3))
    VBOX_SIGN_IMAGE_ORDERDEPS ?= $(VBOX_RTSIGNTOOL) $(VBOX_SIGNTOOL_ORDERDEPS)
@@ -4306 +4306 @@
   ifndef VBOX_MAKE_CAT_HLP_FN
    VBOX_MAKE_CAT_HLP_FN = \
-        $(RM) -f -- "$(2)"\
-        $(NL)$(TAB)$(VBOX_INF2CAT) "/driver:$(strip $(1))" "/os:$(strip $(subst ;,$(COMMA),$(3)))" /verbose \
-        $(NL)$(TAB)$(MV) -- "$(2)" "$(2)"
+        $(RM) -f -- "$(2)" \
+        $(NL)$(TAB)$(VBOX_INF2CAT) "/driver:$(strip $(1))" "/os:$(strip $(subst ;,$(COMMA),$(3)))" /verbose \
+        $(NL)$(TAB)$(MV) -- "$(2)" "$(2)"
    if $(intersects win_planb,$(VBOX_WITH_CORP_CODE_SIGNING))
     VBOX_MAKE_CAT_HLP_FN += $(NL)$(TAB)$(call VBOX_SIGN_IMAGE_PLAN_B_FN,$(2),,,$(NL)$(TAB))
@@ -4346 +4346 @@
   # @param 2  Identifier, optional.
   ifeq ($(VBOX_SIGNING_MODE),adhoc)
-  if $(intersects darwin all 1,$(VBOX_WITH_CORP_CODE_SIGNING))
-   ## @todo cannot handle $(2), the identifier.
-   VBOX_SIGN_IMAGE_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB) \
-        $(call VBOX_CCS_SIGN_CMD,binary,$(1),,$(subst --entitlements=,-entitlement_file_path ,$(3)) \
-                $(if $(VBOX_WITH_MACOS_HARDENED_RUNTIME),-hardened_runtime))
+   if $(intersects darwin all 1,$(VBOX_WITH_CORP_CODE_SIGNING))
+    ## @todo cannot handle $(2), the identifier.
+    VBOX_SIGN_IMAGE_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB) \
+        $(call VBOX_CCS_SIGN_CMD,binary,$(1),,$(subst --entitlements=,-entitlement_file_path ,$(3)) \
+        $(if $(VBOX_WITH_MACOS_HARDENED_RUNTIME),-hardened_runtime))
+   else
+    VBOX_SIGN_IMAGE_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(VBOX_CODESIGN) \
+        --verbose=9 \
+        --force \
+        $(if-expr $(KBUILD_HOST_VERSION_MAJOR) <= 14,--digest-algorithm sha256,) \
+        $(if $(VBOX_WITH_MACOS_HARDENED_RUNTIME),$(if-expr $(KBUILD_HOST_VERSION_MAJOR) <= 16,--options 0x10000,--options runtime)) \
+        --file-list - \
+        $(if-expr defined(VBOX_TSA_URL),--timestamp="$(VBOX_TSA_URL)") \
+        $(VBOX_CERTIFICATE_SUBJECT_NAME_ARGS) \
+        --entitlements="$(VBOX_DARWIN_ENTITLEMENTS_FILE)" \
+        "$(1)" \
+        $(if $(2),--identifier "$(2)",)
+   endif
   else
-   VBOX_SIGN_IMAGE_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(VBOX_CODESIGN) \
-        --verbose=9 \
-        --force \
-        $(if-expr $(KBUILD_HOST_VERSION_MAJOR) <= 14,--digest-algorithm sha256,) \
-        $(if $(VBOX_WITH_MACOS_HARDENED_RUNTIME),$(if-expr $(KBUILD_HOST_VERSION_MAJOR) <= 16,--options 0x10000,--options runtime)) \
-        --file-list - \
-        $(if-expr defined(VBOX_TSA_URL),--timestamp="$(VBOX_TSA_URL)") \
-        $(VBOX_CERTIFICATE_SUBJECT_NAME_ARGS) \
-        --entitlements="$(VBOX_DARWIN_ENTITLEMENTS_FILE)" \
-        "$(1)" \
-        $(if $(2),--identifier "$(2)",)
-  endif
-  else
-    VBOX_SIGN_IMAGE_FN =
+   VBOX_SIGN_IMAGE_FN  =
   endif
 
@@ -4375 +4375 @@
   #
   if defined(VBOX_CERTIFICATE_FINGERPRINT) && !defined(VBOX_CERTIFICATE_SUBJECT_NAME)
-    VBOX_CERTIFICATE_SUBJECT_NAME = $(subst $(SP),,$(VBOX_CERTIFICATE_FINGERPRINT))
+   VBOX_CERTIFICATE_SUBJECT_NAME  = $(subst $(SP),,$(VBOX_CERTIFICATE_FINGERPRINT))
   endif
   ifeq ($(VBOX_SIGNING_MODE),test)
@@ -4381 +4381 @@
    VBOX_CERTIFICATE_SUBJECT_NAME_ARGS ?= --sign "$(VBOX_CERTIFICATE_SUBJECT_NAME)"
    VBOX_TSA_URL ?= none
-  else ifeq ($(VBOX_SIGNING_MODE), adhoc)
+  else ifeq ($(VBOX_SIGNING_MODE),adhoc)
    ifdef VBOX_CERTIFICATE_SUBJECT_NAME
     $(error VBOX_CERTIFICATE_SUBJECT_NAME must not be set in 'adhoc' signing mode)
@@ -4410 +4410 @@
   # @param 2  Identifier, mandatory.
   # @param 3  The directory to put the notarized file in. Defaults to $(dir $1).
- VBOX_CCS_NOTARIZE_CMD = $(VBOX_RETRY) $(VBOX_JAVA) -jar "$(VBOX_CCS_CLIENT_JAR)" \
-        mac_notarize -user "$(VBOX_CCS_USER)" -global_uid "$(VBOX_CCS_GLOBAL_UID)" \
-                -job_timeout 90 -server_timeout 75 -server "$(VBOX_CCS_SERVER)" \
-                -file_to_notarize "$1" -bundle_id "$2" -download_location "$(if $3,$3,$(call VBOX_DIRX,$1))"
+  VBOX_CCS_NOTARIZE_CMD = $(VBOX_RETRY) $(VBOX_JAVA) -jar "$(VBOX_CCS_CLIENT_JAR)" \
+        mac_notarize -user "$(VBOX_CCS_USER)" -global_uid "$(VBOX_CCS_GLOBAL_UID)" \
+        -job_timeout 90 -server_timeout 75 -server "$(VBOX_CCS_SERVER)" \
+        -file_to_notarize "$1" -bundle_id "$2" -download_location "$(if $3,$3,$(call VBOX_DIRX,$1))"
 
   ## Sign an application bundle, framework or kernel extension.
@@ -4423 +4423 @@
    ## @todo $(3) is hopefully either empty, --deep or --entitlements=...
    VBOX_SIGN_BUNDLE_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB) \
-        ditto -c -k --keepParent "$(1)" "$(1).zip"$(NLTAB) \
-        $(call VBOX_CCS_SIGN_CMD,apple,$(1).zip,,$(subst --entitlements=,-entitlement_file_path ,$(subst --deep,-deep,$(3))) \
-                $(if $(VBOX_WITH_MACOS_HARDENED_RUNTIME),-hardened_runtime))$(NLTAB) \
-        ditto -x -k "$(1).zip" "$(1)/../"$(NLTAB) \
-        $(RM) -f -- "$(1).zip"
+        ditto -c -k --keepParent "$(1)" "$(1).zip"$(NLTAB) \
+        $(call VBOX_CCS_SIGN_CMD,apple,$(1).zip,,$(subst --entitlements=,-entitlement_file_path ,$(subst --deep,-deep,$(3))) \
+        $(if $(VBOX_WITH_MACOS_HARDENED_RUNTIME),-hardened_runtime))$(NLTAB) \
+        ditto -x -k "$(1).zip" "$(1)/../"$(NLTAB) \
+        $(RM) -f -- "$(1).zip"
   else
    VBOX_SIGN_BUNDLE_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(VBOX_CODESIGN) \
-        --verbose=9 \
-        --force \
-        $(if-expr $(KBUILD_HOST_VERSION_MAJOR) <= 14,--digest-algorithm sha256,) \
-        $(if $(VBOX_WITH_MACOS_HARDENED_RUNTIME),$(if-expr $(KBUILD_HOST_VERSION_MAJOR) <= 16,--options 0x10000,--options runtime)) \
-        --file-list - \
-        $(if-expr defined(VBOX_TSA_URL),--timestamp="$(VBOX_TSA_URL)") \
-        $(3) \
-        $(VBOX_CERTIFICATE_SUBJECT_NAME_ARGS) \
-        "$(1)" $(if $(2),--identifier "$(2)",)
+        --verbose=9 \
+        --force \
+        $(if-expr $(KBUILD_HOST_VERSION_MAJOR) <= 14,--digest-algorithm sha256,) \
+        $(if $(VBOX_WITH_MACOS_HARDENED_RUNTIME),$(if-expr $(KBUILD_HOST_VERSION_MAJOR) <= 16,--options 0x10000,--options runtime)) \
+        --file-list - \
+        $(if-expr defined(VBOX_TSA_URL),--timestamp="$(VBOX_TSA_URL)") \
+        $(3) \
+        $(VBOX_CERTIFICATE_SUBJECT_NAME_ARGS) \
+        "$(1)" $(if $(2),--identifier "$(2)",)
   endif
 
@@ -4449 +4449 @@
    ## @todo $(3) is hopefully either empty or --entitlements=...
    VBOX_SIGN_MACHO_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB) \
-        $(call VBOX_CCS_SIGN_CMD,binary,$(1),,$(subst --entitlements=,-entitlement_file_path ,$(3)) \
-                $(if $(VBOX_WITH_MACOS_HARDENED_RUNTIME),-hardened_runtime))
+        $(call VBOX_CCS_SIGN_CMD,binary,$(1),,$(subst --entitlements=,-entitlement_file_path ,$(3)) \
+        $(if $(VBOX_WITH_MACOS_HARDENED_RUNTIME),-hardened_runtime))
   else
    VBOX_SIGN_MACHO_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(VBOX_CODESIGN) \
-        --verbose=9 \
-        --force \
-        $(if-expr $(KBUILD_HOST_VERSION_MAJOR) <= 14,--digest-algorithm sha256,) \
-        $(if $(VBOX_WITH_MACOS_HARDENED_RUNTIME),$(if-expr $(KBUILD_HOST_VERSION_MAJOR) <= 16,--options 0x10000,--options runtime)) \
-        --file-list - \
-        $(if-expr defined(VBOX_TSA_URL),--timestamp="$(VBOX_TSA_URL)") \
-        $(VBOX_CERTIFICATE_SUBJECT_NAME_ARGS) \
-        $(3) \
-        "$(1)" \
-        $(if $(2),--identifier "$(2)",)
+        --verbose=9 \
+        --force \
+        $(if-expr $(KBUILD_HOST_VERSION_MAJOR) <= 14,--digest-algorithm sha256,) \
+        $(if $(VBOX_WITH_MACOS_HARDENED_RUNTIME),$(if-expr $(KBUILD_HOST_VERSION_MAJOR) <= 16,--options 0x10000,--options runtime)) \
+        --file-list - \
+        $(if-expr defined(VBOX_TSA_URL),--timestamp="$(VBOX_TSA_URL)") \
+        $(VBOX_CERTIFICATE_SUBJECT_NAME_ARGS) \
+        $(3) \
+        "$(1)" \
+        $(if $(2),--identifier "$(2)",)
   endif
 
@@ -4468 +4468 @@
   if $(intersects darwin all 1,$(VBOX_WITH_CORP_CODE_SIGNING))
    VBOX_SIGN_EXTPACK_DYLIB_CMDS ?= $(if $(eq $(tool_do),LINK_LIBRARY),, \
-        $(call VBOX_CCS_SIGN_CMD,binary,$(out),, \
-                $(if $(VBOX_WITH_MACOS_HARDENED_RUNTIME),-hardened_runtime)) )
+        $(call VBOX_CCS_SIGN_CMD,binary,$(out),, \
+        $(if $(VBOX_WITH_MACOS_HARDENED_RUNTIME),-hardened_runtime)) )
   else
    VBOX_SIGN_EXTPACK_DYLIB_CMDS ?= $(if $(eq $(tool_do),LINK_LIBRARY),, \
-        $(VBOX_CODESIGN) \
-        --verbose=9 \
-        --force \
-        $(if-expr $(KBUILD_HOST_VERSION_MAJOR) <= 14,--digest-algorithm sha256,) \
-        $(if $(VBOX_WITH_MACOS_HARDENED_RUNTIME),$(if-expr $(KBUILD_HOST_VERSION_MAJOR) <= 16,--options 0x10000,--options runtime)) \
-        --file-list - \
-        $(if-expr defined(VBOX_TSA_URL),--timestamp="$(VBOX_TSA_URL)") \
-        $(VBOX_CERTIFICATE_SUBJECT_NAME_ARGS) \
-        $(out) )
+        $(VBOX_CODESIGN) \
+        --verbose=9 \
+        --force \
+        $(if-expr $(KBUILD_HOST_VERSION_MAJOR) <= 14,--digest-algorithm sha256,) \
+        $(if $(VBOX_WITH_MACOS_HARDENED_RUNTIME),$(if-expr $(KBUILD_HOST_VERSION_MAJOR) <= 16,--options 0x10000,--options runtime)) \
+        --file-list - \
+        $(if-expr defined(VBOX_TSA_URL),--timestamp="$(VBOX_TSA_URL)") \
+        $(VBOX_CERTIFICATE_SUBJECT_NAME_ARGS) \
+        $(out) )
   endif
 
@@ -4494 +4494 @@
    ## @todo cannot handle $(2), the identifier.
    VBOX_SIGN_FILE_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB) \
-    $(call VBOX_CCS_SIGN_CMD,mac_dmg,$(1))$(NLTAB) \
-        $(REDIRECT) -E 'LC_ALL=C' -we "$(1).tmp" -- ditto -x -k -V "$(1).zip" "$(call VBOX_DIRX,$(1))"$(NLTAB) \
-    dirname="$(call VBOX_DIRX,$(1))$(DOLLAR)($(SED) -n -e 's+^copying file \([0-9]\{1,\}\)/.\{1,\}$(DOLLAR)+\1+p' "$(1).tmp")" ; \
-    $(MV) -f -- "$(DOLLAR)dirname/$(DOLLAR)(basename "$(1)")" "$(call VBOX_DIRX,$(1))" ; \
-    $(RM) -Rf -- "$(DOLLAR)dirname/"$(NLTAB) \
-        $(RM) -f -- "$(1).zip" "$(1).tmp"
+        $(call VBOX_CCS_SIGN_CMD,mac_dmg,$(1))$(NLTAB) \
+        $(REDIRECT) -E 'LC_ALL=C' -we "$(1).tmp" -- ditto -x -k -V "$(1).zip" "$(call VBOX_DIRX,$(1))"$(NLTAB) \
+        dirname="$(call VBOX_DIRX,$(1))$(DOLLAR)($(SED) -n -e 's+^copying file \([0-9]\{1,\}\)/.\{1,\}$(DOLLAR)+\1+p' "$(1).tmp")" ; \
+        $(MV) -f -- "$(DOLLAR)dirname/$(DOLLAR)(basename "$(1)")" "$(call VBOX_DIRX,$(1))" ; \
+        $(RM) -Rf -- "$(DOLLAR)dirname/"$(NLTAB) \
+        $(RM) -f -- "$(1).zip" "$(1).tmp"
   else
    VBOX_SIGN_FILE_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(VBOX_CODESIGN) \
-        --verbose=9 \
-        --force \
-        $(if-expr $(KBUILD_HOST_VERSION_MAJOR) <= 14,--digest-algorithm sha256,) \
-        --file-list=- \
-        $(if-expr defined(VBOX_TSA_URL),--timestamp="$(VBOX_TSA_URL)") \
-        $(if $(2),--identifier "$(2)",) \
-        $(VBOX_CERTIFICATE_SUBJECT_NAME_ARGS) \
-        "$(1)"
+        --verbose=9 \
+        --force \
+        $(if-expr $(KBUILD_HOST_VERSION_MAJOR) <= 14,--digest-algorithm sha256,) \
+        --file-list=- \
+        $(if-expr defined(VBOX_TSA_URL),--timestamp="$(VBOX_TSA_URL)") \
+        $(if $(2),--identifier "$(2)",) \
+        $(VBOX_CERTIFICATE_SUBJECT_NAME_ARGS) \
+        "$(1)"
   endif
 
@@ -4552 +4552 @@
   ifeq ($(VBOX_SIGNING_MODE),test) ## @todo when kBuild is updated to r2742+, this should be enabled for both modes.
    define VBOX_TEST_SIGN_KEXT
-  $1_INSTTYPE.darwin = none
-
-  $1.kext_SOURCES  += $$($1.kext_0_OUTDIR)/Contents/MacOS/$1=>MacOS/$1 \
-        $(foreach extfile, $(VBOX_DARWIN_KEXT_SIGN_FILES) \
-                , $$($1.kext_0_OUTDIR)/Contents/_CodeSignature/$(extfile)=>_CodeSignature/$(extfile))
-  $1.kext_SYMLINKS += $(foreach symfile, $(VBOX_DARWIN_KEXT_SIGN_SYMLINKS), $(symfile)=>_CodeSignature/$(symfile))
-  $1.kext_CLEAN    += \
-        $(foreach extfile, $(VBOX_DARWIN_KEXT_SIGN_FILES)   , $$($1.kext_0_OUTDIR)/Contents/_CodeSignature/$(extfile)) \
-        $(foreach symfile, $(VBOX_DARWIN_KEXT_SIGN_SYMLINKS), $$($1.kext_0_OUTDIR)/Contents/$(symfile)) \
-        $$($1.kext_0_OUTDIR)/Contents/MacOS/$1 \
-        $$($1.kext_0_OUTDIR)/$1.kext/Contents/_CodeSignature/
-  $1.kext_BLDDIRS  += $$($1.kext_0_OUTDIR)/Contents/MacOS/
-
-  $$$$($1.kext_0_OUTDIR)/Contents/MacOS/$1 \
-  + $(foreach file,$(VBOX_DARWIN_KEXT_SIGN_FILES), $$$$($1.kext_0_OUTDIR)/Contents/_CodeSignature/$(file)): \
-                $$$$($1.kext_0_OUTDIR)/Contents/Info.plist $$$$($1_1_TARGET) | $$$$($1.kext_0_OUTDIR)/
+    $1_INSTTYPE.darwin = none
+
+    $1.kext_SOURCES += $$($1.kext_0_OUTDIR)/Contents/MacOS/$1=>MacOS/$1 \
+        $(foreach extfile, $(VBOX_DARWIN_KEXT_SIGN_FILES) \
+        , $$($1.kext_0_OUTDIR)/Contents/_CodeSignature/$(extfile)=>_CodeSignature/$(extfile))
+    $1.kext_SYMLINKS += $(foreach symfile, $(VBOX_DARWIN_KEXT_SIGN_SYMLINKS), $(symfile)=>_CodeSignature/$(symfile))
+    $1.kext_CLEAN  += \
+        $(foreach extfile, $(VBOX_DARWIN_KEXT_SIGN_FILES)   , $$($1.kext_0_OUTDIR)/Contents/_CodeSignature/$(extfile)) \
+        $(foreach symfile, $(VBOX_DARWIN_KEXT_SIGN_SYMLINKS), $$($1.kext_0_OUTDIR)/Contents/$(symfile)) \
+        $$($1.kext_0_OUTDIR)/Contents/MacOS/$1 \
+        $$($1.kext_0_OUTDIR)/$1.kext/Contents/_CodeSignature/
+    $1.kext_BLDDIRS += $$($1.kext_0_OUTDIR)/Contents/MacOS/
+
+    $$$$($1.kext_0_OUTDIR)/Contents/MacOS/$1 \
+    + $(foreach file,$(VBOX_DARWIN_KEXT_SIGN_FILES), $$$$($1.kext_0_OUTDIR)/Contents/_CodeSignature/$(file)): \
+                $$$$($1.kext_0_OUTDIR)/Contents/Info.plist $$$$($1_1_TARGET) | $$$$($1.kext_0_OUTDIR)/
         $(RM) -Rf -- "$$($1.kext_0_OUTDIR)/Contents/_CodeSignature/" "$$($1.kext_0_OUTDIR)/Contents/MacOS/"
         $(MKDIR) -p -- "$$($1.kext_0_OUTDIR)/Contents/MacOS/"
@@ -4600 +4600 @@
   # @param 1   The elf object file to sign.
   VBOX_SIGN_ELF_FN ?= $(VBOX_ELFSIGN) \
-        sign \
-        $(VBOX_CERTIFICATE_FILE_ARGS) \
-        $(VBOX_TOKEN_NAME_ARGS) \
-        $(VBOX_PIN_ARGS) \
-        -e "$(1)"
+        sign \
+        $(VBOX_CERTIFICATE_FILE_ARGS) \
+        $(VBOX_TOKEN_NAME_ARGS) \
+        $(VBOX_PIN_ARGS) \
+        -e "$(1)"
 
   ## Commands for signing a driver image after link.
@@ -4618 +4618 @@
  endif
 
-#
-# Complain if windows hardening is enabled but not code signing.
-#
+ #
+ # Complain if windows hardening is enabled but not code signing.
+ #
 else if "$(KBUILD_TARGET)" == "win" && defined(VBOX_WITH_HARDENING) && !defined(VBOX_ONLY_BUILD)
  $(error You need to enable code signing for a hardened windows build to work.)
@@ -4648 +4648 @@
 # @param    2   The output file.
 VBOX_EDIT_INF64_FN = $(SED) \
-        $(if $(VBOX_SIGNING_MODE),-e 's/^;cat  *//', -e '/^;cat /d')\
+        $(if $(VBOX_SIGNING_MODE),-e 's/^;cat  *//', -e '/^;cat /d') \
         -e 's/^;amd64  *//' \
         -e '/^;x86 /d' \
@@ -4672 +4672 @@
 if defined(VBOX_SIGNING_MODE) && "$(KBUILD_TARGET)" == "win"
  if1of (quote, $(KMK_FEATURES))
- VBOX_RE_SIGN_DLL_FN = $(if-expr !defined($(1)_VBOX_RE_SIGNED_$(3)$(qnotdir ,$(2))),\
-        $(evalcall VBOX_RE_SIGN_DLL_INTERNAL_FN,$1,$2,$3)\
-        ,)$($(1)_0_OUTDIR)/$(3)$(qnotdir ,$2)
+  VBOX_RE_SIGN_DLL_FN = $(if-expr !defined($(1)_VBOX_RE_SIGNED_$(3)$(qnotdir ,$(2))), \
+        $(evalcall VBOX_RE_SIGN_DLL_INTERNAL_FN,$1,$2,$3) \
+        ,)$($(1)_0_OUTDIR)/$(3)$(qnotdir ,$2)
 
   define VBOX_RE_SIGN_DLL_INTERNAL_FN
    local n = $(3)$(qnotdir ,$2)
    ifndef $(1)_VBOX_RE_SIGNED_$(n)
- $(1)_VBOX_RE_SIGNED_$(n) := 1
- $(eval $(1)_CLEAN += $$($(1)_0_OUTDIR)/$(n))
-
- $$($(1)_0_OUTDIR)/$(n): $(2) $(VBOX_VERSION_STAMP) | $$(dir $$@) $(VBOX_SIGN_IMAGE_ORDERDEPS)
+    $(1)_VBOX_RE_SIGNED_$(n) := 1
+    $(eval $(1)_CLEAN += $$($(1)_0_OUTDIR)/$(n))
+
+    $$($(1)_0_OUTDIR)/$(n): $(2) $(VBOX_VERSION_STAMP) | $$(dir $$@) $(VBOX_SIGN_IMAGE_ORDERDEPS)
         $(call MSG_TOOL,SIGNTOOL,,$<,$@)
         $(RM) -f -- "$@"
@@ -4695 +4695 @@
 
  else # old kmk: no quote feature
-VBOX_RE_SIGN_DLL_FN = $(if-expr !defined($(1)_VBOX_RE_SIGNED_$(3)$(notdir $(2))),\
-        $(evalcall VBOX_RE_SIGN_DLL_INTERNAL_FN,$1,$2,$3)\
-        ,)$($(1)_0_OUTDIR)/$(3)$(notdir $2)
+  VBOX_RE_SIGN_DLL_FN = $(if-expr !defined($(1)_VBOX_RE_SIGNED_$(3)$(notdir $(2))), \
+        $(evalcall VBOX_RE_SIGN_DLL_INTERNAL_FN,$1,$2,$3) \
+        ,)$($(1)_0_OUTDIR)/$(3)$(notdir $2)
   define VBOX_RE_SIGN_DLL_INTERNAL_FN
-local n = $(3)$(notdir $2)
-ifndef $(1)_VBOX_RE_SIGNED_$(n)
- $(1)_VBOX_RE_SIGNED_$(n) := 1
- $(eval $(1)_CLEAN += $$($(1)_0_OUTDIR)/$(n))
-
- $$($(1)_0_OUTDIR)/$(n): $(2) $(VBOX_VERSION_STAMP) | $$(dir $$@) $(VBOX_SIGN_IMAGE_ORDERDEPS)
+   local n = $(3)$(notdir $2)
+   ifndef $(1)_VBOX_RE_SIGNED_$(n)
+    $(1)_VBOX_RE_SIGNED_$(n) := 1
+    $(eval $(1)_CLEAN += $$($(1)_0_OUTDIR)/$(n))
+
+    $$($(1)_0_OUTDIR)/$(n): $(2) $(VBOX_VERSION_STAMP) | $$(dir $$@) $(VBOX_SIGN_IMAGE_ORDERDEPS)
         $(call MSG_TOOL,SIGNTOOL,,$<,$@)
         $(RM) -f -- "$@"
@@ -4713 +4713 @@
                 "$@"
         $(call VBOX_SIGN_IMAGE_FN,$@)
-endif
+   endif
   endef # VBOX_RE_SIGN_DLL_INTERNAL_FN
  endif # old kmk: no quote feature
@@ -4737 +4737 @@
 # @remarks     ASSUMES RCFLAGS isn't a simple variable (var := value).
 define VBOX_SET_VER_INFO_INTERNAL
-ifeq ($(KBUILD_TARGET),win)
-$(1)_SOURCES.win += $(PATH_ROOT)/src/VBox/Artwork/win/$(4)
-$(1)_RCFLAGS += /nologo /dIN_INTERNAL_NAME="\"$(1)\"" /dIN_FILE_DESCRIPTION="\"$(2)\"" \
-        /dIN_ORIGINAL_NAME="\"$(if $(6),$6,$$(notdir $$($(1)_1_INST_TARGET)))\"" \
-        $(if $(3), /dIN_ICON_FILE="\"$(subst \\,/,$(strip $(3)))\"") $(5)
-$$$$($(1)_0_OUTDIR)/src/VBox/Artwork/win/$(basename $(4)).res: \
-        $(PATH_ROOT)/include/VBox/version.h $$$$(VBOX_VERSION_HEADER)
-endif
+ ifeq ($(KBUILD_TARGET),win)
+  $(1)_SOURCES.win += $(PATH_ROOT)/src/VBox/Artwork/win/$(4)
+  $(1)_RCFLAGS += /nologo /dIN_INTERNAL_NAME="\"$(1)\"" /dIN_FILE_DESCRIPTION="\"$(2)\"" \
+        /dIN_ORIGINAL_NAME="\"$(if $(6),$6,$$(notdir $$($(1)_1_INST_TARGET)))\"" \
+        $(if $(3), /dIN_ICON_FILE="\"$(subst \\,/,$(strip $(3)))\"") $(5)
+  $$$$($(1)_0_OUTDIR)/src/VBox/Artwork/win/$(basename $(4)).res: \
+                $(PATH_ROOT)/include/VBox/version.h $$$$(VBOX_VERSION_HEADER)
+ endif
 endef
 
@@ -4822 +4822 @@
  VBOX_HAIKU_MIMESETTOOL := mimeset
 
-  ## Add optional resources to the program, set its version info, and sniff its mime properties.
-  # @param 1  The file to add resources to.
-  # @param 2  The resource files.
-  # @param 3  The target name.
-define VBOX_HAIKU_XRES_SETVER_FN
+ ## Add optional resources to the program, set its version info, and sniff its mime properties.
+ # @param 1  The file to add resources to.
+ # @param 2  The resource files.
+ # @param 3  The target name.
+ define VBOX_HAIKU_XRES_SETVER_FN
         $(if $(2),$(call MSG_TOOL,HaikuAddResources,$(3),$(2))
         $(QUIET)$(VBOX_HAIKU_XRESTOOL) -o $(1) $(2),)
@@ -4836 +4836 @@
         $(call MSG_TOOL,HaikuMimeSet,$(3))
         $(QUIET)$(VBOX_HAIKU_MIMESETTOOL) -f $(1)
-endef
+ endef
 
  VBOX_HAIKU_XRES_SETVER_CMDS  ?= $(if $(eq $(tool_do),LINK_PROGRAM),$(call VBOX_HAIKU_XRES_SETVER_FN,$(out),$($(target)_RSRCS),$(target)),)
@@ -4846 +4846 @@
 VBOX_PREF_LIB =
 if1of ($(KBUILD_TARGET), os2 win)
-VBOX_SUFF_LIB = .lib
+ VBOX_SUFF_LIB = .lib
 else
-VBOX_SUFF_LIB = .a
+ VBOX_SUFF_LIB = .a
 endif
 if1of ($(KBUILD_HOST), os2 win)
-VBOX_HOSTSUFF_LIB = .lib
+ VBOX_HOSTSUFF_LIB = .lib
 else
-VBOX_HOSTSUFF_LIB = .a
+ VBOX_HOSTSUFF_LIB = .a
 endif
 VBOX_SUFF_DLL = $(SUFF_DLL)
 ifeq ($(KBUILD_TARGET),os2) # GXX3OMF produces out .o at the moment.
-VBOX_SUFF_OBJ = .o
+ VBOX_SUFF_OBJ = .o
 else
-VBOX_SUFF_OBJ = $(SUFF_OBJ)
+ VBOX_SUFF_OBJ = $(SUFF_OBJ)
 endif
 VBOXW32GUEST_SUFF_LIB = .lib
@@ -4913 +4913 @@
 SDK_VBoxOpenSslStatic_INCS                   ?= $(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)
 SDK_VBoxOpenSslStatic_ORDERDEPS              ?= $(crypto-headers_1_TARGET)
-if  !defined(VBOX_ONLY_SDK) \
- && (!defined(VBOX_ONLY_ADDITIONS) || !defined(VBOX_ONLY_ADDITIONS_WITHOUT_RTISOMAKER)) \
- && (!defined(VBOX_ONLY_EXTPACKS) || !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS)) \
- && ("$(SDK_VBoxOpenSslStatic_INCS)" == "$(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)")
+if   !defined(VBOX_ONLY_SDK) \
+  && (!defined(VBOX_ONLY_ADDITIONS) || !defined(VBOX_ONLY_ADDITIONS_WITHOUT_RTISOMAKER)) \
+  && (!defined(VBOX_ONLY_EXTPACKS) || !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS)) \
+  && ("$(SDK_VBoxOpenSslStatic_INCS)" == "$(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)")
  SDK_VBoxOpenSslStatic_DEPS                  ?= $(SDK_VBoxOpenSslStatic_INCS)/openssl/openssl-mangling.h
 endif
@@ -4938 +4938 @@
  SDK_VBoxOpenSslBldProg_INCS          ?= $(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)
  SDK_VBoxOpenSslBldProg_ORDERDEPS     ?= $(crypto-headers_1_TARGET)
- if  !defined(VBOX_ONLY_SDK) \
-  && ("$(SDK_VBoxOpenSsl_INCS)" == "$(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)")
+ if   !defined(VBOX_ONLY_SDK) \
+   && ("$(SDK_VBoxOpenSsl_INCS)" == "$(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)")
   SDK_VBoxOpenSslBldProg_DEPS         ?= $(SDK_VBoxOpenSslStatic_INCS)/openssl/openssl-mangling.h
  endif
@@ -4973 +4973 @@
 SDK_VBoxSoftFloatR3Shared_DEFS.arm64  := LITTLEENDIAN
 SDK_VBoxSoftFloatR3Shared_DEFS.x86    := LITTLEENDIAN
-if1of ($(KBUILD_TARGET),win)
+if1of ($(KBUILD_TARGET), win)
  SDK_VBoxSoftFloatR3Shared_DEFS       += THREAD_LOCAL=__declspec(thread)
 else
@@ -4985 +4985 @@
 SDK_VBoxSoftFloatR0           := SoftFloat 3 for ring-0 linking.
 SDK_VBoxSoftFloatR0_DEFS      := SOFTFLOAT_FAST_INT64
-SDK_VBoxSoftFloatR0_DEFS.amd64:= LITTLEENDIAN
-SDK_VBoxSoftFloatR0_DEFS.arm64:= LITTLEENDIAN
+SDK_VBoxSoftFloatR0_DEFS.amd64 := LITTLEENDIAN
+SDK_VBoxSoftFloatR0_DEFS.arm64 := LITTLEENDIAN
 SDK_VBoxSoftFloatR0_DEFS.x86  := LITTLEENDIAN
 SDK_VBoxSoftFloatR0_INCS       = \
@@ -4995 +4995 @@
 SDK_VBoxSoftFloatGuestR3Shared           := SoftFloat 3 for ring-0 linking.
 SDK_VBoxSoftFloatGuestR3Shared_DEFS      := SOFTFLOAT_FAST_INT64
-SDK_VBoxSoftFloatGuestR3Shared_DEFS.amd64:= LITTLEENDIAN
-SDK_VBoxSoftFloatGuestR3Shared_DEFS.arm64:= LITTLEENDIAN
+SDK_VBoxSoftFloatGuestR3Shared_DEFS.amd64 := LITTLEENDIAN
+SDK_VBoxSoftFloatGuestR3Shared_DEFS.arm64 := LITTLEENDIAN
 SDK_VBoxSoftFloatGuestR3Shared_DEFS.x86  := LITTLEENDIAN
 SDK_VBoxSoftFloatGuestR3Shared_INCS       = \
@@ -5008 +5008 @@
  SDK_VBoxLibSsh                := libssh for dynamic dll loading with assembly stubs.
  SDK_VBoxLibSsh_INCS           ?= $(PATH_ROOT)/src/libs/libssh-0.9.6/include
-# SDK_VBoxLibSsh_LIBS is not defined, as VBoxLibSsh dll is not linked, but loaded explicitly
-# by auto-generated stub code (lazy loading)
+ # SDK_VBoxLibSsh_LIBS is not defined, as VBoxLibSsh dll is not linked, but loaded explicitly
+ # by auto-generated stub code (lazy loading)
 endif
 
@@ -5054 +5054 @@
 SDK_VBoxZlibStatic_EXTENDS   := VBoxZlib
 if1of ($(KBUILD_TARGET), os2 win) # Not required on solaris.
- SDK_VBoxZlibStatic_LIBS        ?= $(PATH_STAGE_LIB)/VBox-zlib-static$(VBOX_SUFF_LIB)
+ SDK_VBoxZlibStatic_LIBS        ?= $(PATH_STAGE_LIB)/VBox-zlib-static$(VBOX_SUFF_LIB)
 endif
 
@@ -5083 +5083 @@
 SDK_VBoxWinInt64Lib             := Abstracts where to find int64.lib for x86 builds.
 ifn1of ($(VBOX_WINPSDK), WINPSDK71 WINPSDK80)
- SDK_VBoxWinInt64Lib_LIBS.x86    = $(PATH_SDK_$(VBOX_WINPSDK)_LIB.x86)/int64.lib
+ SDK_VBoxWinInt64Lib_LIBS.x86    = $(PATH_SDK_$(VBOX_WINPSDK)_LIB.x86)/int64.lib
  ifeq ($(KBUILD_TARGET),win)
   include $(KBUILD_PATH)/sdks/$(VBOX_WINPSDK).kmk ## TODO: Add a kBuild feature for loading SDKs.
@@ -5123 +5123 @@
 TOOL_VBoxTpG_DTRACE_DEPORD          = $(VBOX_VBOXTPG)
 TOOL_VBoxTpG_DTRACE_HDR_FLAGS      := \
-                -h --host-$(VBOX_HC_ARCH_BITS)-bit #-vvv
+        -h --host-$(VBOX_HC_ARCH_BITS)-bit  #-vvv
 define TOOL_VBoxTpG_DTRACE_HDR_CMDS
         $(QUIET)$(VBOX_VBOXTPG) $(if-expr $(intersects $(bld_trg_arch),$(KBUILD_ARCHES_64)),-64,-32) \
@@ -5208 +5208 @@
   endif
   TEMPLATE_VBoxRc_CFLAGS             = $(TEMPLATE_VBoxRc_CXXFLAGS)
-  TEMPLATE_VBoxRc_LDFLAGS            =  -Ignore:4197 \
+  TEMPLATE_VBoxRc_LDFLAGS            = -Ignore:4197 \
         -Driver -Subsystem:NATIVE -Incremental:NO -Align:64 -MapInfo:Exports -NoD $(VBOX_VCC_LD_WERR) -Release -Debug -Opt:Ref -Opt:Icf \
         -Version:$(VBOX_VERSION_MAJOR)0$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
@@ -5223 +5223 @@
 
  ifeq ($(VBOX_LDR_FMT32),elf)
- TEMPLATE_VBoxRc_TOOL                = $(VBOX_GCC32_TOOL)
- TEMPLATE_VBoxRc_CXXFLAGS            = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
- TEMPLATE_VBoxRc_CFLAGS              = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_IPRT_FMT_CHECK)
+  TEMPLATE_VBoxRc_TOOL               = $(VBOX_GCC32_TOOL)
+  TEMPLATE_VBoxRc_CXXFLAGS           = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
+  TEMPLATE_VBoxRc_CFLAGS             = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_IPRT_FMT_CHECK)
   if $(VBOX_GCC32_VERSION_CC) < 30400
    TEMPLATE_VBoxRc_DEFS             += RT_WITHOUT_PRAGMA_ONCE
@@ -5238 +5238 @@
   ifn1of ($(KBUILD_TARGET), solaris freebsd)
    TEMPLATE_VBoxRc_LIBS               = \
-        $(VBOX_GCC32_LIBGCC) # intrinsics
-  endif
-  if1of ($(KBUILD_TARGET),linux)
+        $(VBOX_GCC32_LIBGCC) # intrinsics
+  endif
+  if1of ($(KBUILD_TARGET), linux)
    TEMPLATE_VBoxRc_POST_CMDS         = $(if $(eq $(tool_do),LINK_SYSMOD),if readelf -S $(out)|grep -q "[cd]tors"; then echo "Found ctors/dtors in $(out)!"; exit 1; fi)
   endif
@@ -5246 +5246 @@
 
  ifeq ($(VBOX_LDR_FMT32),macho)
- TEMPLATE_VBoxRc_TOOL                = $(VBOX_GCC_TOOL)
- TEMPLATE_VBoxRc_SDKS               += $(VBOX_DARWIN_DEF_SDK_SDKS)
- TEMPLATE_VBoxRc_DEFS               += $(VBOX_DARWIN_DEF_SDK_DEFS)
- TEMPLATE_VBoxRc_CXXFLAGS            = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS) -m32 -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-common -msoft-float -static $(VBOX_GCC_fno-stack-protector) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing -fno-rtti $(VBOX_GCC_std)
- TEMPLATE_VBoxRc_CFLAGS              = $(VBOX_DARWIN_DEF_SDK_CFLAGS)   -m32 -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) -fno-common -msoft-float -static $(VBOX_GCC_fno-stack-protector) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing
- TEMPLATE_VBoxRc_LDFLAGS             = $(VBOX_DARWIN_DEF_SDK_LDFLAGS)  -m32 -nostdlib
- #TEMPLATE_VBoxRc_LDFLAGS.release     = -Wl,-S ???
+  TEMPLATE_VBoxRc_TOOL               = $(VBOX_GCC_TOOL)
+  TEMPLATE_VBoxRc_SDKS              += $(VBOX_DARWIN_DEF_SDK_SDKS)
+  TEMPLATE_VBoxRc_DEFS              += $(VBOX_DARWIN_DEF_SDK_DEFS)
+  TEMPLATE_VBoxRc_CXXFLAGS           = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS) -m32 -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-common -msoft-float -static $(VBOX_GCC_fno-stack-protector) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing -fno-rtti $(VBOX_GCC_std)
+  TEMPLATE_VBoxRc_CFLAGS             = $(VBOX_DARWIN_DEF_SDK_CFLAGS)   -m32 -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) -fno-common -msoft-float -static $(VBOX_GCC_fno-stack-protector) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing
+  TEMPLATE_VBoxRc_LDFLAGS            = $(VBOX_DARWIN_DEF_SDK_LDFLAGS)  -m32 -nostdlib
+  #TEMPLATE_VBoxRc_LDFLAGS.release     = -Wl,-S ???
  endif
 
  ifeq ($(VBOX_LDR_FMT32),lx)
- TEMPLATE_VBoxRc_TOOL                = GXX3OMF
+  TEMPLATE_VBoxRc_TOOL               = GXX3OMF
   if $(VBOX_GCC_VERSION_CC) < 30400
    TEMPLATE_VBoxRc_DEFS             += RT_WITHOUT_PRAGMA_ONCE
   endif
- TEMPLATE_VBoxRc_CXXFLAGS            = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing -fno-exceptions -fno-rtti
- TEMPLATE_VBoxRc_CFLAGS              = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing -fno-exceptions
- TEMPLATE_VBoxRc_LDFLAGS             = -Zdll -nostdlib
- TEMPLATE_VBoxRc_LIBS                = \
-        $(VBOX_GCC32_LIBGCC) \
-        $(VBOX_OBJ_SYS0) \
-        end
+  TEMPLATE_VBoxRc_CXXFLAGS           = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing -fno-exceptions -fno-rtti
+  TEMPLATE_VBoxRc_CFLAGS             = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing -fno-exceptions
+  TEMPLATE_VBoxRc_LDFLAGS            = -Zdll -nostdlib
+  TEMPLATE_VBoxRc_LIBS               = \
+        $(VBOX_GCC32_LIBGCC) \
+        $(VBOX_OBJ_SYS0) \
+        end
  endif
 
@@ -5346 +5346 @@
 
 ifeq ($(VBOX_LDR_FMT),pe)
-TEMPLATE_VBoxR0_TOOL                = $(VBOX_VCC_TOOL)
-TEMPLATE_VBoxR0_RCDEFS              = VBOX_SVN_REV=$(VBOX_SVN_REV) VBOX_SVN_REV_MOD_5K=$(expr $(VBOX_SVN_REV) % 50000)
-TEMPLATE_VBoxR0_CXXFLAGS            = -Zi -Zl -GR- -EHs- -GF -GS- -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP) \
-        -Gy $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_std) $(VBOX_VCC_WARN_ALL) -wd4505 $(VBOX_VCC_WERR)
+ TEMPLATE_VBoxR0_TOOL               = $(VBOX_VCC_TOOL)
+ TEMPLATE_VBoxR0_RCDEFS             = VBOX_SVN_REV=$(VBOX_SVN_REV) VBOX_SVN_REV_MOD_5K=$(expr $(VBOX_SVN_REV) % 50000)
+ TEMPLATE_VBoxR0_CXXFLAGS           = -Zi -Zl -GR- -EHs- -GF -GS- -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP) \
+        -Gy $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_std) $(VBOX_VCC_WARN_ALL) -wd4505 $(VBOX_VCC_WERR)
  if "$(VBOX_VCC_TOOL_STEM)" >= "VCC120"
-TEMPLATE_VBoxR0_CXXFLAGS           += -Gw
+  TEMPLATE_VBoxR0_CXXFLAGS         += -Gw
  endif
  if "$(VBOX_VCC_TOOL_STEM)" >= "VCC142" # Don't waste space on x86/amd64-on-arm emulation optimizations.
-TEMPLATE_VBoxR0_CXXFLAGS           += /volatileMetadata-
+  TEMPLATE_VBoxR0_CXXFLAGS         += /volatileMetadata-
  endif
  ifdef VBOX_WITH_MSC_ANALYZE_THIS
-TEMPLATE_VBoxR0_CXXFLAGS           += /analyze
- endif
-TEMPLATE_VBoxR0_CFLAGS              = $(filter-out $(VBOX_VCC_std),$(TEMPLATE_VBoxR0_CXXFLAGS))
-TEMPLATE_VBoxR0_LDFLAGS             = -Ignore:4197 \
-        -Driver -Subsystem:NATIVE -Incremental:NO -Align:4096 -MapInfo:Exports -NoD $(VBOX_VCC_LD_WERR) \
-        -Release -Debug -Opt:Ref -Opt:Icf $(VBOX_VCC_LD_GUARD_CF) \
-        -Version:$(VBOX_VERSION_MAJOR)0$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
-        -Stub:$(PATH_ROOT)/src/VBox/HostDrivers/Support/win/winstub.com
+  TEMPLATE_VBoxR0_CXXFLAGS         += /analyze
+ endif
+ TEMPLATE_VBoxR0_CFLAGS             = $(filter-out $(VBOX_VCC_std),$(TEMPLATE_VBoxR0_CXXFLAGS))
+ TEMPLATE_VBoxR0_LDFLAGS            = -Ignore:4197 \
+        -Driver -Subsystem:NATIVE -Incremental:NO -Align:4096 -MapInfo:Exports -NoD $(VBOX_VCC_LD_WERR) \
+        -Release -Debug -Opt:Ref -Opt:Icf $(VBOX_VCC_LD_GUARD_CF) \
+        -Version:$(VBOX_VERSION_MAJOR)0$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
+        -Stub:$(PATH_ROOT)/src/VBox/HostDrivers/Support/win/winstub.com
  ifdef VBOX_WITH_DTRACE_R0
-TEMPLATE_VBoxR0_LDFLAGS            += -Merge:VTGPrLc.Data=VTGPrLc.Begin -Merge:VTGPrLc.End=VTGPrLc.Begin -Merge:VTGPrLc.Begin=VTGObj
+  TEMPLATE_VBoxR0_LDFLAGS          += -Merge:VTGPrLc.Data=VTGPrLc.Begin -Merge:VTGPrLc.End=VTGPrLc.Begin -Merge:VTGPrLc.Begin=VTGObj
  endif
  ifdef VBOX_SIGNING_MODE
-TEMPLATE_VBoxR0_LDFLAGS            += -IntegrityCheck
+  TEMPLATE_VBoxR0_LDFLAGS          += -IntegrityCheck
  endif
  if "$(VBOX_VCC_TOOL_STEM)" >= "VCC142" # Don't waste space on x86/amd64-on-arm emulation optimizations.
-TEMPLATE_VBoxR0_LDFLAGS            += -EmitVolatileMetadata:NO
- endif
-TEMPLATE_VBoxR0_LDFLAGS.win.amd64   = $(VBOX_VCC_LD_HIGH_ENTRYOPY_VA)
+  TEMPLATE_VBoxR0_LDFLAGS          += -EmitVolatileMetadata:NO
+ endif
+ TEMPLATE_VBoxR0_LDFLAGS.win.amd64  = $(VBOX_VCC_LD_HIGH_ENTRYOPY_VA)
  ifneq ($(VBOX_VCC_CC_GUARD_CF),)
-TEMPLATE_VBoxR0_LDFLAGS.win.amd64  += -Include:__security_init_cookie  -Export:ModuleInitSecurityCookie=__security_init_cookie
-TEMPLATE_VBoxR0_LDFLAGS.win.x86    += -Include:___security_init_cookie -Export:ModuleInitSecurityCookie=__security_init_cookie
- endif
-TEMPLATE_VBoxR0_LIBS                = \
-        $(PATH_STAGE_LIB)/RuntimeR0Stub$(VBOX_SUFF_LIB)
+  TEMPLATE_VBoxR0_LDFLAGS.win.amd64 += -Include:__security_init_cookie  -Export:ModuleInitSecurityCookie=__security_init_cookie
+  TEMPLATE_VBoxR0_LDFLAGS.win.x86  += -Include:___security_init_cookie -Export:ModuleInitSecurityCookie=__security_init_cookie
+ endif
+ TEMPLATE_VBoxR0_LIBS               = \
+        $(PATH_STAGE_LIB)/RuntimeR0Stub$(VBOX_SUFF_LIB)
  ifneq ($(VBOX_VCC_CC_GUARD_CF),)
-TEMPLATE_VBoxR0_LIBS               += \
-        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/BufferOverflowK.lib
+  TEMPLATE_VBoxR0_LIBS             += \
+        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/BufferOverflowK.lib
   include $(KBUILD_PATH)/sdks/$(VBOX_WINDDK).kmk ## TODO: Add a kBuild feature for loading SDKs.
  endif
-TEMPLATE_VBoxR0_SDKS.x86           += VBoxWinInt64Lib
-TEMPLATE_VBoxR0_ORDERDEPS           = $(VBOX_SIGN_DRIVER_ORDERDEPS)
-TEMPLATE_VBoxR0_POST_CMDS           = $(VBOX_SIGN_DRIVER_CMDS)
+ TEMPLATE_VBoxR0_SDKS.x86          += VBoxWinInt64Lib
+ TEMPLATE_VBoxR0_ORDERDEPS          = $(VBOX_SIGN_DRIVER_ORDERDEPS)
+ TEMPLATE_VBoxR0_POST_CMDS          = $(VBOX_SIGN_DRIVER_CMDS)
 endif # pe
 
 ifeq ($(VBOX_LDR_FMT),elf)
-TEMPLATE_VBoxR0_TOOL                = $(VBOX_GCC_TOOL)
-TEMPLATE_VBoxR0_CFLAGS              = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) \
-        $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \
-        $(VBOX_GCC_fno-stack-protector) -fno-common -ffreestanding $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
-TEMPLATE_VBoxR0_CXXFLAGS            = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) \
-        $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \
-        $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) \
-        -fno-rtti $(VBOX_GCC_std) $(VBOX_GCC_IPRT_FMT_CHECK)
+ TEMPLATE_VBoxR0_TOOL               = $(VBOX_GCC_TOOL)
+ TEMPLATE_VBoxR0_CFLAGS             = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) \
+        $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \
+        $(VBOX_GCC_fno-stack-protector) -fno-common -ffreestanding $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
+ TEMPLATE_VBoxR0_CXXFLAGS           = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) \
+        $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \
+        $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) \
+        -fno-rtti $(VBOX_GCC_std) $(VBOX_GCC_IPRT_FMT_CHECK)
  if $(VBOX_GCC_VERSION_CC) >= 40500 # 4.1.2 complains, 4.5.2 is okay, didn't check which version inbetween made it okay with g++.
-TEMPLATE_VBoxR0_CXXFLAGS           += -ffreestanding
- endif
-TEMPLATE_VBoxR0_CFLAGS.amd64        = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables -ffreestanding
-TEMPLATE_VBoxR0_CXXFLAGS.amd64      = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables
-TEMPLATE_VBoxR0_CXXFLAGS.freebsd    = -ffreestanding
+  TEMPLATE_VBoxR0_CXXFLAGS         += -ffreestanding
+ endif
+ TEMPLATE_VBoxR0_CFLAGS.amd64       = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables -ffreestanding
+ TEMPLATE_VBoxR0_CXXFLAGS.amd64     = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables
+ TEMPLATE_VBoxR0_CXXFLAGS.freebsd   = -ffreestanding
  if $(VBOX_GCC_VERSION_CC) < 30400
-TEMPLATE_VBoxR0_DEFS               += RT_WITHOUT_PRAGMA_ONCE
+  TEMPLATE_VBoxR0_DEFS             += RT_WITHOUT_PRAGMA_ONCE
  endif
  ifeq ($(KBUILD_TARGET),solaris)
-TEMPLATE_VBoxR0_LDFLAGS             = -r
-TEMPLATE_VBoxR0_LDFLAGS.solaris     = -u _init -u _info
-TEMPLATE_VBoxR0_LDFLAGS.solaris.amd64 = -m64
-TEMPLATE_VBoxR0_LDFLAGS.solaris.x86   = -m32
-TEMPLATE_VBoxR0_LIBS.solaris        = \
-        $(PATH_STAGE_LIB)/RuntimeR0Stub$(VBOX_SUFF_LIB)
+  TEMPLATE_VBoxR0_LDFLAGS           = -r
+  TEMPLATE_VBoxR0_LDFLAGS.solaris   = -u _init -u _info
+  TEMPLATE_VBoxR0_LDFLAGS.solaris.amd64 = -m64
+  TEMPLATE_VBoxR0_LDFLAGS.solaris.x86 = -m32
+  TEMPLATE_VBoxR0_LIBS.solaris      = \
+        $(PATH_STAGE_LIB)/RuntimeR0Stub$(VBOX_SUFF_LIB)
   ifdef VBOX_GCC_USING_SOLARIS_AS
-TEMPLATE_VBoxR0_CFLAGS.amd64       += -Wa,-xmodel=kernel
-TEMPLATE_VBoxR0_CXXFLAGS.amd64     += -Wa,-xmodel=kernel
-  endif
- # Solaris driver signing.
-TEMPLATE_VBoxR0_POST_CMDS           = $(VBOX_SIGN_DRIVER_CMDS)
+   TEMPLATE_VBoxR0_CFLAGS.amd64    += -Wa,-xmodel=kernel
+   TEMPLATE_VBoxR0_CXXFLAGS.amd64  += -Wa,-xmodel=kernel
+  endif
+  # Solaris driver signing.
+  TEMPLATE_VBoxR0_POST_CMDS         = $(VBOX_SIGN_DRIVER_CMDS)
  else
-TEMPLATE_VBoxR0_LDFLAGS             = -nostdlib -Bsymbolic -g
- ## @todo WTF doesn't the globals work? Debug info is supposed to be split everywhere. GRR
-TEMPLATE_VBoxR0_LD_DEBUG            = split
+  TEMPLATE_VBoxR0_LDFLAGS           = -nostdlib -Bsymbolic -g
+  ## @todo WTF doesn't the globals work? Debug info is supposed to be split everywhere. GRR
+  TEMPLATE_VBoxR0_LD_DEBUG          = split
  endif
  if "$(KBUILD_TARGET)" == "linux" && !defined(VBOX_WITH_KMOD_WRAPPED_R0_MODS)
-VBOX_WITH_VBOXR0_AS_DLL = 1
-TEMPLATE_VBoxR0_DLLSUFF             = .r0
-TEMPLATE_VBoxR0_CFLAGS             += -fPIC
-TEMPLATE_VBoxR0_CXXFLAGS           += -fPIC
-TEMPLATE_VBoxR0_LDFLAGS            +=
-TEMPLATE_VBoxR0_DTRACE_HDR_FLAGS   += --pic
-TEMPLATE_VBoxR0_DTRACE_OBJ_FLAGS   += --pic
+  VBOX_WITH_VBOXR0_AS_DLL = 1
+  TEMPLATE_VBoxR0_DLLSUFF           = .r0
+  TEMPLATE_VBoxR0_CFLAGS           += -fPIC
+  TEMPLATE_VBoxR0_CXXFLAGS         += -fPIC
+  TEMPLATE_VBoxR0_LDFLAGS          +=
+  TEMPLATE_VBoxR0_DTRACE_HDR_FLAGS += --pic
+  TEMPLATE_VBoxR0_DTRACE_OBJ_FLAGS += --pic
  else
-TEMPLATE_VBoxR0_CFLAGS.amd64       += -mcmodel=kernel
-TEMPLATE_VBoxR0_CXXFLAGS.amd64     += -mcmodel=kernel
+  TEMPLATE_VBoxR0_CFLAGS.amd64     += -mcmodel=kernel
+  TEMPLATE_VBoxR0_CXXFLAGS.amd64   += -mcmodel=kernel
  endif
  ifdef VBOX_WITH_KMOD_WRAPPED_R0_MODS # For BTF/pahold issue we use -g1
-TEMPLATE_VBoxR0_DEFS               += VBOX_WITH_KMOD_WRAPPED_R0_MODS
-TEMPLATE_VBoxR0_LDFLAGS.linux      += $(PATH_ROOT)/src/VBox/HostDrivers/Support/linux/VBoxR0-wrapped.lds
-TEMPLATE_VBoxR0_LNK_DEPS.linux     += $(PATH_ROOT)/src/VBox/HostDrivers/Support/linux/VBoxR0-wrapped.lds
-TEMPLATE_VBoxR0_CFLAGS.linux       += -g1
-TEMPLATE_VBoxR0_CXXFLAGS.linux     += -g1
- endif
- ifn1of ($(KBUILD_TARGET),solaris freebsd)
+  TEMPLATE_VBoxR0_DEFS             += VBOX_WITH_KMOD_WRAPPED_R0_MODS
+  TEMPLATE_VBoxR0_LDFLAGS.linux    += $(PATH_ROOT)/src/VBox/HostDrivers/Support/linux/VBoxR0-wrapped.lds
+  TEMPLATE_VBoxR0_LNK_DEPS.linux   += $(PATH_ROOT)/src/VBox/HostDrivers/Support/linux/VBoxR0-wrapped.lds
+  TEMPLATE_VBoxR0_CFLAGS.linux     += -g1
+  TEMPLATE_VBoxR0_CXXFLAGS.linux   += -g1
+ endif
+ ifn1of ($(KBUILD_TARGET), solaris freebsd)
+  TEMPLATE_VBoxR0_LIBS              = \
+        $(VBOX_GCC_LIBGCC) # intrinsics
+ endif
+ if1of ($(KBUILD_TARGET), linux)
+  TEMPLATE_VBoxR0_POST_CMDS        += $(NLTAB) \
+        $(if $(eq $(tool_do),LINK_SYSMOD),if readelf -S $(out)|grep -q "[cd]tors"; then echo "Found ctors/dtors in $(out)!"; exit 1; fi)
+ endif
+endif # elf
+
+ifeq ($(VBOX_LDR_FMT),macho)
+ TEMPLATE_VBoxR0_TOOL               = $(VBOX_GCC_TOOL)
+ TEMPLATE_VBoxR0_SDKS              += $(VBOX_DARWIN_DEF_SDK_SDKS)
+ TEMPLATE_VBoxR0_DEFS              += $(VBOX_DARWIN_DEF_SDK_DEFS)
+ TEMPLATE_VBoxR0_CXXFLAGS           = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS) -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) \
+        -fno-common -static -fno-rtti -fno-exceptions $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing \
+        $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_std)
+ TEMPLATE_VBoxR0_CXXFLAGS.amd64     = -m64 -msoft-float -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -mno-red-zone -mno-sse3 -mno-sse4 -mno-sse4.1 -mno-sse4.2  -mno-sse4a -fno-unwind-tables
+ TEMPLATE_VBoxR0_CXXFLAGS.x86       = -m32 -msoft-float -mno-sse -mno-mmx -mno-sse2 -mno-3dnow
+ TEMPLATE_VBoxR0_CXXFLAGS.arm64     = -m64 -target arm64e-apple-macos11.0 # Assembly fixup issues w/o the -target bit. Why?
+ TEMPLATE_VBoxR0_CFLAGS             = $(VBOX_DARWIN_DEF_SDK_CFLAGS)   -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) \
+        -fno-common -static -fno-exceptions $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing \
+        $(VBOX_GCC_fno-stack-protector)
+ TEMPLATE_VBoxR0_CFLAGS.amd64       = -m64 -msoft-float -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -mno-red-zone -mno-sse3 -mno-sse4 -mno-sse4.1 -mno-sse4.2  -mno-sse4a -fno-unwind-tables
+ TEMPLATE_VBoxR0_CFLAGS.x86         = -m32 -msoft-float -mno-sse -mno-mmx -mno-sse2 -mno-3dnow
+ TEMPLATE_VBoxR0_CFLAGS.arm64       = -m64 -target arm64e-apple-macos11.0
+ TEMPLATE_VBoxR0_LDFLAGS            = $(VBOX_DARWIN_DEF_SDK_LDFLAGS) -nostdlib
+ TEMPLATE_VBoxR0_LDFLAGS.amd64      = -m64 -static
+ TEMPLATE_VBoxR0_LDFLAGS.arm64      = -m64 -static
+ TEMPLATE_VBoxR0_LDFLAGS.x86        = -m32
+ TEMPLATE_VBoxR0_CXXFLAGS.amd64    += -mkernel
+ TEMPLATE_VBoxR0_CFLAGS.amd64      += -mkernel
+ TEMPLATE_VBoxR0_CXXFLAGS.arm64    += -mkernel
+ TEMPLATE_VBoxR0_CFLAGS.arm64      += -mkernel
+ TEMPLATE_VBoxR0_LDFLAGS           += -Wl,-kext -mkernel
+ TEMPLATE_VBoxR0_POST_CMDS          = $(if $(eq $(tool_do),LINK_LIBRARY),,$(call VBOX_SIGN_VMM_MOD_FN,$(out),org.virtualbox.app.r0.$(target)))
+endif
+
+ifeq ($(VBOX_LDR_FMT),lx)
+ TEMPLATE_VBoxR0_TOOL               = GXX3OMF
+ TEMPLATE_VBoxR0_CFLAGS             = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions -fno-common
+ TEMPLATE_VBoxR0_CXXFLAGS           = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions -fno-common -fno-rtti
+ if $(VBOX_GCC_VERSION_CC) < 30400
+  TEMPLATE_VBoxR0_DEFS             += RT_WITHOUT_PRAGMA_ONCE
+ endif
+ TEMPLATE_VBoxR0_LDFLAGS            = -nostdlib -Zdll
  TEMPLATE_VBoxR0_LIBS               = \
-        $(VBOX_GCC_LIBGCC) # intrinsics
- endif
- if1of ($(KBUILD_TARGET),linux)
- TEMPLATE_VBoxR0_POST_CMDS         += $(NLTAB)\
-        $(if $(eq $(tool_do),LINK_SYSMOD),if readelf -S $(out)|grep -q "[cd]tors"; then echo "Found ctors/dtors in $(out)!"; exit 1; fi)
- endif
-endif # elf
-
-ifeq ($(VBOX_LDR_FMT),macho)
-TEMPLATE_VBoxR0_TOOL                = $(VBOX_GCC_TOOL)
-TEMPLATE_VBoxR0_SDKS               += $(VBOX_DARWIN_DEF_SDK_SDKS)
-TEMPLATE_VBoxR0_DEFS               += $(VBOX_DARWIN_DEF_SDK_DEFS)
-TEMPLATE_VBoxR0_CXXFLAGS            = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS) -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) \
-        -fno-common -static -fno-rtti -fno-exceptions $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing \
-         $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_std)
-TEMPLATE_VBoxR0_CXXFLAGS.amd64      = -m64 -msoft-float -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -mno-red-zone -mno-sse3 -mno-sse4 -mno-sse4.1 -mno-sse4.2  -mno-sse4a -fno-unwind-tables
-TEMPLATE_VBoxR0_CXXFLAGS.x86        = -m32 -msoft-float -mno-sse -mno-mmx -mno-sse2 -mno-3dnow
-TEMPLATE_VBoxR0_CXXFLAGS.arm64      = -m64 -target arm64e-apple-macos11.0 # Assembly fixup issues w/o the -target bit. Why?
-TEMPLATE_VBoxR0_CFLAGS              = $(VBOX_DARWIN_DEF_SDK_CFLAGS)   -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) \
-        -fno-common -static -fno-exceptions $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing \
-        $(VBOX_GCC_fno-stack-protector)
-TEMPLATE_VBoxR0_CFLAGS.amd64        = -m64 -msoft-float -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -mno-red-zone -mno-sse3 -mno-sse4 -mno-sse4.1 -mno-sse4.2  -mno-sse4a -fno-unwind-tables
-TEMPLATE_VBoxR0_CFLAGS.x86          = -m32 -msoft-float -mno-sse -mno-mmx -mno-sse2 -mno-3dnow
-TEMPLATE_VBoxR0_CFLAGS.arm64        = -m64 -target arm64e-apple-macos11.0
-TEMPLATE_VBoxR0_LDFLAGS             = $(VBOX_DARWIN_DEF_SDK_LDFLAGS) -nostdlib
-TEMPLATE_VBoxR0_LDFLAGS.amd64       = -m64 -static
-TEMPLATE_VBoxR0_LDFLAGS.arm64       = -m64 -static
-TEMPLATE_VBoxR0_LDFLAGS.x86         = -m32
-TEMPLATE_VBoxR0_CXXFLAGS.amd64     += -mkernel
-TEMPLATE_VBoxR0_CFLAGS.amd64       += -mkernel
-TEMPLATE_VBoxR0_CXXFLAGS.arm64     += -mkernel
-TEMPLATE_VBoxR0_CFLAGS.arm64       += -mkernel
-TEMPLATE_VBoxR0_LDFLAGS            += -Wl,-kext -mkernel
-TEMPLATE_VBoxR0_POST_CMDS           = $(if $(eq $(tool_do),LINK_LIBRARY),,$(call VBOX_SIGN_VMM_MOD_FN,$(out),org.virtualbox.app.r0.$(target)))
-endif
-
-ifeq ($(VBOX_LDR_FMT),lx)
-TEMPLATE_VBoxR0_TOOL                = GXX3OMF
-TEMPLATE_VBoxR0_CFLAGS              = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions -fno-common
-TEMPLATE_VBoxR0_CXXFLAGS            = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions -fno-common -fno-rtti
- if $(VBOX_GCC_VERSION_CC) < 30400
-TEMPLATE_VBoxR0_DEFS               += RT_WITHOUT_PRAGMA_ONCE
- endif
-TEMPLATE_VBoxR0_LDFLAGS             = -nostdlib -Zdll
-TEMPLATE_VBoxR0_LIBS                = \
-        $(VBOX_GCC_LIBGCC) \
-        $(VBOX_OBJ_SYS0) \
-        end
+        $(VBOX_GCC_LIBGCC) \
+        $(VBOX_OBJ_SYS0) \
+        end
 endif
 
@@ -5542 +5542 @@
  TEMPLATE_VBoxR0Drv_DEFS.win           = IPRT_NT_MAP_TO_ZW
  TEMPLATE_VBoxR0Drv_CXXFLAGS           = -Zi -Zl -GR- -EHs- -GF -Gz -GS- -Zc:wchar_t- $(VBOX_VCC_FP) -Gs4096 $(VBOX_VCC_OPT) \
-        -Gy $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_WARN_ALL) $(VBOX_VCC_WERR)
+        -Gy $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_WARN_ALL) $(VBOX_VCC_WERR)
  if "$(VBOX_VCC_TOOL_STEM)" >= "VCC120"
   TEMPLATE_VBoxR0Drv_CXXFLAGS         += -Gw
@@ -5556 +5556 @@
         -Driver -Subsystem:NATIVE -Incremental:NO -Align:4096 -MapInfo:Exports -NoD -Release -Debug -Opt:Ref -Opt:Icf \
         $(VBOX_VCC_LD_GUARD_CF) \
-        -Version:$(VBOX_VERSION_MAJOR)0$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
-        -Stub:$(PATH_ROOT)/src/VBox/HostDrivers/Support/win/winstub.com
+        -Version:$(VBOX_VERSION_MAJOR)0$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
+        -Stub:$(PATH_ROOT)/src/VBox/HostDrivers/Support/win/winstub.com
  ifdef VBOX_WITH_DTRACE_R0DRV
   TEMPLATE_VBoxR0Drv_LDFLAGS          += -Merge:VTGPrLc.Data=VTGPrLc.Begin -Merge:VTGPrLc.End=VTGPrLc.Begin -Merge:VTGPrLc.Begin=VTGObj
@@ -5602 +5602 @@
  ##
  if   defined(VBOX_WITH_TESTCASES) \
-  && "$(KBUILD_HOST)" == "linux" \
-  && "$(KBUILD_HOST_ARCH)" == "$(KBUILD_TARGET_ARCH)" \
-  && !defined(VBOX_WITHOUT_LINUX_TEST_BUILDS) \
-  && !defined(VBOX_ONLY_SDK) \
-  && !defined(VBOX_ONLY_DOCS) \
-  && !defined(VBOX_ONLY_VALIDATIONKIT)
+   && "$(KBUILD_HOST)" == "linux" \
+   && "$(KBUILD_HOST_ARCH)" == "$(KBUILD_TARGET_ARCH)" \
+   && !defined(VBOX_WITHOUT_LINUX_TEST_BUILDS) \
+   && !defined(VBOX_ONLY_SDK) \
+   && !defined(VBOX_ONLY_DOCS) \
+   && !defined(VBOX_ONLY_VALIDATIONKIT)
   define VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN
    ifneq ($(KERN_DIR),)
-TESTING      += $$(PATH_TARGET)/tst$(1)$(subst /,_,$(KERN_DIR))_mod.run
-OTHERS       += $$(PATH_TARGET)/tst$(1)$(subst /,_,$(KERN_DIR))_mod.run
-OTHERS_CLEAN += $$(PATH_TARGET)/tst$(1)$(subst /,_,$(KERN_DIR))_mod.run
-$$(PATH_TARGET)/tst$(1)$(subst /,_,$(KERN_DIR))_mod.run: \
-                $$(if $(2),$$(PATH_TARGET)/tst$(2)$(subst /,_,$(KERN_DIR))_mod.run,) \
-                $$$$($(1)_2_STAGE_TARGETS)
+    TESTING  += $$(PATH_TARGET)/tst$(1)$(subst /,_,$(KERN_DIR))_mod.run
+    OTHERS   += $$(PATH_TARGET)/tst$(1)$(subst /,_,$(KERN_DIR))_mod.run
+    OTHERS_CLEAN += $$(PATH_TARGET)/tst$(1)$(subst /,_,$(KERN_DIR))_mod.run
+    $$(PATH_TARGET)/tst$(1)$(subst /,_,$(KERN_DIR))_mod.run: \
+                $$(if $(2),$$(PATH_TARGET)/tst$(2)$(subst /,_,$(KERN_DIR))_mod.run,) \
+                $$$$($(1)_2_STAGE_TARGETS)
         $(QUIET)$$(call MSG_L1,Doing a test build of the $(1) kernel module)
         $(QUIET)$$(RM) -f    -- "$$@"
@@ -5627 +5627 @@
                 BUILD_TYPE= BUILD_TARGET= BUILD_TARGET_ARCH= BUILD_TARGET_CPU= BUILD_PLATFORM= BUILD_PLATFORM_ARCH= BUILD_PLATFORM_CPU= \
                 -C $$(PATH_TARGET)/tst$(1)_mod clean
-   ifneq ($(2),)
+    ifneq ($(2),)
         $(QUIET)$$(CP) -f    -- "$$<" "$$(PATH_TARGET)/tst$(1)_mod/Module.symvers"
-   endif
+    endif
         + $(QUIET)$(REDIRECT_EXT) -d2=1 -w1 "$$(PATH_TARGET)/tst$(1)_mod/make.err" -- \
                 make KBUILD_VERBOSE=$(KBUILD_VERBOSE) KERN_DIR=$(KERN_DIR) VBOX_KERN_QUIET=1 $(if $(2),KBUILD_EXTRA_SYMBOLS="$$(PATH_TARGET)/tst$(1)_mod/Module.symvers",) $(if-expr $(KMK_OPTS_JOBS) != 0,JOBS=$(KMK_OPTS_JOBS),) \
@@ -5638 +5638 @@
         $(CAT) "$$(PATH_TARGET)/tst$(1)_mod/make.err"
         $(QUIET)! grep "^WARNING: .* undefined!$$$$" "$$(PATH_TARGET)/tst$(1)_mod/make.err"
-   if1of ($(USERNAME), bird)
+    if1of ($(USERNAME), bird)
         - nm -u "$$(PATH_TARGET)/tst$(1)_mod/"*.ko | sort
+    endif
+    ifneq ($(3),)
+        $(QUIET)$$(CP) -f    -- "$$(PATH_TARGET)/tst$(1)_mod/Module.symvers" "$$@"
+    else
+        $(QUIET)$$(APPEND) -t "$$@" "done"
+    endif
+        $(QUIET)$$(RM) -Rf   -- "$$(PATH_TARGET)/tst$(1)_mod"
+    vbox-linux-kmod-test-builds: $$(PATH_TARGET)/tst$(1)$(subst /,_,$(KERN_DIR))_mod.run
+    $$(foreach src,$$(notdir $$(filter %.c,$$(subst =>,/,$$($(1)_SOURCES)))),$$(patsubst %.c,%.o,$$(src))): $$(PATH_TARGET)/tst$(1)$(subst /,_,$(KERN_DIR))_mod.run
    endif
-   ifneq ($(3),)
-        $(QUIET)$$(CP) -f    -- "$$(PATH_TARGET)/tst$(1)_mod/Module.symvers" "$$@"
-   else
-        $(QUIET)$$(APPEND) -t "$$@" "done"
-   endif
-        $(QUIET)$$(RM) -Rf   -- "$$(PATH_TARGET)/tst$(1)_mod"
-vbox-linux-kmod-test-builds: $$(PATH_TARGET)/tst$(1)$(subst /,_,$(KERN_DIR))_mod.run
-$$(foreach src,$$(notdir $$(filter %.c,$$(subst =>,/,$$($(1)_SOURCES)))),$$(patsubst %.c,%.o,$$(src))): $$(PATH_TARGET)/tst$(1)$(subst /,_,$(KERN_DIR))_mod.run
-  endif
- endef # VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN
+  endef # VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN
  else
   VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN =
  endif
 else
-  VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN =
+ VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN  =
 endif # linux target
 
 ifeq ($(KBUILD_TARGET),os2)
  ifndef VBOX_USE_WATCOM_FOR_OS2
-TEMPLATE_VBoxR0Drv_TOOL                = GXX3OMF
-TEMPLATE_VBoxR0Drv_CXXFLAGS            = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions -fno-rtti
-TEMPLATE_VBoxR0Drv_CFLAGS              = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions
-TEMPLATE_VBoxR0Drv_LIBS                = $(VBOX_GCC_LIBGCC)
-# wlink thinks physdevice doesn't need fixups and should have a stack - stupid!
-TEMPLATE_VBoxR0Drv_LDFLAGS             = -Zlinker Option -Zlinker internalrelocs, -Zlinker togglerelocs
-  else
-TEMPLATE_VBoxR0Drv_TOOL     = OPENWATCOM
-TEMPLATE_VBoxR0Drv_CTOOL    = OPENWATCOM
-TEMPLATE_VBoxR0Drv_CXXTOOL  = OPENWATCOM
-TEMPLATE_VBoxR0Drv_LDTOOL   = OPENWATCOM-WL
-TEMPLATE_VBoxR0Drv_ARTOOL   = OPENWATCOM
-TEMPLATE_VBoxR0Drv_ASTOOL   = NASM
-TEMPLATE_VBoxR0Drv_ASFLAGS  = -fobj -DASM_FORMAT_OMF -D__NASM__ -w+orphan-labels #-g -F borland
-TEMPLATE_VBoxR0Drv_DEFS.os2 = #_OS2EMX_H
-TEMPLATE_VBoxR0Drv_INCS     = \
-        $(PATH_TOOL_OPENWATCOM)/h \
-        $(PATH_TOOL_OPENWATCOM)/h/os2 \
-        $(PATH_ROOT)/include \
-        $(PATH_KLIBC_TRUNK)/libc/include # for os2ddk
-TEMPLATE_VBoxR0Drv_CFLAGS   = -s -ze -w4 -hd -d1+ -nt=TEXT32 -nc=CODE -4 -of+
-TEMPLATE_VBoxR0Drv_CXXFLAGS = -s -ze -w4 -hd -d2t -nt=TEXT32 -nc=CODE -4 -of+
-TEMPLATE_VBoxR0Drv_LDFLAGS  = \
-        form os2 lx physdevice \
-        option NODefaultlibs, internalrelocs, togglerelocs \
-        debug dwarf all #option symfile
-#       debug codeview all option symfile - wlink generates bad info, overwritten mod dir header.
+  TEMPLATE_VBoxR0Drv_TOOL              = GXX3OMF
+  TEMPLATE_VBoxR0Drv_CXXFLAGS          = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions -fno-rtti
+  TEMPLATE_VBoxR0Drv_CFLAGS            = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions
+  TEMPLATE_VBoxR0Drv_LIBS              = $(VBOX_GCC_LIBGCC)
+  # wlink thinks physdevice doesn't need fixups and should have a stack - stupid!
+  TEMPLATE_VBoxR0Drv_LDFLAGS           = -Zlinker Option -Zlinker internalrelocs, -Zlinker togglerelocs
+ else
+  TEMPLATE_VBoxR0Drv_TOOL   = OPENWATCOM
+  TEMPLATE_VBoxR0Drv_CTOOL  = OPENWATCOM
+  TEMPLATE_VBoxR0Drv_CXXTOOL = OPENWATCOM
+  TEMPLATE_VBoxR0Drv_LDTOOL = OPENWATCOM-WL
+  TEMPLATE_VBoxR0Drv_ARTOOL = OPENWATCOM
+  TEMPLATE_VBoxR0Drv_ASTOOL = NASM
+  TEMPLATE_VBoxR0Drv_ASFLAGS = -fobj -DASM_FORMAT_OMF -D__NASM__ -w+orphan-labels #-g -F borland
+  TEMPLATE_VBoxR0Drv_DEFS.os2 = #_OS2EMX_H
+  TEMPLATE_VBoxR0Drv_INCS   = \
+        $(PATH_TOOL_OPENWATCOM)/h \
+        $(PATH_TOOL_OPENWATCOM)/h/os2 \
+        $(PATH_ROOT)/include \
+        $(PATH_KLIBC_TRUNK)/libc/include # for os2ddk
+  TEMPLATE_VBoxR0Drv_CFLAGS = -s -ze -w4 -hd -d1+ -nt=TEXT32 -nc=CODE -4 -of+
+  TEMPLATE_VBoxR0Drv_CXXFLAGS = -s -ze -w4 -hd -d2t -nt=TEXT32 -nc=CODE -4 -of+
+  TEMPLATE_VBoxR0Drv_LDFLAGS = \
+        form os2 lx physdevice \
+        option NODefaultlibs, internalrelocs, togglerelocs \
+        debug dwarf all #option symfile
+  #     debug codeview all option symfile - wlink generates bad info, overwritten mod dir header.
  endif
 endif
 
 ifeq ($(KBUILD_TARGET),darwin)
-TEMPLATE_VBoxR0Drv_TOOL                = $(VBOX_GCC_TOOL)
-TEMPLATE_VBoxR0Drv_SDKS               += $(VBOX_DARWIN_DEF_SDK_SDKS)
-TEMPLATE_VBoxR0Drv_DEFS               += $(VBOX_DARWIN_DEF_SDK_DEFS) KERNEL KERNEL_PRIVATE DRIVER_PRIVATE APPLE NeXT
+ TEMPLATE_VBoxR0Drv_TOOL               = $(VBOX_GCC_TOOL)
+ TEMPLATE_VBoxR0Drv_SDKS              += $(VBOX_DARWIN_DEF_SDK_SDKS)
+ TEMPLATE_VBoxR0Drv_DEFS              += $(VBOX_DARWIN_DEF_SDK_DEFS) KERNEL KERNEL_PRIVATE DRIVER_PRIVATE APPLE NeXT
  if1of ($(VBOX_GCC_TOOL), GXX4MACHO GXX42MACHO)
-TEMPLATE_VBoxR0Drv_INCS               += \
-        $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Kernel.framework/PrivateHeaders \
-        $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Kernel.framework/Headers
-## @todo try use VBOX_GCC_PEDANTIC_CXX
-TEMPLATE_VBoxR0Drv_CXXFLAGS            = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS) \
-        -g $(VBOX_GCC_pipe) $(VBOX_GCC_WARN) -Wno-long-long $(VBOX_GCC_fdiagnostics-show-option) \
-        -fno-common -nostdinc -fno-builtin -finline $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) \
-        -fno-keep-inline-functions -fno-exceptions -msoft-float \
-        -fapple-kext -fno-rtti -fcheck-new -force_cpusubtype_ALL \
-        $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fasm-blocks
-TEMPLATE_VBoxR0Drv_CXXFLAGS.amd64      = -m64 -mkernel -mno-red-zone -gdwarf-2
-TEMPLATE_VBoxR0Drv_CXXFLAGS.x86        = -m32 -static
-TEMPLATE_VBoxR0Drv_CFLAGS              = $(VBOX_DARWIN_DEF_SDK_CFLAGS) \
-        -g $(VBOX_GCC_pipe) $(VBOX_GCC_WARN) -Wno-long-long -fno-common -nostdinc -fno-builtin -finline \
-        -fno-keep-inline-functions -fno-exceptions $(VBOX_GCC_fvisibility-hidden) -msoft-float \
-        -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations \
-        -Werror-implicit-function-declaration -force_cpusubtype_ALL \
-        $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fasm-blocks
-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)) \
-        -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)
+  TEMPLATE_VBoxR0Drv_INCS             += \
+        $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Kernel.framework/PrivateHeaders \
+        $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Kernel.framework/Headers
+  ## @todo try use VBOX_GCC_PEDANTIC_CXX
+  TEMPLATE_VBoxR0Drv_CXXFLAGS          = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS) \
+        -g $(VBOX_GCC_pipe) $(VBOX_GCC_WARN) -Wno-long-long $(VBOX_GCC_fdiagnostics-show-option) \
+        -fno-common -nostdinc -fno-builtin -finline $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) \
+        -fno-keep-inline-functions -fno-exceptions -msoft-float \
+        -fapple-kext -fno-rtti -fcheck-new -force_cpusubtype_ALL \
+        $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fasm-blocks
+  TEMPLATE_VBoxR0Drv_CXXFLAGS.amd64    = -m64 -mkernel -mno-red-zone -gdwarf-2
+  TEMPLATE_VBoxR0Drv_CXXFLAGS.x86      = -m32 -static
+  TEMPLATE_VBoxR0Drv_CFLAGS            = $(VBOX_DARWIN_DEF_SDK_CFLAGS) \
+        -g $(VBOX_GCC_pipe) $(VBOX_GCC_WARN) -Wno-long-long -fno-common -nostdinc -fno-builtin -finline \
+        -fno-keep-inline-functions -fno-exceptions $(VBOX_GCC_fvisibility-hidden) -msoft-float \
+        -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations \
+        -Werror-implicit-function-declaration -force_cpusubtype_ALL \
+        $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fasm-blocks
+  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)) \
+        -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)
  else
   # Note xcode uses -fstrict-aliasing, we currently don't dare... We also add -mno-red-zone.
-TEMPLATE_VBoxR0Drv_INCS               += \
-        $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Kernel.framework/PrivateHeaders \
-        $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Kernel.framework/Headers
-## @todo try use VBOX_GCC_PEDANTIC_CXX
-# -Wno-c++11-extensions -Wno-c99-extensions -Wno-extra-semi -Wno-zero-length-array
-TEMPLATE_VBoxR0Drv_CXXFLAGS            = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS) -mkernel \
-        -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_CXX) -Wno-long-long $(VBOX_GCC_fdiagnostics-show-option) \
-        -Wno-c++11-extensions -Wno-c99-extensions -Wno-extra-semi -Wno-zero-length-array \
-        -Wno-gnu-zero-variadic-macro-arguments -Wno-four-char-constants \
-        -fno-common -nostdinc -fno-builtin $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) \
-        -fno-exceptions -fapple-kext -fno-rtti -mkernel \
-        -fmodules -fmodules-prune-interval=86400 -fmodules-prune-after=345600 -Wnon-modular-include-in-framework-module \
-        -Werror=non-modular-include-in-framework-module \
-        $(VBOX_GCC_Wno-nullability-extension) $(VBOX_GCC_Wno-gnu-statement-expression) \
-       $(VBOX_GCC_Wno-import-preprocessor-directive-pedantic) $(VBOX_GCC_Wno-c11-extensions) \
-        $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fasm-blocks -fno-strict-aliasing -stdlib=libc++
-#  if1of ($(VBOX_GCC_TOOL), CLANGXXMACHO) ## @todo check if we can safely use $(VBOX_GCC_std) @bugref{9790}, good for noexcept.
-#TEMPLATE_VBoxR0Drv_CXXFLAGS           += $(VBOX_GCC_std)
-#  endif
-# also used by xcode 6.2: \
-# -Werror=return-type \
-# -Werror=deprecated-objc-isa-usage \
-# -Werror=objc-root-class \
-# -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code \
-# -Wno-overloaded-virtual -Wno-exit-time-destructors -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function \
-# -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body \
-# -Wconditional-uninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants \
-# -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion \
-# -Wshorten-64-to-32 -Wno-newline-eof -Wno-c++11-extensions -Wdeprecated-declarations -Winvalid-offsetof -Wno-sign-conversion
-TEMPLATE_VBoxR0Drv_CXXFLAGS.amd64      = -m64 -msoft-float -mno-red-zone
-TEMPLATE_VBoxR0Drv_CXXFLAGS.x86        = -m32 -msoft-float
-TEMPLATE_VBoxR0Drv_CXXFLAGS.arm64      = -m64 -fno-sanitize=vptr -target arm64e-apple-macos11.0
-TEMPLATE_VBoxR0Drv_CFLAGS              = $(VBOX_DARWIN_DEF_SDK_CFLAGS) -mkernel \
-        -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_C) -Wno-long-long $(VBOX_GCC_fdiagnostics-show-option) \
-        -fno-common -nostdinc -fno-builtin $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) \
-        -fno-exceptions -fapple-kext -fno-rtti  \
-        -fmodules -fmodules-prune-interval=86400 -fmodules-prune-after=345600 -Wnon-modular-include-in-framework-module \
-        -Werror=non-modular-include-in-framework-module $(VBOX_GCC_Wno-c11-extensions) \
-        $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fasm-blocks -fno-strict-aliasing
-TEMPLATE_VBoxR0Drv_CFLAGS.amd64        = -m64 -msoft-float -mno-red-zone
-TEMPLATE_VBoxR0Drv_CFLAGS.x86          = -m32 -msoft-float
-TEMPLATE_VBoxR0Drv_CFLAGS.arm64        = -m64 -fno-sanitize=vptr -target arm64e-apple-macos11.0
+  TEMPLATE_VBoxR0Drv_INCS             += \
+        $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Kernel.framework/PrivateHeaders \
+        $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Kernel.framework/Headers
+  ## @todo try use VBOX_GCC_PEDANTIC_CXX
+  # -Wno-c++11-extensions -Wno-c99-extensions -Wno-extra-semi -Wno-zero-length-array
+  TEMPLATE_VBoxR0Drv_CXXFLAGS          = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS) -mkernel \
+        -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_CXX) -Wno-long-long $(VBOX_GCC_fdiagnostics-show-option) \
+        -Wno-c++11-extensions -Wno-c99-extensions -Wno-extra-semi -Wno-zero-length-array \
+        -Wno-gnu-zero-variadic-macro-arguments -Wno-four-char-constants \
+        -fno-common -nostdinc -fno-builtin $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) \
+        -fno-exceptions -fapple-kext -fno-rtti -mkernel \
+        -fmodules -fmodules-prune-interval=86400 -fmodules-prune-after=345600 -Wnon-modular-include-in-framework-module \
+        -Werror=non-modular-include-in-framework-module \
+        $(VBOX_GCC_Wno-nullability-extension) $(VBOX_GCC_Wno-gnu-statement-expression) \
+        $(VBOX_GCC_Wno-import-preprocessor-directive-pedantic) $(VBOX_GCC_Wno-c11-extensions) \
+        $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fasm-blocks -fno-strict-aliasing -stdlib=libc++
+  #  if1of ($(VBOX_GCC_TOOL), CLANGXXMACHO) ## @todo check if we can safely use $(VBOX_GCC_std) @bugref{9790}, good for noexcept.
+  #TEMPLATE_VBoxR0Drv_CXXFLAGS           += $(VBOX_GCC_std)
+  #  endif
+  # also used by xcode 6.2: \
+  # -Werror=return-type \
+  # -Werror=deprecated-objc-isa-usage \
+  # -Werror=objc-root-class \
+  # -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code \
+  # -Wno-overloaded-virtual -Wno-exit-time-destructors -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function \
+  # -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body \
+  # -Wconditional-uninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants \
+  # -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion \
+  # -Wshorten-64-to-32 -Wno-newline-eof -Wno-c++11-extensions -Wdeprecated-declarations -Winvalid-offsetof -Wno-sign-conversion
+  TEMPLATE_VBoxR0Drv_CXXFLAGS.amd64    = -m64 -msoft-float -mno-red-zone
+  TEMPLATE_VBoxR0Drv_CXXFLAGS.x86      = -m32 -msoft-float
+  TEMPLATE_VBoxR0Drv_CXXFLAGS.arm64    = -m64 -fno-sanitize=vptr -target arm64e-apple-macos11.0
+  TEMPLATE_VBoxR0Drv_CFLAGS            = $(VBOX_DARWIN_DEF_SDK_CFLAGS) -mkernel \
+        -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_C) -Wno-long-long $(VBOX_GCC_fdiagnostics-show-option) \
+        -fno-common -nostdinc -fno-builtin $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) \
+        -fno-exceptions -fapple-kext -fno-rtti \
+        -fmodules -fmodules-prune-interval=86400 -fmodules-prune-after=345600 -Wnon-modular-include-in-framework-module \
+        -Werror=non-modular-include-in-framework-module $(VBOX_GCC_Wno-c11-extensions) \
+        $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fasm-blocks -fno-strict-aliasing
+  TEMPLATE_VBoxR0Drv_CFLAGS.amd64      = -m64 -msoft-float -mno-red-zone
+  TEMPLATE_VBoxR0Drv_CFLAGS.x86        = -m32 -msoft-float
+  TEMPLATE_VBoxR0Drv_CFLAGS.arm64      = -m64 -fno-sanitize=vptr -target arm64e-apple-macos11.0
   if 1
    TEMPLATE_VBoxR0Drv_CFLAGS          += $(VBOX_GCC_WERR)
    TEMPLATE_VBoxR0Drv_CXXFLAGS        += $(VBOX_GCC_WERR)
   endif
-TEMPLATE_VBoxR0Drv_LDFLAGS             =  $(filter-out $(VBOX_DARWIN_NO_COMPACT_LINKEDIT),$(VBOX_DARWIN_DEF_SDK_LDFLAGS)) \
-        -nostdlib -stdlib=libc++ -Wl,-kext -Wl,-keep_private_externs
-TEMPLATE_VBoxR0Drv_LDFLAGS.amd64       = -m64
-TEMPLATE_VBoxR0Drv_LDFLAGS.arm64       = -m64
-TEMPLATE_VBoxR0Drv_LDFLAGS.x86         = -m32
-TEMPLATE_VBoxR0Drv_LIBS                = kmodc++ kmod cc_kext
+  TEMPLATE_VBoxR0Drv_LDFLAGS           = $(filter-out $(VBOX_DARWIN_NO_COMPACT_LINKEDIT),$(VBOX_DARWIN_DEF_SDK_LDFLAGS)) \
+        -nostdlib -stdlib=libc++ -Wl,-kext -Wl,-keep_private_externs
+  TEMPLATE_VBoxR0Drv_LDFLAGS.amd64     = -m64
+  TEMPLATE_VBoxR0Drv_LDFLAGS.arm64     = -m64
+  TEMPLATE_VBoxR0Drv_LDFLAGS.x86       = -m32
+  TEMPLATE_VBoxR0Drv_LIBS              = kmodc++ kmod cc_kext
  endif
 endif
 
 ifeq ($(KBUILD_TARGET),solaris)
-## The Solaris /usr/platform/i86pc/include and /usr/include directories.
-VBOX_SOLARIS_SYS_INCS ?= /usr/platform/i86pc/include /usr/include
-
-TEMPLATE_VBoxR0Drv_TOOL                = $(VBOX_GCC_TOOL)
-TEMPLATE_VBoxR0Drv_DEFS               += _MACHDEP _KERNEL _STRICT_STDC
+ ## The Solaris /usr/platform/i86pc/include and /usr/include directories.
+ VBOX_SOLARIS_SYS_INCS ?= /usr/platform/i86pc/include /usr/include
+
+ TEMPLATE_VBoxR0Drv_TOOL               = $(VBOX_GCC_TOOL)
+ TEMPLATE_VBoxR0Drv_DEFS              += _MACHDEP _KERNEL _STRICT_STDC
  if $(VBOX_GCC_VERSION_CC) < 30400
-TEMPLATE_VBoxR0Drv_DEFS               += RT_WITHOUT_PRAGMA_ONCE
- endif
-TEMPLATE_VBoxR0Drv_INCS                = $(VBOX_SOLARIS_SYS_INCS)
-TEMPLATE_VBoxR0Drv_LDFLAGS             = -r -dy
-TEMPLATE_VBoxR0Drv_LDFLAGS.amd64       = $(if $(eq $(KBUILD_HOST),solaris),-64,-m elf_x86_64)
-# Exclude -Wall because of solaris headers' pragma ident warnings that gcc refuses to supress.
-TEMPLATE_VBoxR0Drv_CFLAGS              = -Wpointer-arith -Winline $(VBOX_GCC_Wno-pointer-sign) \
-        -Wmissing-prototypes -Wstrict-prototypes $(VBOX_GCC_fdiagnostics-show-option) \
-        -Wshadow -Wuninitialized -Wunused-function -Wunused-label -Wunused-value -Wunused-variable \
-        -Wformat  -Wimplicit-int -Wimplicit-function-declaration -Werror-implicit-function-declaration -Wparentheses \
-        -O2 -fno-omit-frame-pointer -ffreestanding -nodefaultlibs -fno-strict-aliasing -fno-common -std=c99
-TEMPLATE_VBoxR0Drv_CFLAGS.x86          = -m32 -mno-sse -mno-mmx -mno-sse2 -mno-3dnow
-TEMPLATE_VBoxR0Drv_CFLAGS.amd64        = -m64 -mno-sse -mno-mmx -mno-sse2 -mno-3dnow $(VBOX_GCC_msave-args) \
-        -mno-red-zone -mcmodel=kernel $(if-expr defined(VBOX_GCC_USING_SOLARIS_AS),-Wa$(COMMA)-xmodel=kernel,) \
-        -fno-reorder-blocks -fno-asynchronous-unwind-tables -funit-at-a-time
-TEMPLATE_VBoxR0Drv_CXXFLAGS           = -Wpointer-arith \
-        -Wshadow -Wuninitialized -Wunused-function -Wunused-label -Wunused-value -Wunused-variable -Wformat \
-        -O2 -nodefaultlibs -fno-omit-frame-pointer -fno-strict-aliasing -fno-common -fno-exceptions -fno-rtti
-TEMPLATE_VBoxR0Drv_CXXFLAGS.x86       = $(TEMPLATE_VBoxR0Drv_CFLAGS.x86)
-TEMPLATE_VBoxR0Drv_CXXFLAGS.amd64     = $(TEMPLATE_VBoxR0Drv_CFLAGS.amd64)
-TEMPLATE_VBoxR0Drv_POST_CMDS          = $(VBOX_SIGN_DRIVER_CMDS)
+  TEMPLATE_VBoxR0Drv_DEFS             += RT_WITHOUT_PRAGMA_ONCE
+ endif
+ TEMPLATE_VBoxR0Drv_INCS               = $(VBOX_SOLARIS_SYS_INCS)
+ TEMPLATE_VBoxR0Drv_LDFLAGS            = -r -dy
+ TEMPLATE_VBoxR0Drv_LDFLAGS.amd64      = $(if $(eq $(KBUILD_HOST),solaris),-64,-m elf_x86_64)
+ # Exclude -Wall because of solaris headers' pragma ident warnings that gcc refuses to supress.
+ TEMPLATE_VBoxR0Drv_CFLAGS             = -Wpointer-arith -Winline $(VBOX_GCC_Wno-pointer-sign) \
+        -Wmissing-prototypes -Wstrict-prototypes $(VBOX_GCC_fdiagnostics-show-option) \
+        -Wshadow -Wuninitialized -Wunused-function -Wunused-label -Wunused-value -Wunused-variable \
+        -Wformat  -Wimplicit-int -Wimplicit-function-declaration -Werror-implicit-function-declaration -Wparentheses \
+        -O2 -fno-omit-frame-pointer -ffreestanding -nodefaultlibs -fno-strict-aliasing -fno-common -std=c99
+ TEMPLATE_VBoxR0Drv_CFLAGS.x86         = -m32 -mno-sse -mno-mmx -mno-sse2 -mno-3dnow
+ TEMPLATE_VBoxR0Drv_CFLAGS.amd64       = -m64 -mno-sse -mno-mmx -mno-sse2 -mno-3dnow $(VBOX_GCC_msave-args) \
+        -mno-red-zone -mcmodel=kernel $(if-expr defined(VBOX_GCC_USING_SOLARIS_AS),-Wa$(COMMA)-xmodel=kernel,) \
+        -fno-reorder-blocks -fno-asynchronous-unwind-tables -funit-at-a-time
+ TEMPLATE_VBoxR0Drv_CXXFLAGS          = -Wpointer-arith \
+        -Wshadow -Wuninitialized -Wunused-function -Wunused-label -Wunused-value -Wunused-variable -Wformat \
+        -O2 -nodefaultlibs -fno-omit-frame-pointer -fno-strict-aliasing -fno-common -fno-exceptions -fno-rtti
+ TEMPLATE_VBoxR0Drv_CXXFLAGS.x86      = $(TEMPLATE_VBoxR0Drv_CFLAGS.x86)
+ TEMPLATE_VBoxR0Drv_CXXFLAGS.amd64    = $(TEMPLATE_VBoxR0Drv_CFLAGS.amd64)
+ TEMPLATE_VBoxR0Drv_POST_CMDS         = $(VBOX_SIGN_DRIVER_CMDS)
 endif # Solaris
 
 ifeq ($(KBUILD_TARGET),freebsd)
-# x86 FreeBSD (6.2 or something):
-#  cc -O2 -fno-strict-aliasing -pipe -Werror -D_KERNEL -DKLD_MODULE \
-#   -nostdinc -I- -I. -I@ -I@/contrib/altq -I@/../include -I/usr/include \
-#   -finline-limit=8000 -fno-common -mno-align-long-strings -mpreferred-stack-boundary=2 \
-#   -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -ffreestanding -Wall -Wredundant-decls -Wnested-externs \
-#   -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -fformat-extensions \
-#   -std=c99 -c ../my.c
-#  ld -d -warn-common -r -d -o my.kld my.o
-#  :> export_syms
-#  awk -f /usr/src/sys/modules/my/../../conf/kmod_syms.awk my.kld export_syms | xargs -J% objcopy % my.kld
-#  ld -Bsharable -d warn-commnon -o my.ko my.kld
-#
-# AMD64 FreeBSD (7.1):
-#  cc -O2 -fno-strict-aliasing -pipe -D_KERNEL -DKLD_MODULE -std=c99 -nostdinc -I. -I@ -I@/contrib/altq \
-#  -finline-limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000 -fno-common  \
-#  -fno-omit-frame-pointer -mcmodel=kernel -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx \
-#  -mno-3dnow -msoft-float -fno-asynchronous-unwind-tables -ffreestanding \
-#  -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign \
-#  -fformat-extensions -c /usr/src/sys/modules/my/../../dev/my/if_my.c
-#  ld  -d -warn-common -r -d -o if_my.ko if_my.o
-#  :> export_syms
-#  awk -f /usr/src/sys/modules/my/../../conf/kmod_syms.awk if_my.ko  export_syms | xargs -J% objcopy % if_my.ko
-
-# Note: @ -> /usr/src/sys  and  machine -> /usr/src/sys/i386/include
-
-## The location of the FreeBSD kernel source.
-VBOX_FREEBSD_SRC ?= /usr/src/sys
-## The FreeBSD /usr/include.
-VBOX_FREEBSD_SYS_INCS ?= /usr/include
-
-TEMPLATE_VBoxR0Drv_TOOL                = $(VBOX_GCC_TOOL)
-TEMPLATE_VBoxR0Drv_LDTOOL              = FreeBsdKModLd
-TEMPLATE_VBoxR0Drv_DEFS               += _KERNEL KLD_MODULE
+ # x86 FreeBSD (6.2 or something):
+ #  cc -O2 -fno-strict-aliasing -pipe -Werror -D_KERNEL -DKLD_MODULE \
+ #   -nostdinc -I- -I. -I@ -I@/contrib/altq -I@/../include -I/usr/include \
+ #   -finline-limit=8000 -fno-common -mno-align-long-strings -mpreferred-stack-boundary=2 \
+ #   -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -ffreestanding -Wall -Wredundant-decls -Wnested-externs \
+ #   -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -fformat-extensions \
+ #   -std=c99 -c ../my.c
+ #  ld -d -warn-common -r -d -o my.kld my.o
+ #  :> export_syms
+ #  awk -f /usr/src/sys/modules/my/../../conf/kmod_syms.awk my.kld export_syms | xargs -J% objcopy % my.kld
+ #  ld -Bsharable -d warn-commnon -o my.ko my.kld
+ #
+ # AMD64 FreeBSD (7.1):
+ #  cc -O2 -fno-strict-aliasing -pipe -D_KERNEL -DKLD_MODULE -std=c99 -nostdinc -I. -I@ -I@/contrib/altq \
+ #  -finline-limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000 -fno-common  \
+ #  -fno-omit-frame-pointer -mcmodel=kernel -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx \
+ #  -mno-3dnow -msoft-float -fno-asynchronous-unwind-tables -ffreestanding \
+ #  -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign \
+ #  -fformat-extensions -c /usr/src/sys/modules/my/../../dev/my/if_my.c
+ #  ld  -d -warn-common -r -d -o if_my.ko if_my.o
+ #  :> export_syms
+ #  awk -f /usr/src/sys/modules/my/../../conf/kmod_syms.awk if_my.ko  export_syms | xargs -J% objcopy % if_my.ko
+
+ # Note: @ -> /usr/src/sys  and  machine -> /usr/src/sys/i386/include
+
+ ## The location of the FreeBSD kernel source.
+ VBOX_FREEBSD_SRC ?= /usr/src/sys
+ ## The FreeBSD /usr/include.
+ VBOX_FREEBSD_SYS_INCS ?= /usr/include
+
+ TEMPLATE_VBoxR0Drv_TOOL               = $(VBOX_GCC_TOOL)
+ TEMPLATE_VBoxR0Drv_LDTOOL             = FreeBsdKModLd
+ TEMPLATE_VBoxR0Drv_DEFS              += _KERNEL KLD_MODULE
  if $(VBOX_GCC_VERSION_CC) < 30400
-TEMPLATE_VBoxR0Drv_DEFS               += RT_WITHOUT_PRAGMA_ONCE
- endif
-TEMPLATE_VBoxR0Drv_INCS                = \
-        $(VBOX_FREEBSD_SRC) \
-        $(VBOX_FREEBSD_SRC)/contrib/altq \
-        $(VBOX_FREEBSD_SRC)/contrib/ck/include \
-        $(VBOX_FREEBSD_SRC)/../include \
-        $(VBOX_FREEBSD_SYS_INCS)
-# omitting: -Wcast-qual, -Wredundant-decls
-TEMPLATE_VBoxR0Drv_CFLAGS              =  \
-        $(VBOX_GCC_WARN) -Wpointer-arith -Winline $(VBOX_GCC_Wno-pointer-sign) $(VBOX_GCC_fdiagnostics-show-option) \
-        -Wstrict-prototypes -Wmissing-prototypes -Wstrict-prototypes \
-        -Wimplicit-function-declaration -Werror-implicit-function-declaration \
-        -O2 -ffreestanding -fno-strict-aliasing -fno-common \
-        $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
-        -nostdinc -std=c99
-TEMPLATE_VBoxR0Drv_CFLAGS.x86          = -m32 -mno-align-long-strings -mno-mmx -mno-3dnow -mno-sse -mno-sse2
-TEMPLATE_VBoxR0Drv_CFLAGS.amd64        = -m64 -fno-omit-frame-pointer -mcmodel=kernel -mno-red-zone -mfpmath=387 \
-        -mno-sse -mno-sse2 -mno-mmx -mno-3dnow -msoft-float -fno-asynchronous-unwind-tables -Wundef
-TEMPLATE_VBoxR0Drv_CXXFLAGS            = -fno-exceptions -fno-rtti \
-        $(VBOX_GCC_WARN) -Wpointer-arith -Winline \
-        -O2 -fno-strict-aliasing -fno-common \
-        $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
-        -nostdinc
-TEMPLATE_VBoxR0Drv_CXXFLAGS.x86        = $(TEMPLATE_VBoxR0Drv_CFLAGS.x86)
-TEMPLATE_VBoxR0Drv_CXXFLAGS.amd64      = $(TEMPLATE_VBoxR0Drv_CFLAGS.amd64)
-TEMPLATE_VBoxR0Drv_SYSSUFF             = .ko
-TEMPLATE_VBoxR0Drv_LDFLAGS             = -d --warn-common
-TEMPLATE_VBoxR0Drv_LDFLAGS.x86         = -m elf_i386_fbsd
-TEMPLATE_VBoxR0Drv_LDFLAGS.amd64       = -m elf_x86_64_fbsd
-
-TOOL_FreeBsdKModLd = FreeBSD kernel module linker.
-# See kBuild/tools/GCC3.kmk for docs.
-TOOL_FreeBsdKModLd_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).map
-TOOL_FreeBsdKModLd_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
-TOOL_FreeBsdKModLd_LINK_SYSMOD_DEPORD =
+  TEMPLATE_VBoxR0Drv_DEFS             += RT_WITHOUT_PRAGMA_ONCE
+ endif
+ TEMPLATE_VBoxR0Drv_INCS               = \
+        $(VBOX_FREEBSD_SRC) \
+        $(VBOX_FREEBSD_SRC)/contrib/altq \
+        $(VBOX_FREEBSD_SRC)/contrib/ck/include \
+        $(VBOX_FREEBSD_SRC)/../include \
+        $(VBOX_FREEBSD_SYS_INCS)
+ # omitting: -Wcast-qual, -Wredundant-decls
+ TEMPLATE_VBoxR0Drv_CFLAGS             = \
+        $(VBOX_GCC_WARN) -Wpointer-arith -Winline $(VBOX_GCC_Wno-pointer-sign) $(VBOX_GCC_fdiagnostics-show-option) \
+        -Wstrict-prototypes -Wmissing-prototypes -Wstrict-prototypes \
+        -Wimplicit-function-declaration -Werror-implicit-function-declaration \
+        -O2 -ffreestanding -fno-strict-aliasing -fno-common \
+        $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
+        -nostdinc -std=c99
+ TEMPLATE_VBoxR0Drv_CFLAGS.x86         = -m32 -mno-align-long-strings -mno-mmx -mno-3dnow -mno-sse -mno-sse2
+ TEMPLATE_VBoxR0Drv_CFLAGS.amd64       = -m64 -fno-omit-frame-pointer -mcmodel=kernel -mno-red-zone -mfpmath=387 \
+        -mno-sse -mno-sse2 -mno-mmx -mno-3dnow -msoft-float -fno-asynchronous-unwind-tables -Wundef
+ TEMPLATE_VBoxR0Drv_CXXFLAGS           = -fno-exceptions -fno-rtti \
+        $(VBOX_GCC_WARN) -Wpointer-arith -Winline \
+        -O2 -fno-strict-aliasing -fno-common \
+        $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
+        -nostdinc
+ TEMPLATE_VBoxR0Drv_CXXFLAGS.x86       = $(TEMPLATE_VBoxR0Drv_CFLAGS.x86)
+ TEMPLATE_VBoxR0Drv_CXXFLAGS.amd64     = $(TEMPLATE_VBoxR0Drv_CFLAGS.amd64)
+ TEMPLATE_VBoxR0Drv_SYSSUFF            = .ko
+ TEMPLATE_VBoxR0Drv_LDFLAGS            = -d --warn-common
+ TEMPLATE_VBoxR0Drv_LDFLAGS.x86        = -m elf_i386_fbsd
+ TEMPLATE_VBoxR0Drv_LDFLAGS.amd64      = -m elf_x86_64_fbsd
+
+ TOOL_FreeBsdKModLd = FreeBSD kernel module linker.
+ # See kBuild/tools/GCC3.kmk for docs.
+ TOOL_FreeBsdKModLd_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).map
+ TOOL_FreeBsdKModLd_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
+ TOOL_FreeBsdKModLd_LINK_SYSMOD_DEPORD =
  ifeq ($(KBUILD_TARGET_ARCH),amd64)
-TOOL_FreeBsdKModLd_LINK_SYSMOD_OUTPUT =
-define TOOL_FreeBsdKModLd_LINK_SYSMOD_CMDS
-# Link intermediate .kld (a relocatable object).
+  TOOL_FreeBsdKModLd_LINK_SYSMOD_OUTPUT =
+  define TOOL_FreeBsdKModLd_LINK_SYSMOD_CMDS
+   # Link intermediate .kld (a relocatable object).
         ld $(flags) -r -o  $(out) $(objs) \
                 $(foreach p,$(libpath), -L$(p))\
                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))
-# Strip non-exported symbols private and localize the exported ones.
+   # Strip non-exported symbols private and localize the exported ones.
         awk -f $(VBOX_FREEBSD_SRC)/conf/kmod_syms.awk  $(out) $(if $(othersrc), $(othersrc),/dev/null) \
                 | xargs -J% objcopy % $(out)
 
-## Strip debug info (comment out if debugging or something).
+   ## Strip debug info (comment out if debugging or something).
         objcopy --strip-debug $(out)
-endef
+  endef
  else # x86
-TOOL_FreeBsdKModLd_LINK_SYSMOD_OUTPUT = $(outbase).kld
-define TOOL_FreeBsdKModLd_LINK_SYSMOD_CMDS
-# Link intermediate .kld (a relocatable object).
+  TOOL_FreeBsdKModLd_LINK_SYSMOD_OUTPUT = $(outbase).kld
+  define TOOL_FreeBsdKModLd_LINK_SYSMOD_CMDS
+   # Link intermediate .kld (a relocatable object).
         ld $(flags) -r -o $(outbase).kld $(objs) \
                 $(foreach p,$(libpath), -L$(p))\
                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))
-# Strip non-exported symbols private and localize the exported ones.
+   # Strip non-exported symbols private and localize the exported ones.
         awk -f $(VBOX_FREEBSD_SRC)/conf/kmod_syms.awk $(outbase).kld $(if $(othersrc), $(othersrc),/dev/null) \
                 | xargs -J% objcopy % $(outbase).kld
 
-# Link the final .ko (a shared object).
+   # Link the final .ko (a shared object).
         ld $(flags) -Bshareable -o $(out) $(outbase).kld
-endef
+  endef
  endif # x86
 
@@ -5912 +5912 @@
 ifeq ($(KBUILD_TARGET),netbsd)
 
-# The location of the NetBSD sources.
-VBOX_NETBSD_SRC ?= /usr/src
-
-# NetBSD uses "i386" for 32-bit, "x86" for common 32- and 64-bit code.
-ifeq ($(KBUILD_TARGET_ARCH),amd64)
-VBOX_NETBSD_TARGET_ARCH=amd64
-else
-VBOX_NETBSD_TARGET_ARCH=i386
-endif
-
-VBOX_NETBSD_TARGET_SRC=$(VBOX_NETBSD_SRC)/sys/arch/$(VBOX_NETBSD_TARGET_ARCH)
-
-TEMPLATE_VBoxR0Drv_TOOL                = $(VBOX_GCC_TOOL)
-TEMPLATE_VBoxR0Drv_DEFS               += _KERNEL _MODULE
+ # The location of the NetBSD sources.
+ VBOX_NETBSD_SRC ?= /usr/src
+
+ # NetBSD uses "i386" for 32-bit, "x86" for common 32- and 64-bit code.
+ ifeq ($(KBUILD_TARGET_ARCH),amd64)
+  VBOX_NETBSD_TARGET_ARCH = amd64
+ else
+  VBOX_NETBSD_TARGET_ARCH = i386
+ endif
+
+ VBOX_NETBSD_TARGET_SRC = $(VBOX_NETBSD_SRC)/sys/arch/$(VBOX_NETBSD_TARGET_ARCH)
+
+ TEMPLATE_VBoxR0Drv_TOOL               = $(VBOX_GCC_TOOL)
+ TEMPLATE_VBoxR0Drv_DEFS              += _KERNEL _MODULE
  if $(VBOX_GCC_VERSION_CC) < 30400
-TEMPLATE_VBoxR0Drv_DEFS               += RT_WITHOUT_PRAGMA_ONCE
- endif
-TEMPLATE_VBoxR0Drv_INCS                = \
-        $(VBOX_NETBSD_SRC)/sys \
-        $(VBOX_NETBSD_SRC)/common/include \
-        $(PATH_OBJ)/netbsd/include
-
-TEMPLATE_VBoxR0Drv_CFLAGS              =  \
-        $(VBOX_GCC_WARN) -Wpointer-arith -Winline $(VBOX_GCC_Wno-pointer-sign) \
-        $(VBOX_GCC_fdiagnostics-show-option) \
-        -Wstrict-prototypes -Wmissing-prototypes -Wstrict-prototypes \
-        -Wimplicit-function-declaration -Werror-implicit-function-declaration \
-        -O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \
-        $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
-        -nostdinc -std=c99 -msoft-float
-TEMPLATE_VBoxR0Drv_CFLAGS.x86          = -m32 -mno-mmx -mno-sse -mno-avx \
-    -mno-fp-ret-in-387
-TEMPLATE_VBoxR0Drv_CFLAGS.amd64        = -m64 --param inline-unit-growth=100 \
-    --param large-function-growth=1000 -fno-omit-frame-pointer \
-    -mcmodel=kernel -mno-red-zone -mno-sse -mno-mmx -mno-avx \
-        -fno-asynchronous-unwind-tables -mno-fp-ret-in-387
-TEMPLATE_VBoxR0Drv_CXXFLAGS            = -fno-exceptions -fno-rtti \
-        $(VBOX_GCC_WARN) -Wpointer-arith -Winline \
-        -O2 -fno-strict-aliasing -fno-common -finline-limit=8000 \
-        $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
-        -nostdinc -msoft-float
-TEMPLATE_VBoxR0Drv_CXXFLAGS.x86        = $(TEMPLATE_VBoxR0Drv_CFLAGS.x86)
-TEMPLATE_VBoxR0Drv_CXXFLAGS.amd64      = $(TEMPLATE_VBoxR0Drv_CFLAGS.amd64)
-TEMPLATE_VBoxR0Drv_SYSSUFF             = .kmod
-TEMPLATE_VBoxR0Drv_LDFLAGS             = -d --warn-common
-TEMPLATE_VBoxR0Drv_LDFLAGS.x86         = -m elf_i386
-TEMPLATE_VBoxR0Drv_LDFLAGS.amd64       = -m elf_x86_64
-
-# symlink kernel includes
-TEMPLATE_VBoxR0Drv_ORDERDEPS += \
-        $(PATH_OBJ)/netbsd/include/$(VBOX_NETBSD_TARGET_ARCH) \
-        $(PATH_OBJ)/netbsd/include/x86 \
-        $(PATH_OBJ)/netbsd/include/machine
-
-$$(PATH_OBJ)/netbsd/include/$(VBOX_NETBSD_TARGET_ARCH):
+  TEMPLATE_VBoxR0Drv_DEFS             += RT_WITHOUT_PRAGMA_ONCE
+ endif
+ TEMPLATE_VBoxR0Drv_INCS               = \
+        $(VBOX_NETBSD_SRC)/sys \
+        $(VBOX_NETBSD_SRC)/common/include \
+        $(PATH_OBJ)/netbsd/include
+
+ TEMPLATE_VBoxR0Drv_CFLAGS             = \
+        $(VBOX_GCC_WARN) -Wpointer-arith -Winline $(VBOX_GCC_Wno-pointer-sign) \
+        $(VBOX_GCC_fdiagnostics-show-option) \
+        -Wstrict-prototypes -Wmissing-prototypes -Wstrict-prototypes \
+        -Wimplicit-function-declaration -Werror-implicit-function-declaration \
+        -O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \
+        $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
+        -nostdinc -std=c99 -msoft-float
+ TEMPLATE_VBoxR0Drv_CFLAGS.x86         = -m32 -mno-mmx -mno-sse -mno-avx \
+        -mno-fp-ret-in-387
+ TEMPLATE_VBoxR0Drv_CFLAGS.amd64       = -m64 --param inline-unit-growth=100 \
+        --param large-function-growth=1000 -fno-omit-frame-pointer \
+        -mcmodel=kernel -mno-red-zone -mno-sse -mno-mmx -mno-avx \
+        -fno-asynchronous-unwind-tables -mno-fp-ret-in-387
+ TEMPLATE_VBoxR0Drv_CXXFLAGS           = -fno-exceptions -fno-rtti \
+        $(VBOX_GCC_WARN) -Wpointer-arith -Winline \
+        -O2 -fno-strict-aliasing -fno-common -finline-limit=8000 \
+        $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
+        -nostdinc -msoft-float
+ TEMPLATE_VBoxR0Drv_CXXFLAGS.x86       = $(TEMPLATE_VBoxR0Drv_CFLAGS.x86)
+ TEMPLATE_VBoxR0Drv_CXXFLAGS.amd64     = $(TEMPLATE_VBoxR0Drv_CFLAGS.amd64)
+ TEMPLATE_VBoxR0Drv_SYSSUFF            = .kmod
+ TEMPLATE_VBoxR0Drv_LDFLAGS            = -d --warn-common
+ TEMPLATE_VBoxR0Drv_LDFLAGS.x86        = -m elf_i386
+ TEMPLATE_VBoxR0Drv_LDFLAGS.amd64      = -m elf_x86_64
+
+ # symlink kernel includes
+ TEMPLATE_VBoxR0Drv_ORDERDEPS += \
+        $(PATH_OBJ)/netbsd/include/$(VBOX_NETBSD_TARGET_ARCH) \
+        $(PATH_OBJ)/netbsd/include/x86 \
+        $(PATH_OBJ)/netbsd/include/machine
+
+ $$(PATH_OBJ)/netbsd/include/$(VBOX_NETBSD_TARGET_ARCH):
         $(QUIET)$(MKDIR) -p $(@D)
         $(QUIET)$(LN_SYMLINK) $(VBOX_NETBSD_TARGET_SRC)/include $@
 
-$$(PATH_OBJ)/netbsd/include/x86:
+ $$(PATH_OBJ)/netbsd/include/x86:
         $(QUIET)$(MKDIR) -p $(@D)
         $(QUIET)$(LN_SYMLINK) $(VBOX_NETBSD_SRC)/sys/arch/x86/include $@
 
-$$(PATH_OBJ)/netbsd/include/machine:
+ $$(PATH_OBJ)/netbsd/include/machine:
         $(QUIET)$(MKDIR) -p $(@D)
         $(QUIET)$(LN_SYMLINK) $(VBOX_NETBSD_TARGET_ARCH) $@
@@ -5981 +5981 @@
 
 ifeq ($(KBUILD_TARGET),haiku)
-## The Haiku include directories
-VBOX_HAIKU_SYS_INCS ?= /boot/develop/headers/os/kernel /boot/develop/headers/os/drivers
-
-TEMPLATE_VBoxR0Drv_TOOL                = $(VBOX_GCC_TOOL)
-TEMPLATE_VBoxR0Drv_LDTOOL              = $(VBOX_GCC_TOOL)
-TEMPLATE_VBoxR0Drv_DEFS                = _KERNEL_MODE=1 _STRICT_STDC IN_RING0 IN_RT_R0
+ ## The Haiku include directories
+ VBOX_HAIKU_SYS_INCS ?= /boot/develop/headers/os/kernel /boot/develop/headers/os/drivers
+
+ TEMPLATE_VBoxR0Drv_TOOL               = $(VBOX_GCC_TOOL)
+ TEMPLATE_VBoxR0Drv_LDTOOL             = $(VBOX_GCC_TOOL)
+ TEMPLATE_VBoxR0Drv_DEFS               = _KERNEL_MODE=1 _STRICT_STDC IN_RING0 IN_RT_R0
  if $(VBOX_GCC_VERSION_CC) < 30400
-TEMPLATE_VBoxR0Drv_DEFS               += RT_WITHOUT_PRAGMA_ONCE
- endif
-TEMPLATE_VBoxR0Drv_INCS                = $(VBOX_HAIKU_SYS_INCS)
-#TODO: sort this out
-TEMPLATE_VBoxR0Drv_LDFLAGS             = -shared $(VBOX_GCC_NO_UNDEFINED_R0) -dc -dy -lroot -rpath-link /boot/system/develop/lib/x86 --no-add-needed /boot/system/develop/lib/_KERNEL_ --no-add-needed /boot/system/develop/lib/haiku_version_glue.o
-TEMPLATE_VBoxR0Drv_CFLAGS              = -fno-PIC \
-        $(VBOX_GCC_WARN) -Wstrict-prototypes $(VBOX_GCC_Wno-pointer-sign) -Wno-sign-compare \
-        $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration
-TEMPLATE_VBoxR0Drv_CFLAGS.x86          = -mno-sse -mno-mmx -mno-sse2 -mno-3dnow
-TEMPLATE_VBoxR0Drv_CFLAGS.x86          = -m32 -mno-sse -mno-mmx -mno-sse2 -mno-3dnow
-TEMPLATE_VBoxR0Drv_CFLAGS.amd64        = -m64 -mno-sse -mno-mmx -mno-sse2 -mno-3dnow \
-        -fno-reorder-blocks -ffreestanding -fno-asynchronous-unwind-tables -funit-at-a-time \
-        -Wno-sign-compare
-TEMPLATE_VBoxR0Drv_CXXFLAGS           = -fno-PIC -Wpointer-arith \
-        -Wshadow -Wuninitialized -Wunused-function -Wunused-label -Wunused-value -Wunused-variable \
-        -Wformat \
-        -O2 -nodefaultlibs -fno-omit-frame-pointer -fno-strict-aliasing -fno-common -fno-exceptions -fno-rtti
-TEMPLATE_VBoxR0Drv_CXXFLAGS.x86       = $(TEMPLATE_VBoxR0Drv_CFLAGS.x86) -fno-exceptions -fno-rtti
-TEMPLATE_VBoxR0Drv_CXXFLAGS.amd64     = $(TEMPLATE_VBoxR0Drv_CFLAGS.amd64) -fno-exceptions -fno-rtti
+  TEMPLATE_VBoxR0Drv_DEFS             += RT_WITHOUT_PRAGMA_ONCE
+ endif
+ TEMPLATE_VBoxR0Drv_INCS               = $(VBOX_HAIKU_SYS_INCS)
+ #TODO: sort this out
+ TEMPLATE_VBoxR0Drv_LDFLAGS            = -shared $(VBOX_GCC_NO_UNDEFINED_R0) -dc -dy -lroot -rpath-link /boot/system/develop/lib/x86 --no-add-needed /boot/system/develop/lib/_KERNEL_ --no-add-needed /boot/system/develop/lib/haiku_version_glue.o
+ TEMPLATE_VBoxR0Drv_CFLAGS             = -fno-PIC \
+        $(VBOX_GCC_WARN) -Wstrict-prototypes $(VBOX_GCC_Wno-pointer-sign) -Wno-sign-compare \
+        $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration
+ TEMPLATE_VBoxR0Drv_CFLAGS.x86         = -mno-sse -mno-mmx -mno-sse2 -mno-3dnow
+ TEMPLATE_VBoxR0Drv_CFLAGS.x86         = -m32 -mno-sse -mno-mmx -mno-sse2 -mno-3dnow
+ TEMPLATE_VBoxR0Drv_CFLAGS.amd64       = -m64 -mno-sse -mno-mmx -mno-sse2 -mno-3dnow \
+        -fno-reorder-blocks -ffreestanding -fno-asynchronous-unwind-tables -funit-at-a-time \
+        -Wno-sign-compare
+ TEMPLATE_VBoxR0Drv_CXXFLAGS          = -fno-PIC -Wpointer-arith \
+        -Wshadow -Wuninitialized -Wunused-function -Wunused-label -Wunused-value -Wunused-variable \
+        -Wformat \
+        -O2 -nodefaultlibs -fno-omit-frame-pointer -fno-strict-aliasing -fno-common -fno-exceptions -fno-rtti
+ TEMPLATE_VBoxR0Drv_CXXFLAGS.x86      = $(TEMPLATE_VBoxR0Drv_CFLAGS.x86) -fno-exceptions -fno-rtti
+ TEMPLATE_VBoxR0Drv_CXXFLAGS.amd64    = $(TEMPLATE_VBoxR0Drv_CFLAGS.amd64) -fno-exceptions -fno-rtti
 endif # Haiku
 
@@ -6024 +6024 @@
 
 ifeq ($(KBUILD_TARGET),darwin)
-#
-# A variant of VBoxR0Drv that uses the 10.10 SDK.
-#
-TEMPLATE_VBoxR0DrvOSX10.10 = VBoxR0Drv variant using the 10.10 SDK
-TEMPLATE_VBoxR0DrvOSX10.10_EXTENDS  = VBoxR0Drv
-TEMPLATE_VBoxR0DrvOSX10.10_SDKS     = MACOSX1010
-TEMPLATE_VBoxR0DrvOSX10.10_INCS     = $(filter-out $(VBOX_PATH_MACOSX_SDK)/%,$(TEMPLATE_VBoxR0Drv_INCS)) \
-        $(PATH_SDK_MACOSX1010)/System/Library/Frameworks/Kernel.framework/PrivateHeaders \
-        $(PATH_SDK_MACOSX1010)/System/Library/Frameworks/Kernel.framework/Headers
-TEMPLATE_VBoxR0DrvOSX10.10_DEFS     = $(filter-out $(VBOX_DARWIN_DEF_SDK_DEFS),$(TEMPLATE_VBoxR0Drv_DEFS))
+ #
+ # A variant of VBoxR0Drv that uses the 10.10 SDK.
+ #
+ TEMPLATE_VBoxR0DrvOSX10.10 = VBoxR0Drv variant using the 10.10 SDK
+ TEMPLATE_VBoxR0DrvOSX10.10_EXTENDS = VBoxR0Drv
+ TEMPLATE_VBoxR0DrvOSX10.10_SDKS    = MACOSX1010
+ TEMPLATE_VBoxR0DrvOSX10.10_INCS    = $(filter-out $(VBOX_PATH_MACOSX_SDK)/%,$(TEMPLATE_VBoxR0Drv_INCS)) \
+        $(PATH_SDK_MACOSX1010)/System/Library/Frameworks/Kernel.framework/PrivateHeaders \
+        $(PATH_SDK_MACOSX1010)/System/Library/Frameworks/Kernel.framework/Headers
+ TEMPLATE_VBoxR0DrvOSX10.10_DEFS    = $(filter-out $(VBOX_DARWIN_DEF_SDK_DEFS),$(TEMPLATE_VBoxR0Drv_DEFS))
 
 endif
@@ -6085 +6085 @@
  TEMPLATE_VBoxR3Exe_DEFS              += VBOX_WITH_DTRACE VBOX_WITH_DTRACE_R3 VBOX_WITH_NATIVE_DTRACE
 else
-  TEMPLATE_VBoxR3Exe_DTRACE_HDR_FLAGS  = --ring-3-context
-  TEMPLATE_VBoxR3Exe_DTRACE_OBJ_FLAGS  = --ring-3-context --pic --probe-fn-imported --probe-fn-name "SUPTracerFireProbe"
+ TEMPLATE_VBoxR3Exe_DTRACE_HDR_FLAGS   = --ring-3-context
+ TEMPLATE_VBoxR3Exe_DTRACE_OBJ_FLAGS   = --ring-3-context --pic --probe-fn-imported --probe-fn-name "SUPTracerFireProbe"
  if defined(VBOX_WITH_DTRACE_R3)
   TEMPLATE_VBoxR3Exe_DTRACETOOL        = VBoxTpG
@@ -6096 +6096 @@
 TEMPLATE_VBoxR3Exe_LIBS.kprofile       = $(LIB_KPROFILE)
 ifeq ($(KBUILD_TARGET),win)
-# TEMPLATE_VBoxR3Exe_TOOL               = $(VBOX_VCC_TOOL)
+ # TEMPLATE_VBoxR3Exe_TOOL               = $(VBOX_VCC_TOOL)
  TEMPLATE_VBoxR3Exe_TOOL.win.x86       = $(VBOX_VCC_TOOL_STEM)X86
  TEMPLATE_VBoxR3Exe_TOOL.win.amd64     = $(VBOX_VCC_TOOL_STEM)AMD64
@@ -6128 +6128 @@
  TEMPLATE_VBoxR3Exe_PCHFLAGS.kprofile  = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.kprofile)
  TEMPLATE_VBoxR3Exe_LDFLAGS            = -Ignore:4197 \
-        /NOD /INCREMENTAL:NO /MAPINFO:EXPORTS /LargeAddressAware /DynamicBase /NxCompat /Release /Debug /Opt:Ref /Opt:Icf \
-        $(VBOX_VCC_LD_GUARD_CF) $(VBOX_VCC_SANITIZER_LDFLAGS) \
-        /Version:$(VBOX_VERSION_MAJOR)0$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
-        /STUB:$(PATH_ROOT)/src/VBox/HostDrivers/Support/win/winstub.com \
-        /DISALLOWLIB:libc.lib \
-        /DISALLOWLIB:libcd.lib \
-        /DISALLOWLIB:libcmt.lib \
-        /DISALLOWLIB:libcmtd.lib \
-        /DISALLOWLIB:msvcrt$(VBOX_VCC_CRT_TYPE_N).lib \
-        /DISALLOWLIB:msvcprt$(VBOX_VCC_CRT_TYPE_N).lib
+        /NOD /INCREMENTAL:NO /MAPINFO:EXPORTS /LargeAddressAware /DynamicBase /NxCompat /Release /Debug /Opt:Ref /Opt:Icf \
+        $(VBOX_VCC_LD_GUARD_CF) $(VBOX_VCC_SANITIZER_LDFLAGS) \
+        /Version:$(VBOX_VERSION_MAJOR)0$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
+        /STUB:$(PATH_ROOT)/src/VBox/HostDrivers/Support/win/winstub.com \
+        /DISALLOWLIB:libc.lib \
+        /DISALLOWLIB:libcd.lib \
+        /DISALLOWLIB:libcmt.lib \
+        /DISALLOWLIB:libcmtd.lib \
+        /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
  if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_HARDENING)
-   TEMPLATE_VBoxR3Exe_LDFLAGS         += -IntegrityCheck
+  TEMPLATE_VBoxR3Exe_LDFLAGS          += -IntegrityCheck
  endif
  TEMPLATE_VBoxR3Exe_LDFLAGS.win.amd64  = $(VBOX_VCC_LD_HIGH_ENTRYOPY_VA)
@@ -6186 +6186 @@
   TEMPLATE_VBoxR3Exe_LDFLAGS.win.x86   = \
         -Include:_vcc100_kernel32_fakes_cpp \
-        -Include:_vcc100_kernel32_fakes_asm
+        -Include:_vcc100_kernel32_fakes_asm
   TEMPLATE_VBoxR3Exe_LIBS.win.x86      = \
         $(PATH_STAGE_LIB)/RuntimeR3VccTricks2$(VBOX_SUFF_LIB)
@@ -6196 +6196 @@
 
 else # the gcc guys
-TEMPLATE_VBoxR3Exe_TOOL                = $(VBOX_GCC_TOOL)
+ TEMPLATE_VBoxR3Exe_TOOL               = $(VBOX_GCC_TOOL)
  if $(VBOX_GCC_VERSION_CC) < 30400
-TEMPLATE_VBoxR3Exe_DEFS               += RT_WITHOUT_PRAGMA_ONCE
- endif
-TEMPLATE_VBoxR3Exe_CXXFLAGS            = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_OPT) \
+  TEMPLATE_VBoxR3Exe_DEFS             += RT_WITHOUT_PRAGMA_ONCE
+ endif
+ TEMPLATE_VBoxR3Exe_CXXFLAGS           = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_OPT) \
         $(VBOX_GCC_FP) -fno-strict-aliasing $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_std) $(VBOX_GCC_fvisibility-inlines-hidden) \
         $(VBOX_GCC_IPRT_FMT_CHECK) $(VBOX_GCC_SANITIZER_FLAGS)
@@ -6206 +6206 @@
   TEMPLATE_VBoxR3Exe_CXXFLAGS         += $(VBOX_GCC_WERR)
  endif
-TEMPLATE_VBoxR3Exe_CXXFLAGS.x86        = -m32
-TEMPLATE_VBoxR3Exe_CXXFLAGS.amd64      = -m64
-TEMPLATE_VBoxR3Exe_CXXFLAGS.sparc32    = -m32
-TEMPLATE_VBoxR3Exe_CXXFLAGS.sparc64    = -m64
-TEMPLATE_VBoxR3Exe_CXXFLAGS.kprofile   = -finstrument-functions
-TEMPLATE_VBoxR3Exe_CFLAGS              = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_OPT) \
+ TEMPLATE_VBoxR3Exe_CXXFLAGS.x86       = -m32
+ TEMPLATE_VBoxR3Exe_CXXFLAGS.amd64     = -m64
+ TEMPLATE_VBoxR3Exe_CXXFLAGS.sparc32   = -m32
+ TEMPLATE_VBoxR3Exe_CXXFLAGS.sparc64   = -m64
+ TEMPLATE_VBoxR3Exe_CXXFLAGS.kprofile  = -finstrument-functions
+ TEMPLATE_VBoxR3Exe_CFLAGS             = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_OPT) \
         $(VBOX_GCC_FP) -fno-strict-aliasing $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_IPRT_FMT_CHECK)
  ifdef VBOX_WITH_NO_GCC_WARNING_POLICY
   TEMPLATE_VBoxR3Exe_CFLAGS           += $(VBOX_GCC_WERR)
  endif
-TEMPLATE_VBoxR3Exe_CFLAGS.x86          = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.x86)
-TEMPLATE_VBoxR3Exe_CFLAGS.amd64        = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.amd64)
-TEMPLATE_VBoxR3Exe_CFLAGS.sparc32      = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.sparc32)
-TEMPLATE_VBoxR3Exe_CFLAGS.sparc64      = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.sparc64)
-TEMPLATE_VBoxR3Exe_CFLAGS.debug        = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.debug)
-TEMPLATE_VBoxR3Exe_CFLAGS.kprofile     = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.kprofile)
-TEMPLATE_VBoxR3Exe_OBJCFLAGS           = $(TEMPLATE_VBoxR3Exe_CFLAGS)
-TEMPLATE_VBoxR3Exe_OBJCFLAGS.x86       = $(TEMPLATE_VBoxR3Exe_CFLAGS.x86)
-TEMPLATE_VBoxR3Exe_OBJCFLAGS.amd64     = $(TEMPLATE_VBoxR3Exe_CFLAGS.amd64)
-TEMPLATE_VBoxR3Exe_OBJCFLAGS.debug     = $(TEMPLATE_VBoxR3Exe_CFLAGS.debug)
-TEMPLATE_VBoxR3Exe_OBJCFLAGS.kprofile  = $(TEMPLATE_VBoxR3Exe_CFLAGS.kprofile)
-TEMPLATE_VBoxR3Exe_OBJCXXFLAGS         = $(TEMPLATE_VBoxR3Exe_CXXFLAGS)
-TEMPLATE_VBoxR3Exe_OBJCXXFLAGS.x86     = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.x86)
-TEMPLATE_VBoxR3Exe_OBJCXXFLAGS.amd64   = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.amd64)
-TEMPLATE_VBoxR3Exe_OBJCXXFLAGS.debug   = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.debug)
-TEMPLATE_VBoxR3Exe_OBJCXXFLAGS.kprofile= $(TEMPLATE_VBoxR3Exe_CXXFLAGS.kprofile)
-TEMPLATE_VBoxR3Exe_PCHFLAGS            = $(TEMPLATE_VBoxR3Exe_CXXFLAGS)
-TEMPLATE_VBoxR3Exe_PCHFLAGS.x86        = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.x86)
-TEMPLATE_VBoxR3Exe_PCHFLAGS.amd64      = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.amd64)
-TEMPLATE_VBoxR3Exe_PCHFLAGS.debug      = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.debug)
-TEMPLATE_VBoxR3Exe_PCHFLAGS.kprofile   = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.kprofile)
-TEMPLATE_VBoxR3Exe_LDFLAGS             = $(VBOX_GCC_SANITIZER_FLAGS) $(VBOX_GCC_SANITIZER_LDFLAGS)
-TEMPLATE_VBoxR3Exe_LDFLAGS.x86         = -m32
-TEMPLATE_VBoxR3Exe_LDFLAGS.amd64       = -m64
-TEMPLATE_VBoxR3Exe_LDFLAGS.sparc32     = -m32
-TEMPLATE_VBoxR3Exe_LDFLAGS.sparc64     = -m64
-TEMPLATE_VBoxR3Exe_LDFLAGS.linux       = -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)
-TEMPLATE_VBoxR3Exe_LDFLAGS.solaris     = -Wl,-z,ignore # same as VBOX_LD_as_needed
+ TEMPLATE_VBoxR3Exe_CFLAGS.x86         = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.x86)
+ TEMPLATE_VBoxR3Exe_CFLAGS.amd64       = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.amd64)
+ TEMPLATE_VBoxR3Exe_CFLAGS.sparc32     = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.sparc32)
+ TEMPLATE_VBoxR3Exe_CFLAGS.sparc64     = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.sparc64)
+ TEMPLATE_VBoxR3Exe_CFLAGS.debug       = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.debug)
+ TEMPLATE_VBoxR3Exe_CFLAGS.kprofile    = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.kprofile)
+ TEMPLATE_VBoxR3Exe_OBJCFLAGS          = $(TEMPLATE_VBoxR3Exe_CFLAGS)
+ TEMPLATE_VBoxR3Exe_OBJCFLAGS.x86      = $(TEMPLATE_VBoxR3Exe_CFLAGS.x86)
+ TEMPLATE_VBoxR3Exe_OBJCFLAGS.amd64    = $(TEMPLATE_VBoxR3Exe_CFLAGS.amd64)
+ TEMPLATE_VBoxR3Exe_OBJCFLAGS.debug    = $(TEMPLATE_VBoxR3Exe_CFLAGS.debug)
+ TEMPLATE_VBoxR3Exe_OBJCFLAGS.kprofile = $(TEMPLATE_VBoxR3Exe_CFLAGS.kprofile)
+ TEMPLATE_VBoxR3Exe_OBJCXXFLAGS        = $(TEMPLATE_VBoxR3Exe_CXXFLAGS)
+ TEMPLATE_VBoxR3Exe_OBJCXXFLAGS.x86    = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.x86)
+ TEMPLATE_VBoxR3Exe_OBJCXXFLAGS.amd64  = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.amd64)
+ TEMPLATE_VBoxR3Exe_OBJCXXFLAGS.debug  = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.debug)
+ TEMPLATE_VBoxR3Exe_OBJCXXFLAGS.kprofile = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.kprofile)
+ TEMPLATE_VBoxR3Exe_PCHFLAGS           = $(TEMPLATE_VBoxR3Exe_CXXFLAGS)
+ TEMPLATE_VBoxR3Exe_PCHFLAGS.x86       = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.x86)
+ TEMPLATE_VBoxR3Exe_PCHFLAGS.amd64     = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.amd64)
+ TEMPLATE_VBoxR3Exe_PCHFLAGS.debug     = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.debug)
+ TEMPLATE_VBoxR3Exe_PCHFLAGS.kprofile  = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.kprofile)
+ TEMPLATE_VBoxR3Exe_LDFLAGS            = $(VBOX_GCC_SANITIZER_FLAGS) $(VBOX_GCC_SANITIZER_LDFLAGS)
+ TEMPLATE_VBoxR3Exe_LDFLAGS.x86        = -m32
+ TEMPLATE_VBoxR3Exe_LDFLAGS.amd64      = -m64
+ TEMPLATE_VBoxR3Exe_LDFLAGS.sparc32    = -m32
+ TEMPLATE_VBoxR3Exe_LDFLAGS.sparc64    = -m64
+ TEMPLATE_VBoxR3Exe_LDFLAGS.linux      = -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)
+ TEMPLATE_VBoxR3Exe_LDFLAGS.solaris    = -Wl,-z,ignore # same as VBOX_LD_as_needed
 
  ifeq ($(KBUILD_TARGET),linux)
-TEMPLATE_VBoxR3Exe_LIBS                = pthread m rt dl
+  TEMPLATE_VBoxR3Exe_LIBS              = pthread m rt dl
  else ifeq ($(KBUILD_TARGET),os2)
-TEMPLATE_VBoxR3Exe_TOOL                = GXX3OMF
-TEMPLATE_VBoxR3Exe_LIBS                = socket iconv
+  TEMPLATE_VBoxR3Exe_TOOL              = GXX3OMF
+  TEMPLATE_VBoxR3Exe_LIBS              = socket iconv
  else ifeq ($(KBUILD_TARGET),darwin)
-TEMPLATE_VBoxR3Exe_TOOL                = $(VBOX_GCC_TOOL)
-TEMPLATE_VBoxR3Exe_LIBS                =
-TEMPLATE_VBoxR3Exe_DEFS               += LIBICONV_PLUG # Avoid 3rd party libiconv (from macports).
-TEMPLATE_VBoxR3Exe_SDKS.darwin         = $(VBOX_DARWIN_DEF_SDK_SDKS)
-TEMPLATE_VBoxR3Exe_DEFS.darwin         = $(VBOX_DARWIN_DEF_SDK_DEFS)
-TEMPLATE_VBoxR3Exe_CFLAGS.darwin       = $(VBOX_DARWIN_DEF_SDK_CFLAGS) -fno-common
-TEMPLATE_VBoxR3Exe_CXXFLAGS.darwin     = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS)
-TEMPLATE_VBoxR3Exe_PCHFLAGS.darwin     = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS)
-TEMPLATE_VBoxR3Exe_OBJCFLAGS.darwin    = $(VBOX_DARWIN_DEF_SDK_OBJCFLAGS)
-TEMPLATE_VBoxR3Exe_OBJCXXFLAGS.darwin  = $(VBOX_DARWIN_DEF_SDK_OBJCXXFLAGS)
-TEMPLATE_VBoxR3Exe_LDFLAGS.darwin      = $(VBOX_DARWIN_DEF_SDK_LDFLAGS) -Wl,-headerpad_max_install_names
-TEMPLATE_VBoxR3Exe_LDFLAGS.darwin.x86  = -read_only_relocs suppress
-TEMPLATE_VBoxR3Exe_POST_CMDS.darwin    = $(VBOX_SIGN_IMAGE_CMDS)
+  TEMPLATE_VBoxR3Exe_TOOL              = $(VBOX_GCC_TOOL)
+  TEMPLATE_VBoxR3Exe_LIBS              =
+  TEMPLATE_VBoxR3Exe_DEFS             += LIBICONV_PLUG # Avoid 3rd party libiconv (from macports).
+  TEMPLATE_VBoxR3Exe_SDKS.darwin       = $(VBOX_DARWIN_DEF_SDK_SDKS)
+  TEMPLATE_VBoxR3Exe_DEFS.darwin       = $(VBOX_DARWIN_DEF_SDK_DEFS)
+  TEMPLATE_VBoxR3Exe_CFLAGS.darwin     = $(VBOX_DARWIN_DEF_SDK_CFLAGS) -fno-common
+  TEMPLATE_VBoxR3Exe_CXXFLAGS.darwin   = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS)
+  TEMPLATE_VBoxR3Exe_PCHFLAGS.darwin   = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS)
+  TEMPLATE_VBoxR3Exe_OBJCFLAGS.darwin  = $(VBOX_DARWIN_DEF_SDK_OBJCFLAGS)
+  TEMPLATE_VBoxR3Exe_OBJCXXFLAGS.darwin = $(VBOX_DARWIN_DEF_SDK_OBJCXXFLAGS)
+  TEMPLATE_VBoxR3Exe_LDFLAGS.darwin    = $(VBOX_DARWIN_DEF_SDK_LDFLAGS) -Wl,-headerpad_max_install_names
+  TEMPLATE_VBoxR3Exe_LDFLAGS.darwin.x86 = -read_only_relocs suppress
+  TEMPLATE_VBoxR3Exe_POST_CMDS.darwin  = $(VBOX_SIGN_IMAGE_CMDS)
   ifdef VBOX_WITH_DTRACE_R3
    TEMPLATE_VBoxR3Exe_CXXFLAGS := $(filter-out -pedantic,$(TEMPLATE_VBoxR3Exe_CXXFLAGS)) -fdollars-in-identifiers # annoying gcc option precedence.
   endif
  else ifeq ($(KBUILD_TARGET),haiku)
-TEMPLATE_VBoxR3Exe_TOOL                = GXX3
-TEMPLATE_VBoxR3Exe_POST_CMDS          = $(VBOX_HAIKU_XRES_SETVER_CMDS)
-TEMPLATE_VBoxR3Exe_LIBS                = network iconv stdc++ supc++
-TEMPLATE_VBoxR3Exe_LIBPATH            += \
-        /boot/common/lib
-# Haiku uses PIC by default...
-TEMPLATE_VBoxR3Exe_CFLAGS             += -fno-pic
-TEMPLATE_VBoxR3Exe_CXXFLAGS           += -fno-pic
-TEMPLATE_VBoxR3Exe_LDFLAGS            += -fno-pic
+  TEMPLATE_VBoxR3Exe_TOOL              = GXX3
+  TEMPLATE_VBoxR3Exe_POST_CMDS        = $(VBOX_HAIKU_XRES_SETVER_CMDS)
+  TEMPLATE_VBoxR3Exe_LIBS              = network iconv stdc++ supc++
+  TEMPLATE_VBoxR3Exe_LIBPATH          += \
+        /boot/common/lib
+  # Haiku uses PIC by default...
+  TEMPLATE_VBoxR3Exe_CFLAGS           += -fno-pic
+  TEMPLATE_VBoxR3Exe_CXXFLAGS         += -fno-pic
+  TEMPLATE_VBoxR3Exe_LDFLAGS          += -fno-pic
  else if1of ($(KBUILD_TARGET), freebsd openbsd)
-TEMPLATE_VBoxR3Exe_TOOL                = GXX3
-TEMPLATE_VBoxR3Exe_LIBS                = pthread
-TEMPLATE_VBoxR3Exe_INCS               += \
-        /usr/include \
-        /usr/X11R6/include \
-        /usr/local/include
-TEMPLATE_VBoxR3Exe_LIBPATH            += \
-        /usr/lib \
-        /usr/X11R6/lib \
-        /usr/local/lib
+  TEMPLATE_VBoxR3Exe_TOOL              = GXX3
+  TEMPLATE_VBoxR3Exe_LIBS              = pthread
+  TEMPLATE_VBoxR3Exe_INCS             += \
+        /usr/include \
+        /usr/X11R6/include \
+        /usr/local/include
+  TEMPLATE_VBoxR3Exe_LIBPATH          += \
+        /usr/lib \
+        /usr/X11R6/lib \
+        /usr/local/lib
  else ifeq ($(KBUILD_TARGET),netbsd)
-TEMPLATE_VBoxR3Exe_TOOL                = GXX3
-TEMPLATE_VBoxR3Exe_LIBS                = pthread
-TEMPLATE_VBoxR3Exe_INCS               += \
-        /usr/include \
-        /usr/X11R7/include
-TEMPLATE_VBoxR3Exe_LIBPATH            += \
-        /usr/lib \
-        /usr/X11R7/lib
+  TEMPLATE_VBoxR3Exe_TOOL              = GXX3
+  TEMPLATE_VBoxR3Exe_LIBS              = pthread
+  TEMPLATE_VBoxR3Exe_INCS             += \
+        /usr/include \
+        /usr/X11R7/include
+  TEMPLATE_VBoxR3Exe_LIBPATH          += \
+        /usr/lib \
+        /usr/X11R7/lib
  else ifeq ($(KBUILD_TARGET),solaris)
-TEMPLATE_VBoxR3Exe_TOOL                = GXX3PLAIN
-TEMPLATE_VBoxR3Exe_DEFS               += LIBICONV_PLUG _REENTRANT # Avoid the GNU libiconv, for now at least.
+  TEMPLATE_VBoxR3Exe_TOOL              = GXX3PLAIN
+  TEMPLATE_VBoxR3Exe_DEFS             += LIBICONV_PLUG _REENTRANT # Avoid the GNU libiconv, for now at least.
   if $(VBOX_GCC_VERSION_CC) < 30500
-TEMPLATE_VBoxR3Exe_CFLAGS             += -std=gnu99
-  endif
-TEMPLATE_VBoxR3Exe_LIBS                = rt socket
+   TEMPLATE_VBoxR3Exe_CFLAGS          += -std=gnu99
+  endif
+  TEMPLATE_VBoxR3Exe_LIBS              = rt socket
  else
-$(warning Warning: VBOX Build: Target $(KBUILD_TARGET) is not officially supported!)
-TEMPLATE_VBoxR3Exe_CXXFLAGS.profile    = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.release)
-TEMPLATE_VBoxR3Exe_CXXFLAGS.kprofile   = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.krelease)
+  $(warning Warning: VBOX Build: Target $(KBUILD_TARGET) is not officially supported!)
+  TEMPLATE_VBoxR3Exe_CXXFLAGS.profile  = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.release)
+  TEMPLATE_VBoxR3Exe_CXXFLAGS.kprofile = $(TEMPLATE_VBoxR3Exe_CXXFLAGS.krelease)
  endif
  ifdef VBOX_WITH_RUNPATH
@@ -6470 +6470 @@
  endif
  TEMPLATE_VBoxR3StaticBase_LDFLAGS            += \
-        /DISALLOWLIB:msvcrt.lib \
-        /DISALLOWLIB:msvcrtd.lib \
-        /DISALLOWLIB:msvcprt.lib \
-        /DISALLOWLIB:msvcprtd.lib \
-        /DISALLOWLIB:vcruntime.lib \
-        /DISALLOWLIB:vcruntimed.lib \
-        /DISALLOWLIB:ucrt.lib \
-        /DISALLOWLIB:ucrtd.lib
+        /DISALLOWLIB:msvcrt.lib \
+        /DISALLOWLIB:msvcrtd.lib \
+        /DISALLOWLIB:msvcprt.lib \
+        /DISALLOWLIB:msvcprtd.lib \
+        /DISALLOWLIB:vcruntime.lib \
+        /DISALLOWLIB:vcruntimed.lib \
+        /DISALLOWLIB:ucrt.lib \
+        /DISALLOWLIB:ucrtd.lib
  if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140"
   ifdef VBOX_WITH_NOCRT_STATIC
@@ -6569 +6569 @@
 endif
 TEMPLATE_VBoxR3Static_LIBS.$(KBUILD_TARGET_ARCH) += \
-        $(VBOX_LIB_RUNTIME_STATIC)
+        $(VBOX_LIB_RUNTIME_STATIC)
 ifneq ($(KBUILD_TARGET_ARCH),x86)
-TEMPLATE_VBoxR3Static_LIBS.x86     += \
+ TEMPLATE_VBoxR3Static_LIBS.x86    += \
         $(VBOX_LIB_RUNTIME_STATIC_X86)
 endif
@@ -6586 +6586 @@
         $(SDK_VBoxLzf_LIBS) \
         $(SDK_VBoxZlib_LIBS)
- if1of ($(KBUILD_TARGET),darwin freebsd)
+ if1of ($(KBUILD_TARGET), darwin freebsd)
   TEMPLATE_VBoxR3Static_LIBS       += iconv
  else ifeq ($(KBUILD_TARGET),solaris)
@@ -6668 +6668 @@
         IN_RT_STATIC
 ifndef VBOX_WITH_NOCRT_STATIC
-TEMPLATE_VBoxR3StaticNoCrt_DEFS.win      = $(TEMPLATE_VBoxR3Static_DEFS.win) \
-        RT_WITHOUT_NOCRT_WRAPPERS
+ TEMPLATE_VBoxR3StaticNoCrt_DEFS.win     = $(TEMPLATE_VBoxR3Static_DEFS.win) \
+        RT_WITHOUT_NOCRT_WRAPPERS
 endif
 TEMPLATE_VBoxR3StaticNoCrt_LIBS          = \
         $(PATH_STAGE_LIB)/RuntimeR3NoCrt$(VBOX_SUFF_LIB)
 ifeq ($(KBUILD_TARGET),win)
-TEMPLATE_VBoxR3StaticNoCrt_LIBS.x86        = $(NO_SUCH_VARIABLE)
-TEMPLATE_VBoxR3StaticNoCrt_LIBS.amd64      = $(NO_SUCH_VARIABLE)
-TEMPLATE_VBoxR3StaticNoCrt_LIBS.win        = $(NO_SUCH_VARIABLE)
+ TEMPLATE_VBoxR3StaticNoCrt_LIBS.x86       = $(NO_SUCH_VARIABLE)
+ TEMPLATE_VBoxR3StaticNoCrt_LIBS.amd64     = $(NO_SUCH_VARIABLE)
+ TEMPLATE_VBoxR3StaticNoCrt_LIBS.win       = $(NO_SUCH_VARIABLE)
  ifdef VBOX_WITH_NOCRT_STATIC
-TEMPLATE_VBoxR3StaticNoCrt_LIBS.$(KBUILD_TARGET_ARCH) = \
-        $(PATH_STAGE_LIB)/RuntimeR3NoCrt$(VBOX_SUFF_LIB)
+  TEMPLATE_VBoxR3StaticNoCrt_LIBS.$(KBUILD_TARGET_ARCH) = \
+        $(PATH_STAGE_LIB)/RuntimeR3NoCrt$(VBOX_SUFF_LIB)
   ifneq ($(KBUILD_TARGET_ARCH),x86)
-TEMPLATE_VBoxR3StaticNoCrt_LIBS.x86        = \
-        $(PATH_STAGE_LIB)/RuntimeR3NoCrt-x86$(VBOX_SUFF_LIB) # place holder, we don't have this library
+   TEMPLATE_VBoxR3StaticNoCrt_LIBS.x86     = \
+        $(PATH_STAGE_LIB)/RuntimeR3NoCrt-x86$(VBOX_SUFF_LIB) # place holder, we don't have this library
   endif
  else
-TEMPLATE_VBoxR3StaticNoCrt_LIBS.win.x86    = \
-        $(PATH_TOOL_$(TEMPLATE_VBoxR3StaticNoCrt_TOOL.win.x86)_LIB)/chkstk.obj
- endif
-TEMPLATE_VBoxR3StaticNoCrt_SDKS.win.x86   += VBoxWinInt64Lib
-TEMPLATE_VBoxR3StaticNoCrt_LDFLAGS         = $(filter-out $(VBOX_VCC_LD_GUARD_CF) $(VBOX_VCC_SANITIZER_LDFLAGS), $(TEMPLATE_VBoxR3Static_LDFLAGS))
-TEMPLATE_VBoxR3StaticNoCrt_LDFLAGS.win.x86 = $(filter-out -Include%, $(TEMPLATE_VBoxR3Static_LDFLAGS.win.x86))
-TEMPLATE_VBoxR3StaticNoCrt_CFLAGS          = $(filter-out -EH% -GS $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxR3Static_CFLAGS)) /GS- -EHs-
-TEMPLATE_VBoxR3StaticNoCrt_CXXFLAGS        = $(filter-out -EH% -GS $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxR3Static_CXXFLAGS)) /GS- -EHs-
-TEMPLATE_VBoxR3StaticNoCrt_PCHFLAGS        = $(filter-out -EH% -GS $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxR3Static_PCHFLAGS)) /GS- -EHs-
-TEMPLATE_VBoxR3StaticNoCrt_CXXFLAGS.debug  = $(filter-out /RTC% -RTC%, $(TEMPLATE_VBoxR3Static_CXXFLAGS.debug))
+  TEMPLATE_VBoxR3StaticNoCrt_LIBS.win.x86  = \
+        $(PATH_TOOL_$(TEMPLATE_VBoxR3StaticNoCrt_TOOL.win.x86)_LIB)/chkstk.obj
+ endif
+ TEMPLATE_VBoxR3StaticNoCrt_SDKS.win.x86  += VBoxWinInt64Lib
+ TEMPLATE_VBoxR3StaticNoCrt_LDFLAGS        = $(filter-out $(VBOX_VCC_LD_GUARD_CF) $(VBOX_VCC_SANITIZER_LDFLAGS), $(TEMPLATE_VBoxR3Static_LDFLAGS))
+ TEMPLATE_VBoxR3StaticNoCrt_LDFLAGS.win.x86 = $(filter-out -Include%, $(TEMPLATE_VBoxR3Static_LDFLAGS.win.x86))
+ TEMPLATE_VBoxR3StaticNoCrt_CFLAGS         = $(filter-out -EH% -GS $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxR3Static_CFLAGS)) /GS- -EHs-
+ TEMPLATE_VBoxR3StaticNoCrt_CXXFLAGS       = $(filter-out -EH% -GS $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxR3Static_CXXFLAGS)) /GS- -EHs-
+ TEMPLATE_VBoxR3StaticNoCrt_PCHFLAGS       = $(filter-out -EH% -GS $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxR3Static_PCHFLAGS)) /GS- -EHs-
+ TEMPLATE_VBoxR3StaticNoCrt_CXXFLAGS.debug = $(filter-out /RTC% -RTC%, $(TEMPLATE_VBoxR3Static_CXXFLAGS.debug))
 else
-TEMPLATE_VBoxR3StaticNoCrt_CXXFLAGS        = $(TEMPLATE_VBoxR3Static_CXXFLAGS) -fno-exceptions
-TEMPLATE_VBoxR3StaticNoCrt_PCHFLAGS        = $(TEMPLATE_VBoxR3Static_PCHFLAGS) -fno-exceptions
+ TEMPLATE_VBoxR3StaticNoCrt_CXXFLAGS       = $(TEMPLATE_VBoxR3Static_CXXFLAGS) -fno-exceptions
+ TEMPLATE_VBoxR3StaticNoCrt_PCHFLAGS       = $(TEMPLATE_VBoxR3Static_PCHFLAGS) -fno-exceptions
 endif
 
@@ -6726 +6726 @@
 TEMPLATE_VBoxR3HardenedExe_LDFLAGS.darwin = $(TEMPLATE_VBoxR3Exe_LDFLAGS.darwin) -framework IOKit
 ifeq ($(KBUILD_TARGET),linux)
-# not necessary except USE_LIB_PCAP is defined in SUPR3HardenedMain.cpp
-# TEMPLATE_VBoxR3HardenedExe_LIBS += cap
+ # not necessary except USE_LIB_PCAP is defined in SUPR3HardenedMain.cpp
+ # TEMPLATE_VBoxR3HardenedExe_LIBS += cap
 endif
 ifeq ($(KBUILD_TARGET),win) # No CRT!
@@ -6748 +6748 @@
  endif
  TEMPLATE_VBoxR3HardenedExe_LDFLAGS       = $(filter-out  $(VBOX_VCC_SANITIZER_LDFLAGS), $(TEMPLATE_VBoxR3Exe_LDFLAGS)) \
-        /DISALLOWLIB:msvcrt$(VBOX_VCC_CRT_TYPE).lib \
-        /DISALLOWLIB:msvcprt$(VBOX_VCC_CRT_TYPE).lib \
-        /DISALLOWLIB:vcruntime$(VBOX_VCC_CRT_TYPE).lib \
-        /DISALLOWLIB:ucrt$(VBOX_VCC_CRT_TYPE).lib
+        /DISALLOWLIB:msvcrt$(VBOX_VCC_CRT_TYPE).lib \
+        /DISALLOWLIB:msvcprt$(VBOX_VCC_CRT_TYPE).lib \
+        /DISALLOWLIB:vcruntime$(VBOX_VCC_CRT_TYPE).lib \
+        /DISALLOWLIB:ucrt$(VBOX_VCC_CRT_TYPE).lib
  TEMPLATE_VBoxR3HardenedExe_LDFLAGS.win.x86   = $(TEMPLATE_VBoxR3Exe_LDFLAGS.win.x86)   /entry:suplibHardenedWindowsMain
  TEMPLATE_VBoxR3HardenedExe_LDFLAGS.win.amd64 = $(TEMPLATE_VBoxR3Exe_LDFLAGS.win.amd64) /entry:suplibHardenedWindowsMain
@@ -6788 +6788 @@
 TEMPLATE_VBoxR3HardenedTstDll_EXTENDS = VBoxR3TstDll
 TEMPLATE_VBoxR3HardenedTstDll_INST = $(INST_TESTCASE)
- TEMPLATE_VBoxR3HardenedTstDll_LDFLAGS.win = $(TEMPLATE_VBoxR3TstDll_LDFLAGS.win) -IntegrityCheck
+TEMPLATE_VBoxR3HardenedTstDll_LDFLAGS.win  = $(TEMPLATE_VBoxR3TstDll_LDFLAGS.win) -IntegrityCheck
 ifn1of ($(KBUILD_TARGET), win os2)
  TEMPLATE_VBoxR3HardenedTstDll_LDFLAGS       = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBoxR3TstDll_LDFLAGS))
@@ -6799 +6799 @@
 #
 TEMPLATE_VBoxR3SetUidToRoot = Set-uid-to-root helper program.
-if1of ($(KBUILD_TARGET),win)
+if1of ($(KBUILD_TARGET), win)
  TEMPLATE_VBoxR3SetUidToRoot_EXTENDS = VBoxR3Exe
 else
@@ -6867 +6867 @@
         $(if-expr !defined(SDK_VBoxLibXml2_LIBS),$(PATH_STAGE_LIB)/VBox-libxml2-static$(VBOX_SUFF_LIB),) \
         $(if-expr "$(KBUILD_TARGET)" == "win" || "$(KBUILD_TARGET)" == "os2" \
-                ,$(SDK_VBoxLzf_STATIC_LIBS) $(SDK_VBoxZlibStatic_LIBS) \
-               ,$(SDK_VBoxLzf_LIBS) $(SDK_VBoxZlib_LIBS)) \
+        ,$(SDK_VBoxLzf_STATIC_LIBS) $(SDK_VBoxZlibStatic_LIBS) \
+        ,$(SDK_VBoxLzf_LIBS) $(SDK_VBoxZlib_LIBS)) \
         ,$(TEMPLATE_$(TEMPLATE_VBoxR3AutoTest_EXTENDS)_LIBS.$(KBUILD_TARGET_ARCH)))
 
@@ -6923 +6923 @@
  TEMPLATE_VBoxR3DllNonPedantic_TOOL         = $(VBOX_GCC_TOOL)
  TEMPLATE_VBoxR3DllNonPedantic_CFLAGS       = $(filter-out $(VBOX_GCC_WERR) $(VBOX_GCC_WARN_MASOCHISTIC) $(VBOX_GCC_PEDANTIC_C)  ,$(TEMPLATE_VBoxR3DllBase_CFLAGS)) \
-        $(VBOX_GCC_NON_PEDANTIC_C)
+        $(VBOX_GCC_NON_PEDANTIC_C)
  TEMPLATE_VBoxR3DllNonPedantic_CXXFLAGS     = $(filter-out $(VBOX_GCC_WERR) $(VBOX_GCC_WARN_MASOCHISTIC) $(VBOX_GCC_PEDANTIC_CXX),$(TEMPLATE_VBoxR3DllBase_CXXFLAGS)) \
         $(VBOX_GCC_NON_PEDANTIC_CXX)
@@ -7028 +7028 @@
  TEMPLATE_VBoxMainExe_DEFS              += VBOX_WITH_DTRACE VBOX_WITH_DTRACE_R3 VBOX_WITH_DTRACE_R3_MAIN VBOX_WITH_NATIVE_DTRACE
 else
-  TEMPLATE_VBoxMainExe_DTRACE_HDR_FLAGS  = --ring-3-context
-  TEMPLATE_VBoxMainExe_DTRACE_OBJ_FLAGS  = --ring-3-context --pic --probe-fn-imported --probe-fn-name "SUPTracerFireProbe"
+ TEMPLATE_VBoxMainExe_DTRACE_HDR_FLAGS   = --ring-3-context
+ TEMPLATE_VBoxMainExe_DTRACE_OBJ_FLAGS   = --ring-3-context --pic --probe-fn-imported --probe-fn-name "SUPTracerFireProbe"
  if defined(VBOX_WITH_DTRACE_R3_MAIN)
   TEMPLATE_VBoxMainExe_DTRACETOOL        = VBoxTpG
@@ -7073 +7073 @@
  TEMPLATE_VBoxMainExe_PCHFLAGS.kprofile  = $(TEMPLATE_VBoxMainExe_CXXFLAGS.kprofile)
  TEMPLATE_VBoxMainExe_LDFLAGS            = -Ignore:4197 \
-        /NOD /INCREMENTAL:NO /MAPINFO:EXPORTS /LargeAddressAware /DynamicBase /NxCompat /Release /Debug /Opt:Ref /Opt:Icf \
-        $(VBOX_VCC_LD_GUARD_CF) $(VBOX_VCC_SANITIZER_LDFLAGS) \
-        /Version:$(VBOX_VERSION_MAJOR)0$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
-        /STUB:$(PATH_ROOT)/src/VBox/HostDrivers/Support/win/winstub.com \
-        /DISALLOWLIB:libc.lib \
-        /DISALLOWLIB:libcd.lib \
-        /DISALLOWLIB:libcmt.lib \
-        /DISALLOWLIB:libcmtd.lib \
-        /DISALLOWLIB:msvcrt$(VBOX_VCC_CRT_TYPE_N).lib \
-        /DISALLOWLIB:msvcprt$(VBOX_VCC_CRT_TYPE_N).lib \
-        /DISALLOWLIB:vcruntime$(VBOX_VCC_CRT_TYPE_N).lib \
-        /DISALLOWLIB:ucrt$(VBOX_VCC_CRT_TYPE_N).lib \
-        /DISALLOWLIB:libvcruntime.lib \
-        /DISALLOWLIB:libvcruntimed.lib \
-        /DISALLOWLIB:libucrt.lib \
-        /DISALLOWLIB:libucrtd.lib
+        /NOD /INCREMENTAL:NO /MAPINFO:EXPORTS /LargeAddressAware /DynamicBase /NxCompat /Release /Debug /Opt:Ref /Opt:Icf \
+        $(VBOX_VCC_LD_GUARD_CF) $(VBOX_VCC_SANITIZER_LDFLAGS) \
+        /Version:$(VBOX_VERSION_MAJOR)0$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
+        /STUB:$(PATH_ROOT)/src/VBox/HostDrivers/Support/win/winstub.com \
+        /DISALLOWLIB:libc.lib \
+        /DISALLOWLIB:libcd.lib \
+        /DISALLOWLIB:libcmt.lib \
+        /DISALLOWLIB:libcmtd.lib \
+        /DISALLOWLIB:msvcrt$(VBOX_VCC_CRT_TYPE_N).lib \
+        /DISALLOWLIB:msvcprt$(VBOX_VCC_CRT_TYPE_N).lib \
+        /DISALLOWLIB:vcruntime$(VBOX_VCC_CRT_TYPE_N).lib \
+        /DISALLOWLIB:ucrt$(VBOX_VCC_CRT_TYPE_N).lib \
+        /DISALLOWLIB:libvcruntime.lib \
+        /DISALLOWLIB:libvcruntimed.lib \
+        /DISALLOWLIB:libucrt.lib \
+        /DISALLOWLIB:libucrtd.lib
  if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_HARDENING)
   TEMPLATE_VBoxMainExe_LDFLAGS          += -IntegrityCheck
@@ -7097 +7097 @@
  TEMPLATE_VBoxMainExe_LDFLAGS.win.amd64  = $(VBOX_VCC_LD_HIGH_ENTRYOPY_VA)
  TEMPLATE_VBoxMainExe_LIBS               = \
-        $(LIB_RUNTIME)
+        $(LIB_RUNTIME)
  if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140"
   TEMPLATE_VBoxMainExe_LIBS.x86           = \
@@ -7132 +7132 @@
 else # the GCC guys:
 
-TEMPLATE_VBoxMainExe_TOOL                = $(VBOX_GCC_TOOL)
+ TEMPLATE_VBoxMainExe_TOOL               = $(VBOX_GCC_TOOL)
  if $(VBOX_GCC_VERSION_CC) < 30400
   TEMPLATE_VBoxMainExe_DEFS             += RT_WITHOUT_PRAGMA_ONCE
  endif
-TEMPLATE_VBoxMainExe_CXXFLAGS            = -g $(VBOX_GCC_pipe) \
-        $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_Wno-multistatement-macros) $(VBOX_GCC_Wno-class-memaccess) -Wshadow \
-        -fshort-wchar -fpermissive -fexceptions -frtti $(VBOX_GCC_OPT) $(VBOX_GCC_FP) -fno-strict-aliasing \
-        $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_std) $(VBOX_GCC_IPRT_FMT_CHECK) \
-        $(VBOX_GCC_SANITIZER_FLAGS)
+ TEMPLATE_VBoxMainExe_CXXFLAGS           = -g $(VBOX_GCC_pipe) \
+        $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_Wno-multistatement-macros) $(VBOX_GCC_Wno-class-memaccess) -Wshadow \
+        -fshort-wchar -fpermissive -fexceptions -frtti $(VBOX_GCC_OPT) $(VBOX_GCC_FP) -fno-strict-aliasing \
+        $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_std) $(VBOX_GCC_IPRT_FMT_CHECK) \
+        $(VBOX_GCC_SANITIZER_FLAGS)
  if !defined("VBOX_GCC_Wno-delete-non-virtual-dtor") && defined("VBOX_GCC_Wno-non-virtual-dtor")
   TEMPLATE_VBoxMainExe_CXXFLAGS         += $(VBOX_GCC_Wno-non-virtual-dtor)
@@ -7150 +7150 @@
   TEMPLATE_VBoxMainExe_CXXFLAGS := $(filter-out -pedantic,$(TEMPLATE_VBoxMainExe_CXXFLAGS)) -fdollars-in-identifiers # annoying gcc option precedence.
  endif
-TEMPLATE_VBoxMainExe_CXXFLAGS.x86        = -m32
-TEMPLATE_VBoxMainExe_CXXFLAGS.amd64      = -m64
-TEMPLATE_VBoxMainExe_CXXFLAGS.kprofile   = -finstrument-functions
-TEMPLATE_VBoxMainExe_CFLAGS              = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC_Wno-variadic-macros) \
-        $(VBOX_GCC_OPT) $(VBOX_GCC_FP) -fno-strict-aliasing $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_IPRT_FMT_CHECK) \
-        $(VBOX_GCC_SANITIZER_FLAGS)
+ TEMPLATE_VBoxMainExe_CXXFLAGS.x86       = -m32
+ TEMPLATE_VBoxMainExe_CXXFLAGS.amd64     = -m64
+ TEMPLATE_VBoxMainExe_CXXFLAGS.kprofile  = -finstrument-functions
+ TEMPLATE_VBoxMainExe_CFLAGS             = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC_Wno-variadic-macros) \
+        $(VBOX_GCC_OPT) $(VBOX_GCC_FP) -fno-strict-aliasing $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_IPRT_FMT_CHECK) \
+        $(VBOX_GCC_SANITIZER_FLAGS)
  ifdef VBOX_WITH_NO_GCC_WARNING_POLICY
   TEMPLATE_VBoxMainExe_CFLAGS           += $(VBOX_GCC_WERR)
  endif
-TEMPLATE_VBoxMainExe_CFLAGS.x86          = -m32
-TEMPLATE_VBoxMainExe_CFLAGS.amd64        = -m64
-TEMPLATE_VBoxMainExe_CFLAGS.kprofile     = $(TEMPLATE_VBoxMainExe_CXXFLAGS.kprofile)
-TEMPLATE_VBoxMainExe_CFLAGS.debug        = $(TEMPLATE_VBoxMainExe_CXXFLAGS.debug)
-TEMPLATE_VBoxMainExe_OBJCFLAGS           = $(TEMPLATE_VBoxMainExe_CFLAGS)
-TEMPLATE_VBoxMainExe_OBJCFLAGS.x86       = $(TEMPLATE_VBoxMainExe_CFLAGS.x86)
-TEMPLATE_VBoxMainExe_OBJCFLAGS.amd64     = $(TEMPLATE_VBoxMainExe_CFLAGS.amd64)
-TEMPLATE_VBoxMainExe_OBJCFLAGS.debug     = $(TEMPLATE_VBoxMainExe_CFLAGS.debug)
-TEMPLATE_VBoxMainExe_OBJCFLAGS.kprofile  = $(TEMPLATE_VBoxMainExe_CFLAGS.kprofile)
-TEMPLATE_VBoxMainExe_OBJCXXFLAGS         = $(TEMPLATE_VBoxMainExe_CXXFLAGS)
-TEMPLATE_VBoxMainExe_OBJCXXFLAGS.x86     = $(TEMPLATE_VBoxMainExe_CXXFLAGS.x86)
-TEMPLATE_VBoxMainExe_OBJCXXFLAGS.amd64   = $(TEMPLATE_VBoxMainExe_CXXFLAGS.amd64)
-TEMPLATE_VBoxMainExe_OBJCXXFLAGS.debug   = $(TEMPLATE_VBoxMainExe_CXXFLAGS.debug)
-TEMPLATE_VBoxMainExe_OBJCXXFLAGS.kprofile= $(TEMPLATE_VBoxMainExe_CXXFLAGS.kprofile)
-TEMPLATE_VBoxMainExe_PCHFLAGS            = $(TEMPLATE_VBoxMainExe_CXXFLAGS)
-TEMPLATE_VBoxMainExe_PCHFLAGS.x86        = $(TEMPLATE_VBoxMainExe_CXXFLAGS.x86)
-TEMPLATE_VBoxMainExe_PCHFLAGS.amd64      = $(TEMPLATE_VBoxMainExe_CXXFLAGS.amd64)
-TEMPLATE_VBoxMainExe_PCHFLAGS.debug      = $(TEMPLATE_VBoxMainExe_CXXFLAGS.debug)
-TEMPLATE_VBoxMainExe_PCHFLAGS.kprofile   = $(TEMPLATE_VBoxMainExe_CXXFLAGS.kprofile)
-TEMPLATE_VBoxMainExe_LDFLAGS             = $(VBOX_GCC_SANITIZER_FLAGS) $(VBOX_GCC_SANITIZER_LDFLAGS)
-TEMPLATE_VBoxMainExe_LDFLAGS.x86         = -m32
-TEMPLATE_VBoxMainExe_LDFLAGS.amd64       = -m64
+ TEMPLATE_VBoxMainExe_CFLAGS.x86         = -m32
+ TEMPLATE_VBoxMainExe_CFLAGS.amd64       = -m64
+ TEMPLATE_VBoxMainExe_CFLAGS.kprofile    = $(TEMPLATE_VBoxMainExe_CXXFLAGS.kprofile)
+ TEMPLATE_VBoxMainExe_CFLAGS.debug       = $(TEMPLATE_VBoxMainExe_CXXFLAGS.debug)
+ TEMPLATE_VBoxMainExe_OBJCFLAGS          = $(TEMPLATE_VBoxMainExe_CFLAGS)
+ TEMPLATE_VBoxMainExe_OBJCFLAGS.x86      = $(TEMPLATE_VBoxMainExe_CFLAGS.x86)
+ TEMPLATE_VBoxMainExe_OBJCFLAGS.amd64    = $(TEMPLATE_VBoxMainExe_CFLAGS.amd64)
+ TEMPLATE_VBoxMainExe_OBJCFLAGS.debug    = $(TEMPLATE_VBoxMainExe_CFLAGS.debug)
+ TEMPLATE_VBoxMainExe_OBJCFLAGS.kprofile = $(TEMPLATE_VBoxMainExe_CFLAGS.kprofile)
+ TEMPLATE_VBoxMainExe_OBJCXXFLAGS        = $(TEMPLATE_VBoxMainExe_CXXFLAGS)
+ TEMPLATE_VBoxMainExe_OBJCXXFLAGS.x86    = $(TEMPLATE_VBoxMainExe_CXXFLAGS.x86)
+ TEMPLATE_VBoxMainExe_OBJCXXFLAGS.amd64  = $(TEMPLATE_VBoxMainExe_CXXFLAGS.amd64)
+ TEMPLATE_VBoxMainExe_OBJCXXFLAGS.debug  = $(TEMPLATE_VBoxMainExe_CXXFLAGS.debug)
+ TEMPLATE_VBoxMainExe_OBJCXXFLAGS.kprofile = $(TEMPLATE_VBoxMainExe_CXXFLAGS.kprofile)
+ TEMPLATE_VBoxMainExe_PCHFLAGS           = $(TEMPLATE_VBoxMainExe_CXXFLAGS)
+ TEMPLATE_VBoxMainExe_PCHFLAGS.x86       = $(TEMPLATE_VBoxMainExe_CXXFLAGS.x86)
+ TEMPLATE_VBoxMainExe_PCHFLAGS.amd64     = $(TEMPLATE_VBoxMainExe_CXXFLAGS.amd64)
+ TEMPLATE_VBoxMainExe_PCHFLAGS.debug     = $(TEMPLATE_VBoxMainExe_CXXFLAGS.debug)
+ TEMPLATE_VBoxMainExe_PCHFLAGS.kprofile  = $(TEMPLATE_VBoxMainExe_CXXFLAGS.kprofile)
+ TEMPLATE_VBoxMainExe_LDFLAGS            = $(VBOX_GCC_SANITIZER_FLAGS) $(VBOX_GCC_SANITIZER_LDFLAGS)
+ TEMPLATE_VBoxMainExe_LDFLAGS.x86        = -m32
+ TEMPLATE_VBoxMainExe_LDFLAGS.amd64      = -m64
  ifeq ($(KBUILD_TARGET),linux)
-TEMPLATE_VBoxMainExe_LIBS                = pthread m rt $(LIB_RUNTIME) dl
-TEMPLATE_VBoxMainExe_LDFLAGS.linux       = -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)
+  TEMPLATE_VBoxMainExe_LIBS              = pthread m rt $(LIB_RUNTIME) dl
+  TEMPLATE_VBoxMainExe_LDFLAGS.linux     = -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)
  else ifeq ($(KBUILD_TARGET),os2)
-TEMPLATE_VBoxMainExe_TOOL                = GXX3OMF
-TEMPLATE_VBoxMainExe_LIBS                = $(LIB_RUNTIME)
+  TEMPLATE_VBoxMainExe_TOOL              = GXX3OMF
+  TEMPLATE_VBoxMainExe_LIBS              = $(LIB_RUNTIME)
  else ifeq ($(KBUILD_TARGET),darwin)
-TEMPLATE_VBoxMainExe_TOOL                = $(VBOX_GCC_TOOL)
-TEMPLATE_VBoxMainExe_SDKS               += $(VBOX_DARWIN_DEF_SDK_SDKS)
-TEMPLATE_VBoxMainExe_DEFS               += $(VBOX_DARWIN_DEF_SDK_DEFS)
-TEMPLATE_VBoxMainExe_CFLAGS             += $(VBOX_DARWIN_DEF_SDK_CFLAGS)
-TEMPLATE_VBoxMainExe_CXXFLAGS           += $(VBOX_DARWIN_DEF_SDK_CXXFLAGS)
-TEMPLATE_VBoxMainExe_OBJCFLAGS          += $(VBOX_DARWIN_DEF_SDK_OBJCFLAGS)
-TEMPLATE_VBoxMainExe_OBJCXXFLAGS        += $(VBOX_DARWIN_DEF_SDK_OBJCXXFLAGS)
-TEMPLATE_VBoxMainExe_LDFLAGS.darwin     += -bind_at_load
-TEMPLATE_VBoxMainExe_LDFLAGS            += $(VBOX_DARWIN_DEF_SDK_LDFLAGS) -framework Carbon -Wl,-headerpad_max_install_names
-TEMPLATE_VBoxMainExe_LIBS                = $(LIB_RUNTIME)
-TEMPLATE_VBoxMainExe_POST_CMDS.darwin    = $(VBOX_SIGN_IMAGE_CMDS)
+  TEMPLATE_VBoxMainExe_TOOL              = $(VBOX_GCC_TOOL)
+  TEMPLATE_VBoxMainExe_SDKS             += $(VBOX_DARWIN_DEF_SDK_SDKS)
+  TEMPLATE_VBoxMainExe_DEFS             += $(VBOX_DARWIN_DEF_SDK_DEFS)
+  TEMPLATE_VBoxMainExe_CFLAGS           += $(VBOX_DARWIN_DEF_SDK_CFLAGS)
+  TEMPLATE_VBoxMainExe_CXXFLAGS         += $(VBOX_DARWIN_DEF_SDK_CXXFLAGS)
+  TEMPLATE_VBoxMainExe_OBJCFLAGS        += $(VBOX_DARWIN_DEF_SDK_OBJCFLAGS)
+  TEMPLATE_VBoxMainExe_OBJCXXFLAGS      += $(VBOX_DARWIN_DEF_SDK_OBJCXXFLAGS)
+  TEMPLATE_VBoxMainExe_LDFLAGS.darwin   += -bind_at_load
+  TEMPLATE_VBoxMainExe_LDFLAGS          += $(VBOX_DARWIN_DEF_SDK_LDFLAGS) -framework Carbon -Wl,-headerpad_max_install_names
+  TEMPLATE_VBoxMainExe_LIBS              = $(LIB_RUNTIME)
+  TEMPLATE_VBoxMainExe_POST_CMDS.darwin  = $(VBOX_SIGN_IMAGE_CMDS)
  else ifeq ($(KBUILD_TARGET),haiku)
-TEMPLATE_VBoxMainExe_TOOL                = GXX3
-TEMPLATE_VBoxMainExe_LIBS                = $(LIB_RUNTIME) network stdc++ supc++
+  TEMPLATE_VBoxMainExe_TOOL              = GXX3
+  TEMPLATE_VBoxMainExe_LIBS              = $(LIB_RUNTIME) network stdc++ supc++
  else if1of ($(KBUILD_TARGET), freebsd openbsd)
-TEMPLATE_VBoxMainExe_TOOL                = GXX3
-TEMPLATE_VBoxMainExe_LIBS                = $(LIB_RUNTIME)
-TEMPLATE_VBoxMainExe_INCS               += \
-        /usr/include \
-        /usr/X11R6/include \
-        /usr/local/include
-TEMPLATE_VBoxMainExe_LIBPATH            += \
-        /usr/lib \
-        /usr/X11R6/lib \
-        /usr/local/lib
+  TEMPLATE_VBoxMainExe_TOOL              = GXX3
+  TEMPLATE_VBoxMainExe_LIBS              = $(LIB_RUNTIME)
+  TEMPLATE_VBoxMainExe_INCS             += \
+        /usr/include \
+        /usr/X11R6/include \
+        /usr/local/include
+  TEMPLATE_VBoxMainExe_LIBPATH          += \
+        /usr/lib \
+        /usr/X11R6/lib \
+        /usr/local/lib
  else ifeq ($(KBUILD_TARGET),netbsd)
-TEMPLATE_VBoxMainExe_TOOL                = GXX3
-TEMPLATE_VBoxMainExe_LIBS                = $(LIB_RUNTIME)
-TEMPLATE_VBoxMainExe_INCS               += \
-        /usr/include \
-        /usr/X11R7/include
-TEMPLATE_VBoxMainExe_LIBPATH            += \
-        /usr/lib \
-        /usr/X11R7/lib
-else ifeq ($(KBUILD_TARGET),solaris)
-TEMPLATE_VBoxMainExe_TOOL                = GXX3PLAIN
-TEMPLATE_VBoxMainExe_DEFS               += _REENTRANT
-TEMPLATE_VBoxMainExe_LIBS                = $(LIB_RUNTIME) rt thread
+  TEMPLATE_VBoxMainExe_TOOL              = GXX3
+  TEMPLATE_VBoxMainExe_LIBS              = $(LIB_RUNTIME)
+  TEMPLATE_VBoxMainExe_INCS             += \
+        /usr/include \
+        /usr/X11R7/include
+  TEMPLATE_VBoxMainExe_LIBPATH          += \
+        /usr/lib \
+        /usr/X11R7/lib
+ else ifeq ($(KBUILD_TARGET),solaris)
+  TEMPLATE_VBoxMainExe_TOOL              = GXX3PLAIN
+  TEMPLATE_VBoxMainExe_DEFS             += _REENTRANT
+  TEMPLATE_VBoxMainExe_LIBS              = $(LIB_RUNTIME) rt thread
  else
-$(warning Warning: VBOX Build: Target $(KBUILD_TARGET) is not officially supported!)
-TEMPLATE_VBoxMainExe_LIBS                =
- endif
-TEMPLATE_VBoxMainExe_LDFLAGS.solaris     = -Wl,-z,ignore # Same as VBOX_LD_as_needed.
+  $(warning Warning: VBOX Build: Target $(KBUILD_TARGET) is not officially supported!)
+  TEMPLATE_VBoxMainExe_LIBS              =
+ endif
+ TEMPLATE_VBoxMainExe_LDFLAGS.solaris    = -Wl,-z,ignore # Same as VBOX_LD_as_needed.
  ifdef VBOX_WITH_RUNPATH
-TEMPLATE_VBoxMainExe_LDFLAGS            += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)'
+  TEMPLATE_VBoxMainExe_LDFLAGS          += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)'
  else ifdef VBOX_WITH_RELATIVE_RUNPATH
-TEMPLATE_VBoxMainExe_LDFLAGS            += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)'
+  TEMPLATE_VBoxMainExe_LDFLAGS          += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)'
  endif
  ifdef VBOX_WITH_ORIGIN
-TEMPLATE_VBoxMainExe_LDFLAGS.linux      += $(VBOX_GCC_ORIGIN_OPT)
+  TEMPLATE_VBoxMainExe_LDFLAGS.linux    += $(VBOX_GCC_ORIGIN_OPT)
  endif
 
@@ -7252 +7252 @@
  endif
  TEMPLATE_VBoxMainExe_INCS              += \
-        $(VBOX_XPCOM_INCS)
+        $(VBOX_XPCOM_INCS)
  TEMPLATE_VBoxMainExe_LIBS              += \
-        $(LIB_XPCOM)
+        $(LIB_XPCOM)
  TEMPLATE_VBoxMainExe_INTERMEDIATES     += \
-        $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
+        $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
 
 else  # COM
  TEMPLATE_VBoxMainExe_INCS              += \
-        $(VBOX_PATH_SDK)/bindings/mscom/include
+        $(VBOX_PATH_SDK)/bindings/mscom/include
  TEMPLATE_VBoxMainExe_INTERMEDIATES     += \
-        $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h
+        $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h
 endif # COM
 
@@ -7328 +7328 @@
         VBOX_IN_32_ON_64_MAIN_API
 TEMPLATE_VBoxMainComp-x86_LIBS = \
-        $(subst $(PATH_STAGE_LIB)/VBoxCOM$(VBOX_SUFF_LIB),$(PATH_STAGE_LIB)/VBoxCOM-x86$(VBOX_SUFF_LIB),\
-        $(subst $(LIB_RUNTIME),$(VBOX_LIB_RUNTIME_X86),\
-        $(subst $(LIB_XPCOM),$(VBOX_LIB_XPCOM_X86),\
+        $(subst $(PATH_STAGE_LIB)/VBoxCOM$(VBOX_SUFF_LIB),$(PATH_STAGE_LIB)/VBoxCOM-x86$(VBOX_SUFF_LIB), \
+        $(subst $(LIB_RUNTIME),$(VBOX_LIB_RUNTIME_X86), \
+        $(subst $(LIB_XPCOM),$(VBOX_LIB_XPCOM_X86), \
         $(TEMPLATE_VBoxMainComp_LIBS))))
 
@@ -7371 +7371 @@
 TEMPLATE_VBoxMainClientExe_EXTENDS         = VBoxMainExe
 ifeq ($(KBUILD_TARGET),win)
- TEMPLATE_VBoxMainClientExe_DEPS            = $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h
- TEMPLATE_VBoxMainClientExe_LIBS.win        = $(TEMPLATE_VBoxMainExe_LIBS.win) \
-   $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/User32.Lib \
-   $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Shell32.Lib \
-   $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/ShLwApi.Lib \
-   $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Ole32.Lib \
-   $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/OleAut32.Lib \
-   $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Uuid.Lib
+ TEMPLATE_VBoxMainClientExe_DEPS            = $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h
+ TEMPLATE_VBoxMainClientExe_LIBS.win        = $(TEMPLATE_VBoxMainExe_LIBS.win) \
+        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/User32.Lib \
+        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Shell32.Lib \
+        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/ShLwApi.Lib \
+        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Ole32.Lib \
+        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/OleAut32.Lib \
+        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Uuid.Lib
 else
- TEMPLATE_VBoxMainClientExe_DEPS            = $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
- TEMPLATE_VBoxMainClientExe_DEFS            = $(TEMPLATE_VBoxMainExe_DEFS) \
-        NDEBUG TRIMMED
+ TEMPLATE_VBoxMainClientExe_DEPS            = $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
+ TEMPLATE_VBoxMainClientExe_DEFS            = $(TEMPLATE_VBoxMainExe_DEFS) \
+        NDEBUG TRIMMED
  TEMPLATE_VBoxMainClientExe_CXXFLAGS.linux = $(TEMPLATE_VBoxMainExe_CXXFLAGS.linux) -pthread
  TEMPLATE_VBoxMainClientExe_PCHFLAGS.linux = $(TEMPLATE_VBoxMainExe_PCHFLAGS.linux) -pthread
@@ -7442 +7442 @@
   TEMPLATE_VBoxR3ExtPack_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)', $(TEMPLATE_VBoxR3Dll_LDFLAGS))
  else if !defined(VBOX_WITH_RUNPATH) && defined(VBOX_WITH_RELATIVE_RUNPATH)
-   TEMPLATE_VBoxR3ExtPack_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/../../..' $(filter-out '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)', $(TEMPLATE_VBoxR3Dll_LDFLAGS))
+  TEMPLATE_VBoxR3ExtPack_LDFLAGS  = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/../../..' $(filter-out '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)', $(TEMPLATE_VBoxR3Dll_LDFLAGS))
  endif
  ifdef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
@@ -7467 +7467 @@
   TEMPLATE_VBoxR3ExtPackApi_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)', $(TEMPLATE_VBoxMainDll_LDFLAGS))
  else if !defined(VBOX_WITH_RUNPATH) && defined(VBOX_WITH_RELATIVE_RUNPATH)
-   TEMPLATE_VBoxR3ExtPackApi_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/../../..' $(filter-out '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)', $(TEMPLATE_VBoxMainDll_LDFLAGS))
+  TEMPLATE_VBoxR3ExtPackApi_LDFLAGS  = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/../../..' $(filter-out '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)', $(TEMPLATE_VBoxMainDll_LDFLAGS))
  endif
  ifdef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
@@ -7492 +7492 @@
  if1of ($(VBOX_LDR_FMT), pe lx)
   TEMPLATE_VBoxR0ExtPack_LIBS = \
-        $(PATH_STAGE_LIB)/VMMR0Imp$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/VMMR0Imp$(VBOX_SUFF_LIB)
  endif
  TEMPLATE_VBoxR0ExtPack_LIBS += \
@@ -7505 +7505 @@
  if1of ($(VBOX_LDR_FMT32), pe lx)
   TEMPLATE_VBoxRcExtPack_LIBS = \
-        $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \
-        $(PATH_STAGE_LIB)/VMMRCImp$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/VMMRCImp$(VBOX_SUFF_LIB)
  endif
 
@@ -7581 +7581 @@
    VBOX_PATH_QT := $(rsort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v5*))
    VBOX_PATH_QT := $(firstword $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(VBOX_PATH_QT)) \
-                    $(filter-out %-vcc100 %-vcc110 %-vcc120 %-vcc140 %-vcc141 %-vcc142 %-vcc143 %-vcc150, $(VBOX_PATH_QT)))
+        $(filter-out %-vcc100 %-vcc110 %-vcc120 %-vcc140 %-vcc141 %-vcc142 %-vcc143 %-vcc150, $(VBOX_PATH_QT)))
    ifdef VBOX_PATH_QT
     PATH_SDK_QT5  := $(VBOX_PATH_QT)
@@ -7607 +7607 @@
  endif
 
- ifeq ($(KBUILD_TARGET), darwin)
+ ifeq ($(KBUILD_TARGET),darwin)
   VBOX_QT_MOD := QtCore QtGui QtWidgets QtPrintSupport
   ifdef VBOX_WITH_QT6
@@ -7628 +7628 @@
         plugins/styles/libqgtk2style.so \
         plugins/xcbglintegrations/libqxcb-glx-integration.so
-  else ifeq ($(KBUILD_TARGET), win)
+  else ifeq ($(KBUILD_TARGET),win)
    VBOX_QT_MOD += Qt5WinExtras
   endif # win
@@ -7634 +7634 @@
 
  ifdef VBOX_WITH_QHELP_VIEWER
-   ifeq ($(KBUILD_TARGET), darwin)
-    VBOX_QT_MOD += QtHelp QtNetwork QtSql
-   else if1of ($(KBUILD_TARGET), linux freebsd netbsd openbsd solaris win)
-    VBOX_QT_MOD += Qt5Help Qt5Network Qt5Sql
-   endif
+  ifeq ($(KBUILD_TARGET),darwin)
+   VBOX_QT_MOD  += QtHelp QtNetwork QtSql
+  else if1of ($(KBUILD_TARGET), linux freebsd netbsd openbsd solaris win)
+   VBOX_QT_MOD  += Qt5Help Qt5Network Qt5Sql
+  endif
  endif
 
@@ -7694 +7694 @@
   endif
   TEMPLATE_VBoxQtGuiExe_DEFS += \
-     _WIN32_WINNT=0x0500 UNICODE _UNICODE \
-     QT_DLL _CRT_SECURE_NO_DEPRECATE \
-     $(QMAKE_PRL_DEFINES)
+        _WIN32_WINNT=0x0500 UNICODE _UNICODE \
+        QT_DLL _CRT_SECURE_NO_DEPRECATE \
+        $(QMAKE_PRL_DEFINES)
   TEMPLATE_VBoxQtGuiExe_CXXFLAGS = -nologo -Zm200 -MD -Zi -EHsc -Zc:wchar_t- $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_SANITIZER_FLAGS) $(VBOX_VCC_std)
   #    -wd4481: nonstandard extension used: override specifier 'override'
@@ -7732 +7732 @@
   TEMPLATE_VBoxQtGuiExe_CXXFLAGS += -Gy
   if "$(VBOX_VCC_TOOL_STEM)" >= "VCC120"
-  TEMPLATE_VBoxQtGuiExe_CXXFLAGS += -Gw
+   TEMPLATE_VBoxQtGuiExe_CXXFLAGS += -Gw
   endif
   ifdef VBOX_WITH_MSC_ANALYZE_THIS
@@ -7745 +7745 @@
   TEMPLATE_VBoxQtGuiExe_PCHFLAGS.dbgopt = $(TEMPLATE_VBoxQtGuiExe_CXXFLAGS.dbgopt)
   TEMPLATE_VBoxQtGuiExe_LDFLAGS = -Ignore:4197 \
-        /NOD /INCREMENTAL:NO /MAPINFO:EXPORTS /LargeAddressAware /DynamicBase /NxCompat /Release /Debug /Opt:Ref /Opt:Icf \
-        $(VBOX_VCC_LD_GUARD_CF)  $(VBOX_VCC_SANITIZER_LDFLAGS) \
-        /Version:$(VBOX_VERSION_MAJOR)0$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
-        /STUB:$(PATH_ROOT)/src/VBox/HostDrivers/Support/win/winstub.com
+        /NOD /INCREMENTAL:NO /MAPINFO:EXPORTS /LargeAddressAware /DynamicBase /NxCompat /Release /Debug /Opt:Ref /Opt:Icf \
+        $(VBOX_VCC_LD_GUARD_CF)  $(VBOX_VCC_SANITIZER_LDFLAGS) \
+        /Version:$(VBOX_VERSION_MAJOR)0$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
+        /STUB:$(PATH_ROOT)/src/VBox/HostDrivers/Support/win/winstub.com
   if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_HARDENING)
    TEMPLATE_VBoxQtGuiExe_LDFLAGS += -IntegrityCheck
@@ -7767 +7767 @@
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/oldnames.lib \
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/delayimp.lib
-  ifeq ($(KBUILD_TYPE),asan)
-   TEMPLATE_VBoxQtGuiExe_LIBS += \
-        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/clang_rt.asan_dynamic-x86_64.lib \
-        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/clang_rt.asan_dynamic_runtime_thunk-x86_64.lib
-  endif
+   ifeq ($(KBUILD_TYPE),asan)
+    TEMPLATE_VBoxQtGuiExe_LIBS += \
+        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/clang_rt.asan_dynamic-x86_64.lib \
+        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/clang_rt.asan_dynamic_runtime_thunk-x86_64.lib
+   endif
   else
    TEMPLATE_VBoxQtGuiExe_LIBS = \
@@ -7794 +7794 @@
   ## @todo Use VBOX_GCC_PEDANTIC_CXX?
   TEMPLATE_VBoxQtGuiExe_CXXFLAGS = \
-        -g $(VBOX_GCC_pipe) $(filter-out -Wno-unused $(VBOX_GCC_Wno-unused-parameter),$(VBOX_GCC_WARN)) -frtti -fno-exceptions \
-        -Wno-long-long -fshort-wchar -fno-strict-aliasing \
-        $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_Wno-multistatement-macros) $(VBOX_GCC_Wno-ignored-qualifiers) \
-        $(VBOX_GCC_Wno-return-type-c-linkage) $(VBOX_GCC_std) $(VBOX_GCC_IPRT_FMT_CHECK) $(VBOX_GCC_SANITIZER_FLAGS)
+        -g $(VBOX_GCC_pipe) $(filter-out -Wno-unused $(VBOX_GCC_Wno-unused-parameter),$(VBOX_GCC_WARN)) -frtti -fno-exceptions \
+        -Wno-long-long -fshort-wchar -fno-strict-aliasing \
+        $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_Wno-multistatement-macros) $(VBOX_GCC_Wno-ignored-qualifiers) \
+        $(VBOX_GCC_Wno-return-type-c-linkage) $(VBOX_GCC_std) $(VBOX_GCC_IPRT_FMT_CHECK) $(VBOX_GCC_SANITIZER_FLAGS)
   ifdef VBOX_WITH_NO_GCC_WARNING_POLICY
    TEMPLATE_VBoxQtGuiExe_CXXFLAGS += $(VBOX_GCC_WERR)
   endif
-  ifn1of ($(USERNAME),dsen serkan) # Bunch of stuff deprecated after 5.6.*. These guys knows how to deal with it. :)
+  ifn1of ($(USERNAME), dsen serkan) # Bunch of stuff deprecated after 5.6.*. These guys knows how to deal with it. :)
    TEMPLATE_VBoxQtGuiExe_CXXFLAGS += $(VBOX_GCC_Wno-deprecated-declarations)
   endif
@@ -7820 +7820 @@
   TEMPLATE_VBoxQtGuiExe_OBJCFLAGS.amd64 = $(TEMPLATE_VBoxQtGuiExe_CXXFLAGS.amd64)
   TEMPLATE_VBoxQtGuiExe_OBJCXXFLAGS = \
-        -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_CXX) \
-        -frtti -fno-exceptions $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_IPRT_FMT_CHECK)
+        -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_CXX) \
+        -frtti -fno-exceptions $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_IPRT_FMT_CHECK)
   ifdef VBOX_WITH_NO_GCC_WARNING_POLICY
    TEMPLATE_VBoxQtGuiExe_OBJCXXFLAGS += $(VBOX_GCC_WERR)
@@ -7834 +7834 @@
   TEMPLATE_VBoxQtGuiExe_LDFLAGS.amd64 = -m64
   TEMPLATE_VBoxQtGuiExe_LIBS = \
-        $(VBOX_LIBS_QT) \
-        $(LIB_RUNTIME)
+        $(VBOX_LIBS_QT) \
+        $(LIB_RUNTIME)
 
   ifeq ($(KBUILD_TARGET),linux)
    TEMPLATE_VBoxQtGuiExe_LDFLAGS += -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)
    TEMPLATE_VBoxQtGuiExe_LIBS += \
-     $(VBOX_XCURSOR_LIBS) \
-        Xext \
-        X11
-    TEMPLATE_VBoxQtGuiExe_LIBPATH += \
-        $(VBOX_LIBPATH_X11)
+        $(VBOX_XCURSOR_LIBS) \
+        Xext \
+        X11
+   TEMPLATE_VBoxQtGuiExe_LIBPATH  += \
+        $(VBOX_LIBPATH_X11)
   else ifeq ($(KBUILD_TARGET),darwin)
    TEMPLATE_VBoxQtGuiExe_SDKS.darwin        += $(VBOX_DARWIN_DEF_SDK_SDKS)
@@ -7863 +7863 @@
   else
    TEMPLATE_VBoxQtGuiExe_INCS += \
-        $(VBOX_XCURSOR_INCS)
+        $(VBOX_XCURSOR_INCS)
    TEMPLATE_VBoxQtGuiExe_LIBS += \
-     $(VBOX_XCURSOR_LIBS) \
-        Xext \
-        X11 \
-        m \
-        $(LIB_PTHREAD)
+        $(VBOX_XCURSOR_LIBS) \
+        Xext \
+        X11 \
+        m \
+        $(LIB_PTHREAD)
    TEMPLATE_VBoxQtGuiExe_LIBPATH += \
-        $(VBOX_LIBPATH_X11)
+        $(VBOX_LIBPATH_X11)
    ifeq ($(KBUILD_TARGET),freebsd)
     TEMPLATE_VBoxQtGuiExe_INCS += \
-        /usr/include \
-        /usr/X11R6/include \
-        /usr/local/include
+        /usr/include \
+        /usr/X11R6/include \
+        /usr/local/include
     TEMPLATE_VBoxQtGuiExe_LIBPATH += \
-        /usr/lib \
-        /usr/X11R6/lib \
-        /usr/local/lib
+        /usr/lib \
+        /usr/X11R6/lib \
+        /usr/local/lib
    endif
    ifeq ($(KBUILD_TARGET),solaris)
     TEMPLATE_VBoxQtGuiExe_LDFLAGS.solaris = -Wl,-z,ignore # Same as VBOX_LD_as_needed.
     TEMPLATE_VBoxQtGuiExe_LIBS += \
-         rt socket nsl
+        rt socket nsl
    endif
   endif
@@ -7899 +7899 @@
  # Add COM/XPCOM stuff
  TEMPLATE_VBoxQtGuiExe_LIBS += \
-        $(PATH_STAGE_LIB)/VBoxCOM$(if-expr defined(VBOX_WITH_DEBUG_VCC_CRT) && $(KBUILD_TARGET) == win,-GUI,)$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/VBoxCOM$(if-expr defined(VBOX_WITH_DEBUG_VCC_CRT) && $(KBUILD_TARGET) == win,-GUI,)$(VBOX_SUFF_LIB)
  ifdef VBOX_WITH_XPCOM
   ## @todo may be worth creating the VBOX_XPCOM SDK def, or just a SDK_VBOXXPCOM.
@@ -7907 +7907 @@
   endif
   TEMPLATE_VBoxQtGuiExe_INCS += \
-        $(VBOX_XPCOM_INCS)
+        $(VBOX_XPCOM_INCS)
   TEMPLATE_VBoxQtGuiExe_LIBS += \
-        $(LIB_XPCOM)
+        $(LIB_XPCOM)
   TEMPLATE_VBoxQtGuiExe_INTERMEDIATES += \
-        $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
+        $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
  else  # COM
   TEMPLATE_VBoxQtGuiExe_INCS += \
-        $(VBOX_PATH_SDK)/bindings/mscom/include
+        $(VBOX_PATH_SDK)/bindings/mscom/include
   TEMPLATE_VBoxQtGuiExe_INTERMEDIATES += \
-        $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h
+        $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h
  endif # COM
 
  ifn1of ($(KBUILD_TARGET), darwin os2 win)
-   TEMPLATE_VBoxQtGuiExe_DEFS     += PIC
-   TEMPLATE_VBoxQtGuiExe_CFLAGS   += -fPIC
-   TEMPLATE_VBoxQtGuiExe_CXXFLAGS += -fPIC
-   # Needed for GCC 9. Even system's Qt 5.12.4 (on Ubuntu 19.10) did not have this fixed yet.
-   TEMPLATE_VBoxQtGuiExe_CXXFLAGS.linux = $(VBOX_GCC_Wno-deprecated-copy) $(TEMPLATE_VBoxQtGuiExe_CXXFLAGS)
-   TEMPLATE_VBoxQtGuiExe_LDFLAGS  += -fPIC
+  TEMPLATE_VBoxQtGuiExe_DEFS      += PIC
+  TEMPLATE_VBoxQtGuiExe_CFLAGS    += -fPIC
+  TEMPLATE_VBoxQtGuiExe_CXXFLAGS  += -fPIC
+  # Needed for GCC 9. Even system's Qt 5.12.4 (on Ubuntu 19.10) did not have this fixed yet.
+  TEMPLATE_VBoxQtGuiExe_CXXFLAGS.linux  = $(VBOX_GCC_Wno-deprecated-copy) $(TEMPLATE_VBoxQtGuiExe_CXXFLAGS)
+  TEMPLATE_VBoxQtGuiExe_LDFLAGS   += -fPIC
  endif # not darwin, os2 or win
 
@@ -7931 +7931 @@
   ifndef VBOX_WITH_QT6
    TEMPLATE_VBoxQtGuiExe_POST_CMDS = $(QUIET)install_name_tool $(foreach qtmod, $(VBOX_QT_MOD_NAMES), \
-        $(foreach prefix, @executable_path/../Frameworks/ $(VBOX_PATH_QT)/Frameworks/ $(PATH_SDK_QT5)/, \
-                -change "$(prefix)$(qtmod).framework/Versions/5/$(qtmod)" \
-                        "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Frameworks,@rpath)/$(qtmod).framework/Versions/5/$(qtmod)" ) ) "$(out)"
+        $(foreach prefix, @executable_path/../Frameworks/ $(VBOX_PATH_QT)/Frameworks/ $(PATH_SDK_QT5)/, \
+        -change "$(prefix)$(qtmod).framework/Versions/5/$(qtmod)" \
+        "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Frameworks,@rpath)/$(qtmod).framework/Versions/5/$(qtmod)" ) ) "$(out)"
   else
    TEMPLATE_VBoxQtGuiExe_POST_CMDS = $(QUIET)install_name_tool $(foreach qtmod, $(VBOX_QT_MOD_NAMES), \
-        $(foreach prefix, @executable_path/../Frameworks/ $(VBOX_PATH_QT)/Frameworks/ $(PATH_SDK_QT6)/, \
-                -change "$(prefix)$(qtmod).framework/Versions/A/$(qtmod)" \
-                        "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Frameworks,@rpath)/$(qtmod).framework/Versions/A/$(qtmod)" ) ) "$(out)"
+        $(foreach prefix, @executable_path/../Frameworks/ $(VBOX_PATH_QT)/Frameworks/ $(PATH_SDK_QT6)/, \
+        -change "$(prefix)$(qtmod).framework/Versions/A/$(qtmod)" \
+        "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Frameworks,@rpath)/$(qtmod).framework/Versions/A/$(qtmod)" ) ) "$(out)"
   endif
  endif
@@ -7950 +7950 @@
  ifeq ($(KBUILD_TARGET),darwin)
   TEMPLATE_VBoxQtGuiDll_LDFLAGS.darwin += $(filter-out -bind_at_load,$(TEMPLATE_VBoxQtGuiExe_LDFLAGS.darwin)) \
-        -current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
-        -compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)
+        -current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
+        -compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)
  endif
  ifn1of ($(KBUILD_TARGET), darwin os2 win)
-   TEMPLATE_VBoxQtGuiDll_DEFS     = PIC $(TEMPLATE_VBoxQtGuiExe_DEFS)
-   TEMPLATE_VBoxQtGuiDll_CFLAGS   = -fPIC $(TEMPLATE_VBoxQtGuiExe_CFLAGS)
-   TEMPLATE_VBoxQtGuiDll_CXXFLAGS = -fPIC $(TEMPLATE_VBoxQtGuiExe_CXXFLAGS)
-   TEMPLATE_VBoxQtGuiDll_PCHFLAGS = $(TEMPLATE_VBoxQtGuiDll_CXXFLAGS)
-   TEMPLATE_VBoxQtGuiDll_LDFLAGS  = -fPIC $(TEMPLATE_VBoxQtGuiExe_LDFLAGS)
+  TEMPLATE_VBoxQtGuiDll_DEFS      = PIC $(TEMPLATE_VBoxQtGuiExe_DEFS)
+  TEMPLATE_VBoxQtGuiDll_CFLAGS    = -fPIC $(TEMPLATE_VBoxQtGuiExe_CFLAGS)
+  TEMPLATE_VBoxQtGuiDll_CXXFLAGS  = -fPIC $(TEMPLATE_VBoxQtGuiExe_CXXFLAGS)
+  TEMPLATE_VBoxQtGuiDll_PCHFLAGS  = $(TEMPLATE_VBoxQtGuiDll_CXXFLAGS)
+  TEMPLATE_VBoxQtGuiDll_LDFLAGS   = -fPIC $(TEMPLATE_VBoxQtGuiExe_LDFLAGS)
  endif
 endif # VBOX_WITH_QTGUI
@@ -7983 +7983 @@
  TEMPLATE_VBoxNLS_QT_TRANSLATIONS_INST = $(INST_BIN)nls/
  TEMPLATE_VBoxNLS_SOURCES  = \
-        $(PATH_ROOT)/src/VBox/Main/nls/dummy.c
+        $(PATH_ROOT)/src/VBox/Main/nls/dummy.c
  TEMPLATE_VBoxNLS_SDKS.$(KBUILD_TARGET_ARCH)  = $(filter-out VBoxOpenSslStatic,$(TEMPLATE_VBoxR3Static_SDKS.$(KBUILD_TARGET_ARCH)))
  ifdef VBOX_WITH_NOCRT_STATIC
   TEMPLATE_VBoxNLS_LIBS.$(KBUILD_TARGET_ARCH) = $(filter-out \
-         $(PATH_STAGE_LIB)/VBox-libxml2-static$(VBOX_SUFF_LIB), \
-         $(TEMPLATE_VBoxR3Static_LIBS.$(KBUILD_TARGET_ARCH)))
+        $(PATH_STAGE_LIB)/VBox-libxml2-static$(VBOX_SUFF_LIB), \
+        $(TEMPLATE_VBoxR3Static_LIBS.$(KBUILD_TARGET_ARCH)))
  else
   TEMPLATE_VBoxNLS_LIBS.$(KBUILD_TARGET_ARCH) = $(filter-out \
-         $(VBOX_LIB_RUNTIME_STATIC) \
-         $(PATH_STAGE_LIB)/VBox-libxml2-static$(VBOX_SUFF_LIB), \
-         $(TEMPLATE_VBoxR3Static_LIBS.$(KBUILD_TARGET_ARCH)))
+        $(VBOX_LIB_RUNTIME_STATIC) \
+        $(PATH_STAGE_LIB)/VBox-libxml2-static$(VBOX_SUFF_LIB), \
+        $(TEMPLATE_VBoxR3Static_LIBS.$(KBUILD_TARGET_ARCH)))
  endif
 endif # !VBOX_WITH_NLS
@@ -8016 +8016 @@
 TEMPLATE_VBoxBldProg_DEFS.win           := _CRT_SECURE_NO_DEPRECATE
 ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
-TEMPLATE_VBoxBldProg_ASTOOL             := $(VBOX_ASTOOL)
-TEMPLATE_VBoxBldProg_ASFLAGS.x86        := $(VBOX_ASFLAGS32)
-TEMPLATE_VBoxBldProg_ASFLAGS.arm32      := $(VBOX_ASFLAGS32)
-TEMPLATE_VBoxBldProg_ASFLAGS.sparc32    := $(VBOX_ASFLAGS32)
-TEMPLATE_VBoxBldProg_ASFLAGS.amd64      := $(VBOX_ASFLAGS64)
-TEMPLATE_VBoxBldProg_ASFLAGS.arm64      := $(VBOX_ASFLAGS64)
-TEMPLATE_VBoxBldProg_ASFLAGS.sparc64    := $(VBOX_ASFLAGS64)
+ TEMPLATE_VBoxBldProg_ASTOOL            := $(VBOX_ASTOOL)
+ TEMPLATE_VBoxBldProg_ASFLAGS.x86       := $(VBOX_ASFLAGS32)
+ TEMPLATE_VBoxBldProg_ASFLAGS.arm32     := $(VBOX_ASFLAGS32)
+ TEMPLATE_VBoxBldProg_ASFLAGS.sparc32   := $(VBOX_ASFLAGS32)
+ TEMPLATE_VBoxBldProg_ASFLAGS.amd64     := $(VBOX_ASFLAGS64)
+ TEMPLATE_VBoxBldProg_ASFLAGS.arm64     := $(VBOX_ASFLAGS64)
+ TEMPLATE_VBoxBldProg_ASFLAGS.sparc64   := $(VBOX_ASFLAGS64)
 else if1of ($(KBUILD_TARGET_ARCH), amd64 x86)
-TEMPLATE_VBoxBldProg_ASTOOL             := YASM
-TEMPLATE_VBoxBldProg_ASFLAGS            := -D__YASM__ -Worphan-labels $(VBOX_YASM_Wno-segreg-in-64bit)
- if1of ($(KBUILD_HOST),win)
-TEMPLATE_VBoxBldProg_ASFLAGS            += -g cv8 -DASM_FORMAT_ELF
-TEMPLATE_VBoxBldProg_ASFLAGS.x86        := -f win32
-TEMPLATE_VBoxBldProg_ASFLAGS.amd64      := -f win64
- else if1of ($(KBUILD_HOST),darwin)
-TEMPLATE_VBoxBldProg_ASFLAGS            += -DASM_FORMAT_MACHO
-TEMPLATE_VBoxBldProg_ASFLAGS.x86        := -f macho32
-TEMPLATE_VBoxBldProg_ASFLAGS.amd64      := -f macho64
+ TEMPLATE_VBoxBldProg_ASTOOL            := YASM
+ TEMPLATE_VBoxBldProg_ASFLAGS           := -D__YASM__ -Worphan-labels $(VBOX_YASM_Wno-segreg-in-64bit)
+ if1of ($(KBUILD_HOST), win)
+  TEMPLATE_VBoxBldProg_ASFLAGS          += -g cv8 -DASM_FORMAT_ELF
+  TEMPLATE_VBoxBldProg_ASFLAGS.x86      := -f win32
+  TEMPLATE_VBoxBldProg_ASFLAGS.amd64    := -f win64
+ else if1of ($(KBUILD_HOST), darwin)
+  TEMPLATE_VBoxBldProg_ASFLAGS          += -DASM_FORMAT_MACHO
+  TEMPLATE_VBoxBldProg_ASFLAGS.x86      := -f macho32
+  TEMPLATE_VBoxBldProg_ASFLAGS.amd64    := -f macho64
  else
-TEMPLATE_VBoxBldProg_ASFLAGS            += -g dwarf2 -DASM_FORMAT_ELF
-TEMPLATE_VBoxBldProg_ASFLAGS.x86        := -f elf32
-TEMPLATE_VBoxBldProg_ASFLAGS.amd64      := -f elf64
+  TEMPLATE_VBoxBldProg_ASFLAGS          += -g dwarf2 -DASM_FORMAT_ELF
+  TEMPLATE_VBoxBldProg_ASFLAGS.x86      := -f elf32
+  TEMPLATE_VBoxBldProg_ASFLAGS.amd64    := -f elf64
  endif
 endif
@@ -8084 +8084 @@
         /DISALLOWLIB:msvcprt.lib \
         /DISALLOWLIB:msvcprtd.lib \
-        /DISALLOWLIB:libvcruntime$(VBOX_VCC_CRT_TYPE_N).lib \
-        /DISALLOWLIB:libucrt$(VBOX_VCC_CRT_TYPE_N).lib \
-        /DISALLOWLIB:vcruntime.lib \
-        /DISALLOWLIB:vcruntimed.lib \
-        /DISALLOWLIB:ucrt.lib \
-        /DISALLOWLIB:ucrtd.lib
+        /DISALLOWLIB:libvcruntime$(VBOX_VCC_CRT_TYPE_N).lib \
+        /DISALLOWLIB:libucrt$(VBOX_VCC_CRT_TYPE_N).lib \
+        /DISALLOWLIB:vcruntime.lib \
+        /DISALLOWLIB:vcruntimed.lib \
+        /DISALLOWLIB:ucrt.lib \
+        /DISALLOWLIB:ucrtd.lib
  TEMPLATE_VBoxBldProg_LDFLAGS.win.amd64  = $(VBOX_VCC_LD_HIGH_ENTRYOPY_VA)
  if "$(VBOX_VCC_TOOL_STEM)" >= "VCC142" # Don't waste space on x86/amd64-on-arm emulation optimizations.
@@ -8108 +8108 @@
 
 else
-# (gcc of some kind )
-TEMPLATE_VBoxBldProg_TOOL                = GXX3
+ # (gcc of some kind )
+ TEMPLATE_VBoxBldProg_TOOL               = GXX3
  if $(VBOX_GCC_VERSION_CC) < 30400
-TEMPLATE_VBoxBldProg_DEFS               += RT_WITHOUT_PRAGMA_ONCE
- endif
-TEMPLATE_VBoxBldProg_CFLAGS              = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC_Wno-variadic-macros)
+  TEMPLATE_VBoxBldProg_DEFS             += RT_WITHOUT_PRAGMA_ONCE
+ endif
+ TEMPLATE_VBoxBldProg_CFLAGS             = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC_Wno-variadic-macros)
  ifdef VBOX_WITH_NO_GCC_WARNING_POLICY
   TEMPLATE_VBoxBldProg_CFLAGS           += $(VBOX_GCC_WERR)
  endif
-TEMPLATE_VBoxBldProg_CFLAGS.x86          = -m32
-TEMPLATE_VBoxBldProg_CFLAGS.sparc32      = -m32
-TEMPLATE_VBoxBldProg_CFLAGS.amd64        = -m64
-TEMPLATE_VBoxBldProg_CFLAGS.sparc64      = -m64
-TEMPLATE_VBoxBldProg_CFLAGS.release      = -O2 -fno-omit-frame-pointer -fno-strict-aliasing
-TEMPLATE_VBoxBldProg_CFLAGS.profile      = $(TEMPLATE_VBoxBldProg_CXXFLAGS.profile)
-TEMPLATE_VBoxBldProg_CFLAGS.kprofile     = $(TEMPLATE_VBoxBldProg_CXXFLAGS.kprofile)
-TEMPLATE_VBoxBldProg_CXXFLAGS            = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_std)
+ TEMPLATE_VBoxBldProg_CFLAGS.x86         = -m32
+ TEMPLATE_VBoxBldProg_CFLAGS.sparc32     = -m32
+ TEMPLATE_VBoxBldProg_CFLAGS.amd64       = -m64
+ TEMPLATE_VBoxBldProg_CFLAGS.sparc64     = -m64
+ TEMPLATE_VBoxBldProg_CFLAGS.release     = -O2 -fno-omit-frame-pointer -fno-strict-aliasing
+ TEMPLATE_VBoxBldProg_CFLAGS.profile     = $(TEMPLATE_VBoxBldProg_CXXFLAGS.profile)
+ TEMPLATE_VBoxBldProg_CFLAGS.kprofile    = $(TEMPLATE_VBoxBldProg_CXXFLAGS.kprofile)
+ TEMPLATE_VBoxBldProg_CXXFLAGS           = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_std)
  ifdef VBOX_WITH_NO_GCC_WARNING_POLICY
   TEMPLATE_VBoxBldProg_CXXFLAGS         += $(VBOX_GCC_WERR)
  endif
-TEMPLATE_VBoxBldProg_CXXFLAGS.x86        = -m32
-TEMPLATE_VBoxBldProg_CXXFLAGS.sparc32    = -m32
-TEMPLATE_VBoxBldProg_CXXFLAGS.amd64      = -m64
-TEMPLATE_VBoxBldProg_CXXFLAGS.sparc64    = -m64
-TEMPLATE_VBoxBldProg_CXXFLAGS.release    = -O2 -fno-omit-frame-pointer -fno-strict-aliasing
-TEMPLATE_VBoxBldProg_CXXFLAGS.profile    = $(TEMPLATE_VBoxBldProg_CXXFLAGS.release)
-TEMPLATE_VBoxBldProg_CXXFLAGS.kprofile   = $(TEMPLATE_VBoxBldProg_CXXFLAGS.release)
-TEMPLATE_VBoxBldProg_OBJCFLAGS           = $(TEMPLATE_VBoxBldProg_CFLAGS)
-TEMPLATE_VBoxBldProg_OBJCFLAGS.x86       = $(TEMPLATE_VBoxBldProg_CFLAGS.x86)
-TEMPLATE_VBoxBldProg_OBJCFLAGS.amd64     = $(TEMPLATE_VBoxBldProg_CFLAGS.amd64)
-TEMPLATE_VBoxBldProg_OBJCFLAGS.release   = $(TEMPLATE_VBoxBldProg_CFLAGS.release)
-TEMPLATE_VBoxBldProg_OBJCFLAGS.profile   = $(TEMPLATE_VBoxBldProg_CFLAGS.profile)
-TEMPLATE_VBoxBldProg_OBJCFLAGS.kprofile  = $(TEMPLATE_VBoxBldProg_CFLAGS.kprofile)
-TEMPLATE_VBoxBldProg_OBJCXXFLAGS         = $(TEMPLATE_VBoxBldProg_CXXFLAGS)
-TEMPLATE_VBoxBldProg_OBJCXXFLAGS.x86     = $(TEMPLATE_VBoxBldProg_CXXFLAGS.x86)
-TEMPLATE_VBoxBldProg_OBJCXXFLAGS.amd64   = $(TEMPLATE_VBoxBldProg_CXXFLAGS.amd64)
-TEMPLATE_VBoxBldProg_OBJCXXFLAGS.release = $(TEMPLATE_VBoxBldProg_CXXFLAGS.release)
-TEMPLATE_VBoxBldProg_OBJCXXFLAGS.profile = $(TEMPLATE_VBoxBldProg_CXXFLAGS.profile)
-TEMPLATE_VBoxBldProg_OBJCXXFLAGS.kprofile= $(TEMPLATE_VBoxBldProg_CXXFLAGS.kprofile)
-TEMPLATE_VBoxBldProg_PCHFLAGS            = $(TEMPLATE_VBoxBldProg_CXXFLAGS)
-TEMPLATE_VBoxBldProg_PCHFLAGS.x86        = $(TEMPLATE_VBoxBldProg_CXXFLAGS.x86)
-TEMPLATE_VBoxBldProg_PCHFLAGS.amd64      = $(TEMPLATE_VBoxBldProg_CXXFLAGS.amd64)
-TEMPLATE_VBoxBldProg_PCHFLAGS.release    = $(TEMPLATE_VBoxBldProg_CXXFLAGS.release)
-TEMPLATE_VBoxBldProg_PCHFLAGS.profile    = $(TEMPLATE_VBoxBldProg_CXXFLAGS.profile)
-TEMPLATE_VBoxBldProg_PCHFLAGS.kprofile   = $(TEMPLATE_VBoxBldProg_CXXFLAGS.kprofile)
-TEMPLATE_VBoxBldProg_LDFLAGS.x86         = -m32
-TEMPLATE_VBoxBldProg_LDFLAGS.sparc32     = -m32
-TEMPLATE_VBoxBldProg_LDFLAGS.amd64       = -m64
-TEMPLATE_VBoxBldProg_LDFLAGS.sparc64     = -m64
+ TEMPLATE_VBoxBldProg_CXXFLAGS.x86       = -m32
+ TEMPLATE_VBoxBldProg_CXXFLAGS.sparc32   = -m32
+ TEMPLATE_VBoxBldProg_CXXFLAGS.amd64     = -m64
+ TEMPLATE_VBoxBldProg_CXXFLAGS.sparc64   = -m64
+ TEMPLATE_VBoxBldProg_CXXFLAGS.release   = -O2 -fno-omit-frame-pointer -fno-strict-aliasing
+ TEMPLATE_VBoxBldProg_CXXFLAGS.profile   = $(TEMPLATE_VBoxBldProg_CXXFLAGS.release)
+ TEMPLATE_VBoxBldProg_CXXFLAGS.kprofile  = $(TEMPLATE_VBoxBldProg_CXXFLAGS.release)
+ TEMPLATE_VBoxBldProg_OBJCFLAGS          = $(TEMPLATE_VBoxBldProg_CFLAGS)
+ TEMPLATE_VBoxBldProg_OBJCFLAGS.x86      = $(TEMPLATE_VBoxBldProg_CFLAGS.x86)
+ TEMPLATE_VBoxBldProg_OBJCFLAGS.amd64    = $(TEMPLATE_VBoxBldProg_CFLAGS.amd64)
+ TEMPLATE_VBoxBldProg_OBJCFLAGS.release  = $(TEMPLATE_VBoxBldProg_CFLAGS.release)
+ TEMPLATE_VBoxBldProg_OBJCFLAGS.profile  = $(TEMPLATE_VBoxBldProg_CFLAGS.profile)
+ TEMPLATE_VBoxBldProg_OBJCFLAGS.kprofile = $(TEMPLATE_VBoxBldProg_CFLAGS.kprofile)
+ TEMPLATE_VBoxBldProg_OBJCXXFLAGS        = $(TEMPLATE_VBoxBldProg_CXXFLAGS)
+ TEMPLATE_VBoxBldProg_OBJCXXFLAGS.x86    = $(TEMPLATE_VBoxBldProg_CXXFLAGS.x86)
+ TEMPLATE_VBoxBldProg_OBJCXXFLAGS.amd64  = $(TEMPLATE_VBoxBldProg_CXXFLAGS.amd64)
+ TEMPLATE_VBoxBldProg_OBJCXXFLAGS.release = $(TEMPLATE_VBoxBldProg_CXXFLAGS.release)
+ TEMPLATE_VBoxBldProg_OBJCXXFLAGS.profile = $(TEMPLATE_VBoxBldProg_CXXFLAGS.profile)
+ TEMPLATE_VBoxBldProg_OBJCXXFLAGS.kprofile = $(TEMPLATE_VBoxBldProg_CXXFLAGS.kprofile)
+ TEMPLATE_VBoxBldProg_PCHFLAGS           = $(TEMPLATE_VBoxBldProg_CXXFLAGS)
+ TEMPLATE_VBoxBldProg_PCHFLAGS.x86       = $(TEMPLATE_VBoxBldProg_CXXFLAGS.x86)
+ TEMPLATE_VBoxBldProg_PCHFLAGS.amd64     = $(TEMPLATE_VBoxBldProg_CXXFLAGS.amd64)
+ TEMPLATE_VBoxBldProg_PCHFLAGS.release   = $(TEMPLATE_VBoxBldProg_CXXFLAGS.release)
+ TEMPLATE_VBoxBldProg_PCHFLAGS.profile   = $(TEMPLATE_VBoxBldProg_CXXFLAGS.profile)
+ TEMPLATE_VBoxBldProg_PCHFLAGS.kprofile  = $(TEMPLATE_VBoxBldProg_CXXFLAGS.kprofile)
+ TEMPLATE_VBoxBldProg_LDFLAGS.x86        = -m32
+ TEMPLATE_VBoxBldProg_LDFLAGS.sparc32    = -m32
+ TEMPLATE_VBoxBldProg_LDFLAGS.amd64      = -m64
+ TEMPLATE_VBoxBldProg_LDFLAGS.sparc64    = -m64
  ifeq ($(KBUILD_HOST),linux)
-TEMPLATE_VBoxBldProg_LIBS                = pthread m rt dl
+  TEMPLATE_VBoxBldProg_LIBS              = pthread m rt dl
  else ifeq ($(KBUILD_HOST),os2)
-TEMPLATE_VBoxBldProg_TOOL                = GXX3OMF
-TEMPLATE_VBoxBldProg_LIBS                = socket iconv
+  TEMPLATE_VBoxBldProg_TOOL              = GXX3OMF
+  TEMPLATE_VBoxBldProg_LIBS              = socket iconv
  else ifeq ($(KBUILD_HOST),darwin)
-TEMPLATE_VBoxBldProg_TOOL                = $(VBOX_GCC_TOOL)
+  TEMPLATE_VBoxBldProg_TOOL              = $(VBOX_GCC_TOOL)
   if "$(VBOX_DEF_MACOSX_VERSION_MIN)" == "10.7" || "$(VBOX_DARWIN_HOST_VERSION_MAJOR)" == "7"
-TEMPLATE_VBoxBldProg_DEFS.darwin         = $(VBOX_DARWIN_DEF_SDK_10_7_DEFS)
-TEMPLATE_VBoxBldProg_CFLAGS.darwin       = $(VBOX_DARWIN_DEF_SDK_10_7_CFLAGS) -fno-common
-TEMPLATE_VBoxBldProg_CXXFLAGS.darwin     = $(VBOX_DARWIN_DEF_SDK_10_7_CXXFLAGS)
-TEMPLATE_VBoxBldProg_PCHFLAGS.darwin     = $(VBOX_DARWIN_DEF_SDK_10_7_CXXFLAGS)
-TEMPLATE_VBoxBldProg_OBJCFLAGS.darwin    = $(VBOX_DARWIN_DEF_SDK_10_7_OBJCFLAGS) $(VBOX_GCC_PEDANTIC_C)
-TEMPLATE_VBoxBldProg_OBJCXXFLAGS.darwin  = $(VBOX_DARWIN_DEF_SDK_10_7_OBJCXXFLAGS) $(VBOX_GCC_PEDANTIC_CXX)
-TEMPLATE_VBoxBldProg_LDFLAGS.darwin      = $(VBOX_DARWIN_DEF_SDK_10_7_LDFLAGS)
+   TEMPLATE_VBoxBldProg_DEFS.darwin      = $(VBOX_DARWIN_DEF_SDK_10_7_DEFS)
+   TEMPLATE_VBoxBldProg_CFLAGS.darwin    = $(VBOX_DARWIN_DEF_SDK_10_7_CFLAGS) -fno-common
+   TEMPLATE_VBoxBldProg_CXXFLAGS.darwin  = $(VBOX_DARWIN_DEF_SDK_10_7_CXXFLAGS)
+   TEMPLATE_VBoxBldProg_PCHFLAGS.darwin  = $(VBOX_DARWIN_DEF_SDK_10_7_CXXFLAGS)
+   TEMPLATE_VBoxBldProg_OBJCFLAGS.darwin = $(VBOX_DARWIN_DEF_SDK_10_7_OBJCFLAGS) $(VBOX_GCC_PEDANTIC_C)
+   TEMPLATE_VBoxBldProg_OBJCXXFLAGS.darwin = $(VBOX_DARWIN_DEF_SDK_10_7_OBJCXXFLAGS) $(VBOX_GCC_PEDANTIC_CXX)
+   TEMPLATE_VBoxBldProg_LDFLAGS.darwin   = $(VBOX_DARWIN_DEF_SDK_10_7_LDFLAGS)
   else if "$(VBOX_DEF_MACOSX_VERSION_MIN)" == "10.6" || "$(VBOX_DARWIN_HOST_VERSION_MAJOR)" == "6"
-TEMPLATE_VBoxBldProg_DEFS.darwin         = $(VBOX_DARWIN_DEF_SDK_10_6_DEFS)
-TEMPLATE_VBoxBldProg_CFLAGS.darwin       = $(VBOX_DARWIN_DEF_SDK_10_6_CFLAGS) -fno-common
-TEMPLATE_VBoxBldProg_CXXFLAGS.darwin     = $(VBOX_DARWIN_DEF_SDK_10_6_CXXFLAGS)
-TEMPLATE_VBoxBldProg_PCHFLAGS.darwin     = $(VBOX_DARWIN_DEF_SDK_10_6_CXXFLAGS)
-TEMPLATE_VBoxBldProg_OBJCFLAGS.darwin    = $(VBOX_DARWIN_DEF_SDK_10_6_OBJCFLAGS) $(VBOX_GCC_PEDANTIC_C)
-TEMPLATE_VBoxBldProg_OBJCXXFLAGS.darwin  = $(VBOX_DARWIN_DEF_SDK_10_6_OBJCXXFLAGS) $(VBOX_GCC_PEDANTIC_CXX)
-TEMPLATE_VBoxBldProg_LDFLAGS.darwin      = $(VBOX_DARWIN_DEF_SDK_10_6_LDFLAGS)
+   TEMPLATE_VBoxBldProg_DEFS.darwin      = $(VBOX_DARWIN_DEF_SDK_10_6_DEFS)
+   TEMPLATE_VBoxBldProg_CFLAGS.darwin    = $(VBOX_DARWIN_DEF_SDK_10_6_CFLAGS) -fno-common
+   TEMPLATE_VBoxBldProg_CXXFLAGS.darwin  = $(VBOX_DARWIN_DEF_SDK_10_6_CXXFLAGS)
+   TEMPLATE_VBoxBldProg_PCHFLAGS.darwin  = $(VBOX_DARWIN_DEF_SDK_10_6_CXXFLAGS)
+   TEMPLATE_VBoxBldProg_OBJCFLAGS.darwin = $(VBOX_DARWIN_DEF_SDK_10_6_OBJCFLAGS) $(VBOX_GCC_PEDANTIC_C)
+   TEMPLATE_VBoxBldProg_OBJCXXFLAGS.darwin = $(VBOX_DARWIN_DEF_SDK_10_6_OBJCXXFLAGS) $(VBOX_GCC_PEDANTIC_CXX)
+   TEMPLATE_VBoxBldProg_LDFLAGS.darwin   = $(VBOX_DARWIN_DEF_SDK_10_6_LDFLAGS)
   else if "$(VBOX_DEF_MACOSX_VERSION_MIN)" == "10.5" || "$(VBOX_DARWIN_HOST_VERSION_MAJOR)" == "5" || defined(VBOX_MACOS_10_5_WORKAROUND)
-TEMPLATE_VBoxBldProg_DEFS.darwin         = $(VBOX_DARWIN_DEF_SDK_10_5_DEFS)
-TEMPLATE_VBoxBldProg_CFLAGS.darwin       = $(VBOX_DARWIN_DEF_SDK_10_5_CFLAGS) -fno-common
-TEMPLATE_VBoxBldProg_CXXFLAGS.darwin     = $(VBOX_DARWIN_DEF_SDK_10_5_CXXFLAGS)
-TEMPLATE_VBoxBldProg_PCHFLAGS.darwin     = $(VBOX_DARWIN_DEF_SDK_10_5_CXXFLAGS)
-TEMPLATE_VBoxBldProg_OBJCFLAGS.darwin    = $(VBOX_DARWIN_DEF_SDK_10_5_OBJCFLAGS) $(VBOX_GCC_PEDANTIC_C)
-TEMPLATE_VBoxBldProg_OBJCXXFLAGS.darwin  = $(VBOX_DARWIN_DEF_SDK_10_5_OBJCXXFLAGS) $(VBOX_GCC_PEDANTIC_CXX)
-TEMPLATE_VBoxBldProg_LDFLAGS.darwin      = $(VBOX_DARWIN_DEF_SDK_10_5_LDFLAGS)
+   TEMPLATE_VBoxBldProg_DEFS.darwin      = $(VBOX_DARWIN_DEF_SDK_10_5_DEFS)
+   TEMPLATE_VBoxBldProg_CFLAGS.darwin    = $(VBOX_DARWIN_DEF_SDK_10_5_CFLAGS) -fno-common
+   TEMPLATE_VBoxBldProg_CXXFLAGS.darwin  = $(VBOX_DARWIN_DEF_SDK_10_5_CXXFLAGS)
+   TEMPLATE_VBoxBldProg_PCHFLAGS.darwin  = $(VBOX_DARWIN_DEF_SDK_10_5_CXXFLAGS)
+   TEMPLATE_VBoxBldProg_OBJCFLAGS.darwin = $(VBOX_DARWIN_DEF_SDK_10_5_OBJCFLAGS) $(VBOX_GCC_PEDANTIC_C)
+   TEMPLATE_VBoxBldProg_OBJCXXFLAGS.darwin = $(VBOX_DARWIN_DEF_SDK_10_5_OBJCXXFLAGS) $(VBOX_GCC_PEDANTIC_CXX)
+   TEMPLATE_VBoxBldProg_LDFLAGS.darwin   = $(VBOX_DARWIN_DEF_SDK_10_5_LDFLAGS)
   else
-TEMPLATE_VBoxBldProg_SDKS.darwin         = $(VBOX_DARWIN_DEF_SDK_SDKS)
-TEMPLATE_VBoxBldProg_DEFS.darwin         = $(VBOX_DARWIN_DEF_SDK_DEFS)
-TEMPLATE_VBoxBldProg_CFLAGS.darwin       = $(VBOX_DARWIN_DEF_SDK_CFLAGS) -fno-common
-TEMPLATE_VBoxBldProg_CXXFLAGS.darwin     = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS)
-TEMPLATE_VBoxBldProg_PCHFLAGS.darwin     = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS)
-TEMPLATE_VBoxBldProg_OBJCFLAGS.darwin    = $(VBOX_DARWIN_DEF_SDK_OBJCFLAGS) $(VBOX_GCC_PEDANTIC_C)
-TEMPLATE_VBoxBldProg_OBJCXXFLAGS.darwin  = $(VBOX_DARWIN_DEF_SDK_OBJCXXFLAGS) $(VBOX_GCC_PEDANTIC_CXX)
-TEMPLATE_VBoxBldProg_LDFLAGS.darwin      = $(VBOX_DARWIN_DEF_SDK_LDFLAGS)
-  endif
-TEMPLATE_VBoxBldProg_LIBS                =
+   TEMPLATE_VBoxBldProg_SDKS.darwin      = $(VBOX_DARWIN_DEF_SDK_SDKS)
+   TEMPLATE_VBoxBldProg_DEFS.darwin      = $(VBOX_DARWIN_DEF_SDK_DEFS)
+   TEMPLATE_VBoxBldProg_CFLAGS.darwin    = $(VBOX_DARWIN_DEF_SDK_CFLAGS) -fno-common
+   TEMPLATE_VBoxBldProg_CXXFLAGS.darwin  = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS)
+   TEMPLATE_VBoxBldProg_PCHFLAGS.darwin  = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS)
+   TEMPLATE_VBoxBldProg_OBJCFLAGS.darwin = $(VBOX_DARWIN_DEF_SDK_OBJCFLAGS) $(VBOX_GCC_PEDANTIC_C)
+   TEMPLATE_VBoxBldProg_OBJCXXFLAGS.darwin = $(VBOX_DARWIN_DEF_SDK_OBJCXXFLAGS) $(VBOX_GCC_PEDANTIC_CXX)
+   TEMPLATE_VBoxBldProg_LDFLAGS.darwin   = $(VBOX_DARWIN_DEF_SDK_LDFLAGS)
+  endif
+  TEMPLATE_VBoxBldProg_LIBS              =
  else ifeq ($(KBUILD_HOST),haiku)
-TEMPLATE_VBoxBldProg_TOOL                = GXX3
-TEMPLATE_VBoxBldProg_LIBS                = network iconv
-TEMPLATE_VBoxBldProg_LIBPATH            += \
-        /boot/common/lib
+  TEMPLATE_VBoxBldProg_TOOL              = GXX3
+  TEMPLATE_VBoxBldProg_LIBS              = network iconv
+  TEMPLATE_VBoxBldProg_LIBPATH          += \
+        /boot/common/lib
  else if1of ($(KBUILD_HOST), freebsd openbsd)
-TEMPLATE_VBoxBldProg_TOOL                = $(VBOX_GCC_TOOL)
-TEMPLATE_VBoxBldProg_LIBS                = pthread
-TEMPLATE_VBoxBldProg_INCS               += \
-        /usr/include \
-        /usr/X11R6/include \
-        /usr/local/include
-TEMPLATE_VBoxBldProg_LIBPATH            += \
-        /usr/lib \
-        /usr/X11R6/lib \
-        /usr/local/lib
+  TEMPLATE_VBoxBldProg_TOOL              = $(VBOX_GCC_TOOL)
+  TEMPLATE_VBoxBldProg_LIBS              = pthread
+  TEMPLATE_VBoxBldProg_INCS             += \
+        /usr/include \
+        /usr/X11R6/include \
+        /usr/local/include
+  TEMPLATE_VBoxBldProg_LIBPATH          += \
+        /usr/lib \
+        /usr/X11R6/lib \
+        /usr/local/lib
  else ifeq ($(KBUILD_HOST),netbsd)
-TEMPLATE_VBoxBldProg_TOOL                = GXX3
-TEMPLATE_VBoxBldProg_LIBS                = pthread
-TEMPLATE_VBoxBldProg_INCS               += \
-        /usr/include \
-        /usr/X11R7/include
-TEMPLATE_VBoxBldProg_LIBPATH            += \
-        /usr/lib \
-        /usr/X11R7/lib
+  TEMPLATE_VBoxBldProg_TOOL              = GXX3
+  TEMPLATE_VBoxBldProg_LIBS              = pthread
+  TEMPLATE_VBoxBldProg_INCS             += \
+        /usr/include \
+        /usr/X11R7/include
+  TEMPLATE_VBoxBldProg_LIBPATH          += \
+        /usr/lib \
+        /usr/X11R7/lib
  else ifeq ($(KBUILD_HOST),solaris)
-TEMPLATE_VBoxBldProg_TOOL                = GXX3PLAIN
-TEMPLATE_VBoxBldProg_LIBS                = rt
+  TEMPLATE_VBoxBldProg_TOOL              = GXX3PLAIN
+  TEMPLATE_VBoxBldProg_LIBS              = rt
  else
-$(warning Warning: VBOX Build: Target $(KBUILD_HOST) is not officially supported!)
+  $(warning Warning: VBOX Build: Target $(KBUILD_HOST) is not officially supported!)
  endif
 
@@ -8240 +8240 @@
 TEMPLATE_VBoxAdvBldProg_EXTENDS = VBoxBldProg
 TEMPLATE_VBoxAdvBldProg_SDKS    = $(TEMPLATE_VBoxBldProg_SDKS)
-TEMPLATE_VBoxAdvBldProg_SDKS.win= $(TEMPLATE_VBoxBldProg_SDKS.win) VBoxNtDll
+TEMPLATE_VBoxAdvBldProg_SDKS.win = $(TEMPLATE_VBoxBldProg_SDKS.win) VBoxNtDll
 TEMPLATE_VBoxAdvBldProg_DEFS    = $(TEMPLATE_VBoxBldProg_DEFS) IN_RT_R3 IN_ADV_BLD_PROG
 ifeq ($(KBUILD_HOST),win)
@@ -8285 +8285 @@
 else
  WIN32_MC = $(EXEC_X86_WIN32) $(firstword $(wildcard \
-        $(PATH_SDK_$(VBOX_WINPSDK)_BIN)/MC.Exe\
-        $(PATH_SDK_WINPSDK_BIN)/MC.Exe\
-        $(PATH_SDK_WINPSDK)/Bin/MC.Exe\
-        $(PATH_SDK_WIN32SDK_BIN)/MC.Exe\
-        $(PATH_SDK_WIN64SDK_BIN)/MC.Exe\
-        $(KBUILD_DEVTOOLS)/win.x86/bin/mc.exe\
-        ) Sorry_Cannot_find_mc_in_the_PSDK)
+        $(PATH_SDK_$(VBOX_WINPSDK)_BIN)/MC.Exe \
+        $(PATH_SDK_WINPSDK_BIN)/MC.Exe \
+        $(PATH_SDK_WINPSDK)/Bin/MC.Exe \
+        $(PATH_SDK_WIN32SDK_BIN)/MC.Exe \
+        $(PATH_SDK_WIN64SDK_BIN)/MC.Exe \
+        $(KBUILD_DEVTOOLS)/win.x86/bin/mc.exe \
+        ) Sorry_Cannot_find_mc_in_the_PSDK)
 endif
 
@@ -8375 +8375 @@
 else if1of ($(KBUILD_TARGET), darwin freebsd openbsd)
  TEMPLATE_VBoxGuestR3ExeBase_LIBS     = $(TEMPLATE_$(TEMPLATE_VBoxGuestR3ExeBase_EXTENDS)_LIBS) iconv
-else ifeq ($(KBUILD_TARGET), solaris)
+else ifeq ($(KBUILD_TARGET),solaris)
  TEMPLATE_VBoxGuestR3ExeBase_LIBS     = $(TEMPLATE_$(TEMPLATE_VBoxGuestR3ExeBase_EXTENDS)_LIBS) nsl
 endif
@@ -8407 +8407 @@
  endif
  TEMPLATE_VBoxGuestR3Exe_LIBS.x86      = \
-        $(VBOX_LIB_IPRT_GUEST_R3_X86) \
-        $(VBOX_LIB_VBGL_R3_X86) \
-        $(VBOX_LIB_IPRT_GUEST_R3_X86) \
-        $(TEMPLATE_VBoxGuestR3ExeBase_LIBS.x86)
+        $(VBOX_LIB_IPRT_GUEST_R3_X86) \
+        $(VBOX_LIB_VBGL_R3_X86) \
+        $(VBOX_LIB_IPRT_GUEST_R3_X86) \
+        $(TEMPLATE_VBoxGuestR3ExeBase_LIBS.x86)
  TEMPLATE_VBoxGuestR3Exe_LIBS.$(KBUILD_TARGET_ARCH) = \
-        $(VBOX_LIB_IPRT_GUEST_R3) \
-        $(VBOX_LIB_VBGL_R3) \
-        $(VBOX_LIB_IPRT_GUEST_R3) \
-        $(TEMPLATE_VBoxGuestR3ExeBase_LIBS.$(KBUILD_TARGET_ARCH))
+        $(VBOX_LIB_IPRT_GUEST_R3) \
+        $(VBOX_LIB_VBGL_R3) \
+        $(VBOX_LIB_IPRT_GUEST_R3) \
+        $(TEMPLATE_VBoxGuestR3ExeBase_LIBS.$(KBUILD_TARGET_ARCH))
 else
  TEMPLATE_VBoxGuestR3Exe_CFLAGS        = $(TEMPLATE_VBoxGuestR3ExeBase_CFLAGS) $(VBOX_GCC_WERR)
@@ -8508 +8508 @@
  TEMPLATE_NewerVccVBoxGuestR3Dll_CXXFLAGS        = \
         $(filter-out $(VBOX_VCC_WARN_ALL) $(VBOX_VCC_WERR), $(TEMPLATE_VBoxGuestR3DllNonPedantic_CXXFLAGS)) \
-        $(VBOX_NEWER_VCC_WARN_ALL) $(VBOX_VCC_WERR)
+        $(VBOX_NEWER_VCC_WARN_ALL) $(VBOX_VCC_WERR)
  TEMPLATE_NewerVccVBoxGuestR3Dll_CFLAGS          = $(TEMPLATE_NewerVccVBoxGuestR3DllNonPedantic_CXXFLAGS)
  ifndef VBOX_WITH_NOCRT_STATIC
-# Hack begin
-# Does not work when building x86 for amd64 build (No rule to make target /oldnames.lib).
-# TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.x86        = \
-#       $(subst $(PATH_TOOL_$(TEMPLATE_VBoxGuestR3DllNonPedantic_TOOL.win.x86)_LIB),$(PATH_TOOL_$(TEMPLATE_NewerVccVBoxGuestR3Dll_TOOL.win.x86)_LIB), $(TEMPLATE_VBoxGuestR3DllNonPedantic_LIBS.x86))
-# TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.amd64      = \
-#       $(subst $(PATH_TOOL_$(TEMPLATE_VBoxGuestR3DllNonPedantic_TOOL.win.amd64)_LIB),$(PATH_TOOL_$(TEMPLATE_NewerVccVBoxGuestR3Dll_TOOL.win.amd64)_LIB), $(TEMPLATE_VBoxGuestR3DllNonPedantic_LIBS.amd64))
-# Directly assign TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.
+  # Hack begin
+  # Does not work when building x86 for amd64 build (No rule to make target /oldnames.lib).
+  # TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.x86        = \
+  #     $(subst $(PATH_TOOL_$(TEMPLATE_VBoxGuestR3DllNonPedantic_TOOL.win.x86)_LIB),$(PATH_TOOL_$(TEMPLATE_NewerVccVBoxGuestR3Dll_TOOL.win.x86)_LIB), $(TEMPLATE_VBoxGuestR3DllNonPedantic_LIBS.x86))
+  # TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.amd64      = \
+  #     $(subst $(PATH_TOOL_$(TEMPLATE_VBoxGuestR3DllNonPedantic_TOOL.win.amd64)_LIB),$(PATH_TOOL_$(TEMPLATE_NewerVccVBoxGuestR3Dll_TOOL.win.amd64)_LIB), $(TEMPLATE_VBoxGuestR3DllNonPedantic_LIBS.amd64))
+  # Directly assign TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.
   TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.x86           = \
         $(PATH_TOOL_$(TEMPLATE_NewerVccVBoxGuestR3Dll_TOOL.win.x86)_LIB)/oldnames.lib \
@@ -8527 +8527 @@
         $(PATH_TOOL_$(TEMPLATE_NewerVccVBoxGuestR3Dll_TOOL.win.amd64)_LIB)/libcpmt$(VBOX_VCC_CRT_TYPE).lib
  endif # !VBOX_WITH_NOCRT_STATIC
-# Hack end
+ # Hack end
 endif
 TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS             = \
@@ -8575 +8575 @@
         IN_RT_STATIC
 ifndef VBOX_WITH_NOCRT_STATIC
-TEMPLATE_VBoxGuestR3NoCrtExe_DEFS.win        = $(TEMPLATE_VBoxGuestR3Exe_DEFS.win) \
-        RT_WITHOUT_NOCRT_WRAPPERS
+ TEMPLATE_VBoxGuestR3NoCrtExe_DEFS.win       = $(TEMPLATE_VBoxGuestR3Exe_DEFS.win) \
+        RT_WITHOUT_NOCRT_WRAPPERS
 endif
 TEMPLATE_VBoxGuestR3NoCrtExe_LIBS            = \
         $(PATH_STAGE_LIB)/RuntimeR3NoCrt$(VBOX_SUFF_LIB)
 ifeq ($(KBUILD_TARGET),win)
-TEMPLATE_VBoxGuestR3NoCrtExe_LIBS.x86        = $(NO_SUCH_VARIABLE)
-TEMPLATE_VBoxGuestR3NoCrtExe_LIBS.amd64      = $(NO_SUCH_VARIABLE)
-TEMPLATE_VBoxGuestR3NoCrtExe_LIBS.win        = $(NO_SUCH_VARIABLE)
-TEMPLATE_VBoxGuestR3NoCrtExe_LIBS.win.x86    = \
-        $(PATH_TOOL_$(TEMPLATE_VBoxGuestR3NoCrtExe_TOOL.win.x86)_LIB)/chkstk.obj
-TEMPLATE_VBoxGuestR3NoCrtExe_SDKS.win.x86    = VBoxWinInt64Lib
-TEMPLATE_VBoxGuestR3NoCrtExe_LDFLAGS         = $(filter-out $(VBOX_VCC_LD_GUARD_CF) $(VBOX_VCC_SANITIZER_LDFLAGS), $(TEMPLATE_VBoxGuestR3Exe_LDFLAGS))
-TEMPLATE_VBoxGuestR3NoCrtExe_LDFLAGS.win.x86 = $(filter-out -Include%, $(TEMPLATE_VBoxGuestR3Exe_LDFLAGS.win.x86))
-TEMPLATE_VBoxGuestR3NoCrtExe_LDFLAGS.win     = $(TEMPLATE_VBoxGuestR3Exe_LDFLAGS.win) /entry:CustomMainEntrypoint /subsystem:console
-TEMPLATE_VBoxGuestR3NoCrtExe_CFLAGS          = $(filter-out -EH% -GS $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3Exe_CFLAGS)) /GS- -EHs-
-TEMPLATE_VBoxGuestR3NoCrtExe_CXXFLAGS        = $(filter-out -EH% -GS $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3Exe_CXXFLAGS)) /GS- -EHs-
-TEMPLATE_VBoxGuestR3NoCrtExe_PCHFLAGS        = $(filter-out -EH% -GS $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3Exe_PCHFLAGS)) /GS- -EHs-
-TEMPLATE_VBoxGuestR3NoCrtExe_CXXFLAGS.debug  = $(filter-out /RTC% -RTC%, $(TEMPLATE_VBoxGuestR3Exe_CXXFLAGS.debug))
+ TEMPLATE_VBoxGuestR3NoCrtExe_LIBS.x86       = $(NO_SUCH_VARIABLE)
+ TEMPLATE_VBoxGuestR3NoCrtExe_LIBS.amd64     = $(NO_SUCH_VARIABLE)
+ TEMPLATE_VBoxGuestR3NoCrtExe_LIBS.win       = $(NO_SUCH_VARIABLE)
+ TEMPLATE_VBoxGuestR3NoCrtExe_LIBS.win.x86   = \
+        $(PATH_TOOL_$(TEMPLATE_VBoxGuestR3NoCrtExe_TOOL.win.x86)_LIB)/chkstk.obj
+ TEMPLATE_VBoxGuestR3NoCrtExe_SDKS.win.x86   = VBoxWinInt64Lib
+ TEMPLATE_VBoxGuestR3NoCrtExe_LDFLAGS        = $(filter-out $(VBOX_VCC_LD_GUARD_CF) $(VBOX_VCC_SANITIZER_LDFLAGS), $(TEMPLATE_VBoxGuestR3Exe_LDFLAGS))
+ TEMPLATE_VBoxGuestR3NoCrtExe_LDFLAGS.win.x86 = $(filter-out -Include%, $(TEMPLATE_VBoxGuestR3Exe_LDFLAGS.win.x86))
+ TEMPLATE_VBoxGuestR3NoCrtExe_LDFLAGS.win    = $(TEMPLATE_VBoxGuestR3Exe_LDFLAGS.win) /entry:CustomMainEntrypoint /subsystem:console
+ TEMPLATE_VBoxGuestR3NoCrtExe_CFLAGS         = $(filter-out -EH% -GS $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3Exe_CFLAGS)) /GS- -EHs-
+ TEMPLATE_VBoxGuestR3NoCrtExe_CXXFLAGS       = $(filter-out -EH% -GS $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3Exe_CXXFLAGS)) /GS- -EHs-
+ TEMPLATE_VBoxGuestR3NoCrtExe_PCHFLAGS       = $(filter-out -EH% -GS $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3Exe_PCHFLAGS)) /GS- -EHs-
+ TEMPLATE_VBoxGuestR3NoCrtExe_CXXFLAGS.debug = $(filter-out /RTC% -RTC%, $(TEMPLATE_VBoxGuestR3Exe_CXXFLAGS.debug))
 else
-TEMPLATE_VBoxGuestR3NoCrtExe_CXXFLAGS        = $(TEMPLATE_VBoxGuestR3Exe_CXXFLAGS) -fno-exceptions
-TEMPLATE_VBoxGuestR3NoCrtExe_PCHFLAGS        = $(TEMPLATE_VBoxGuestR3Exe_PCHFLAGS) -fno-exceptions
+ TEMPLATE_VBoxGuestR3NoCrtExe_CXXFLAGS       = $(TEMPLATE_VBoxGuestR3Exe_CXXFLAGS) -fno-exceptions
+ TEMPLATE_VBoxGuestR3NoCrtExe_PCHFLAGS       = $(TEMPLATE_VBoxGuestR3Exe_PCHFLAGS) -fno-exceptions
 endif
 
@@ -8715 +8715 @@
 # VBOX_LIB_IPRT_GUEST_R0_NT4      = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR0NT4$(VBOX_SUFF_LIB)
 #else
- VBOX_LIB_IPRT_GUEST_R0_NT4      = $(VBOX_LIB_IPRT_GUEST_R0)
+VBOX_LIB_IPRT_GUEST_R0_NT4       = $(VBOX_LIB_IPRT_GUEST_R0)
 #endif
 VBOX_LIB_VBGL_R3                 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3Lib$(VBOX_SUFF_LIB)
@@ -8777 +8777 @@
 
 if $(words $(VBOX_VER_TMP1)) == 3 || ($(words $(VBOX_VER_TMP1)) == 2 && "$(VBOX_BUILD_PUBLISHER)" == "")
- if      "$(substr $(word 2,$(VBOX_VER_TMP1)),1,4)" == "BETA"
+ if "$(substr $(word 2,$(VBOX_VER_TMP1)),1,4)" == "BETA"
   VBOX_VER_TMP2 = 5
  else if "$(substr $(word 2,$(VBOX_VER_TMP1)),1,5)" == "ALPHA"
@@ -8899 +8899 @@
   # VBOX_LICENSE_VER is used in several Makefiles
   VBOX_LICENSE_VER_KMK = $(PATH_OUT)/license-version.kmk
-$(VBOX_LICENSE_VER_KMK): $(VBOX_BRAND_LICENSE_HTML)
+  $(VBOX_LICENSE_VER_KMK): $(VBOX_BRAND_LICENSE_HTML)
         $(call MSG_GENERATE,,$(VBOX_LICENSE_VER_KMK))
         $(QUIET)$(MKDIR) -p $(@D)
@@ -8911 +8911 @@
   ifdef VBOX_LICENSE_VER
    VBOX_LICENSE_FILES = \
-         License-$(VBOX_LICENSE_VER).html \
-         $(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES),License-$(VBOX_LICENSE_VER)-$(f).html)
+        License-$(VBOX_LICENSE_VER).html \
+        $(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES),License-$(VBOX_LICENSE_VER)-$(f).html)
    VBOX_LICENSE_BINS = $(addprefix $(PATH_STAGE_BIN)/,$(VBOX_LICENSE_FILES))
   endif
@@ -8920 +8920 @@
 
 ifeq ($(KBUILD_TARGET),darwin)
-$(VBOX_DARWIN_ENTITLEMENTS_FILE):
+ $(VBOX_DARWIN_ENTITLEMENTS_FILE):
         $(call MSG_GENERATE,,$@)
         $(QUIET)$(MKDIR) -p $(@D)
@@ -8935 +8935 @@
 
 ifndef VBOX_NOINC_MISC
-# Force building of the version header file as the first thing anywhere in
-# the tree. This eliminates the need for manual dependencies on it.
-## @todo there gotta be a better way of doing this.
-Makefile.kmk: | $(VBOX_VERSION_HEADER) $(VBOX_VERSION_MK) $(VBOX_PRODUCT_HEADER) $(VBOX_PACKAGE_HEADER)
+ # Force building of the version header file as the first thing anywhere in
+ # the tree. This eliminates the need for manual dependencies on it.
+ ## @todo there gotta be a better way of doing this.
+ Makefile.kmk: | $(VBOX_VERSION_HEADER) $(VBOX_VERSION_MK) $(VBOX_PRODUCT_HEADER) $(VBOX_PACKAGE_HEADER)
  ifeq ($(KBUILD_TARGET),darwin)
-Makefile.kmk: | $(VBOX_DARWIN_ENTITLEMENTS_FILE)
+  Makefile.kmk: | $(VBOX_DARWIN_ENTITLEMENTS_FILE)
  endif
 endif
@@ -8967 +8967 @@
  endif
 
-# Rule for generating a timestamp and updating the real thing on change.
-$(VBOX_SVN_REV_KMK).ts +| $(VBOX_SVN_REV_KMK): $(if $(VBOX_SVN_DEP), $(VBOX_SVN_DEP), $(PATH_ROOT)/Config.kmk)
+ # Rule for generating a timestamp and updating the real thing on change.
+ $(VBOX_SVN_REV_KMK).ts +| $(VBOX_SVN_REV_KMK): $(if $(VBOX_SVN_DEP), $(VBOX_SVN_DEP), $(PATH_ROOT)/Config.kmk)
         $(call MSG_GENERATE,,$(VBOX_SVN_REV_KMK))
         $(QUIET)$(RM) -f $@ [email protected]
@@ -8987 +8987 @@
  endif
 else
-# allow to overwrite VBOX_SVN_REV externally (mainly for building .debs/.rpms)
-$(VBOX_SVN_REV_KMK):
+ # allow to overwrite VBOX_SVN_REV externally (mainly for building .debs/.rpms)
+ $(VBOX_SVN_REV_KMK):
         $(call MSG_GENERATE,,$(VBOX_SVN_REV_KMK))
         $(QUIET)$(RM) -f $@
@@ -9059 +9059 @@
                 build-release-$(KBUILD_TARGET_ARCH) \
                 build-debug-$(KBUILD_TARGET_ARCH)
-both-x86-amd64     both-amd64-x86: \
+both-x86-amd64 both-amd64-x86: \
                 build-$(KBUILD_TYPE)-x86 \
                 build-$(KBUILD_TYPE)-x86