Index: trunk/src/VBox/HostDrivers/Support/linux/Makefile
===================================================================
--- trunk/src/VBox/HostDrivers/Support/linux/Makefile	(revision 85522)
+++ trunk/src/VBox/HostDrivers/Support/linux/Makefile	(revision 85523)
@@ -44,5 +44,6 @@
 ifndef VBOX_WITHOUT_COMBINED_SOURCES
 VBOXMOD_OBJS += \
-	combined-agnostic.o \
+	combined-agnostic1.o \
+	combined-agnostic2.o \
 	combined-os-specific.o
 else  # VBOX_WITHOUT_COMBINED_SOURCES
Index: trunk/src/VBox/HostDrivers/Support/linux/combined-agnostic.c
===================================================================
--- trunk/src/VBox/HostDrivers/Support/linux/combined-agnostic.c	(revision 85522)
+++ 	(revision )
@@ -1,163 +1,0 @@
-/* $Id$ */
-/** @file
- * SUPDrv - Combine a bunch of OS agnostic sources into one compile unit.
- */
-
-/*
- * Copyright (C) 2006-2020 Oracle Corporation
- *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) as published by the Free Software
- * Foundation, in version 2 as it comes in the "COPYING" file of the
- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
- *
- * The contents of this file may alternatively be used under the terms
- * of the Common Development and Distribution License Version 1.0
- * (CDDL) only, as it comes in the "COPYING.CDDL" file of the
- * VirtualBox OSE distribution, in which case the provisions of the
- * CDDL are applicable instead of those of the GPL.
- *
- * You may elect to license modified versions of this file under the
- * terms and conditions of either the GPL or the CDDL or both.
- */
-
-#define LOG_GROUP LOG_GROUP_DEFAULT
-#include "internal/iprt.h"
-#include <VBox/log.h>
-
-#undef LOG_GROUP
-#include "r0drv/alloc-r0drv.c"
-#undef LOG_GROUP
-#include "r0drv/initterm-r0drv.c"
-#undef LOG_GROUP
-#include "r0drv/memobj-r0drv.c"
-#undef LOG_GROUP
-#include "r0drv/mpnotification-r0drv.c"
-#undef LOG_GROUP
-#include "r0drv/powernotification-r0drv.c"
-#undef LOG_GROUP
-#include "r0drv/generic/semspinmutex-r0drv-generic.c"
-#undef LOG_GROUP
-#include "common/alloc/alloc.c"
-#undef LOG_GROUP
-#include "common/checksum/crc32.c"
-#undef LOG_GROUP
-#include "common/checksum/ipv4.c"
-#undef LOG_GROUP
-#include "common/checksum/ipv6.c"
-#undef LOG_GROUP
-#include "common/err/errinfo.c"
-#undef LOG_GROUP
-#include "common/log/log.c"
-#undef LOG_GROUP
-#include "common/log/logellipsis.c"
-#undef LOG_GROUP
-#include "common/log/logrel.c"
-#undef LOG_GROUP
-#include "common/log/logrelellipsis.c"
-#undef LOG_GROUP
-#include "common/log/logcom.c"
-#undef LOG_GROUP
-#include "common/log/logformat.c"
-#undef LOG_GROUP
-#include "common/misc/RTAssertMsg1Weak.c"
-#undef LOG_GROUP
-#include "common/misc/RTAssertMsg2.c"
-#undef LOG_GROUP
-#include "common/misc/RTAssertMsg2Add.c"
-#undef LOG_GROUP
-#include "common/misc/RTAssertMsg2AddWeak.c"
-#undef LOG_GROUP
-#include "common/misc/RTAssertMsg2AddWeakV.c"
-#undef LOG_GROUP
-#include "common/misc/RTAssertMsg2Weak.c"
-#undef LOG_GROUP
-#include "common/misc/RTAssertMsg2WeakV.c"
-#undef LOG_GROUP
-#include "common/misc/assert.c"
-#undef LOG_GROUP
-#include "common/misc/handletable.c"
-#undef LOG_GROUP
-#include "common/misc/handletablectx.c"
-#undef LOG_GROUP
-#include "common/misc/thread.c"
-#undef LOG_GROUP
-#include "common/string/RTStrCat.c"
-#undef LOG_GROUP
-#include "common/string/RTStrCopy.c"
-#undef LOG_GROUP
-#include "common/string/RTStrCopyEx.c"
-#undef LOG_GROUP
-#include "common/string/RTStrCopyP.c"
-#undef LOG_GROUP
-#include "common/string/RTStrEnd.c"
-#undef LOG_GROUP
-#include "common/string/RTStrNCmp.c"
-#undef LOG_GROUP
-#include "common/string/RTStrNLen.c"
-#undef LOG_GROUP
-#include "common/string/stringalloc.c"
-#undef LOG_GROUP
-#include "common/string/strformat.c"
-#undef LOG_GROUP
-#include "common/string/strformatnum.c"
-#undef LOG_GROUP
-#include "common/string/strformattype.c"
-#undef LOG_GROUP
-#include "common/string/strprintf.c"
-#undef LOG_GROUP
-#include "common/string/strtonum.c"
-#undef LOG_GROUP
-#include "common/table/avlpv.c"
-#undef LOG_GROUP
-#include "common/time/time.c"
-#undef LOG_GROUP
-#include "generic/RTAssertShouldPanic-generic.c"
-#undef LOG_GROUP
-#include "generic/RTLogWriteStdErr-stub-generic.c"
-#undef LOG_GROUP
-#include "generic/RTLogWriteStdOut-stub-generic.c"
-#undef LOG_GROUP
-#include "generic/RTLogWriteUser-generic.c"
-#undef LOG_GROUP
-#include "generic/RTMpGetArraySize-generic.c"
-#undef LOG_GROUP
-#include "generic/RTMpGetCoreCount-generic.c"
-#undef LOG_GROUP
-#include "generic/RTSemEventWait-2-ex-generic.c"
-#undef LOG_GROUP
-#include "generic/RTSemEventWaitNoResume-2-ex-generic.c"
-#undef LOG_GROUP
-#include "generic/RTSemEventMultiWait-2-ex-generic.c"
-#undef LOG_GROUP
-#include "generic/RTSemEventMultiWaitNoResume-2-ex-generic.c"
-#undef LOG_GROUP
-#include "generic/RTTimerCreate-generic.c"
-#undef LOG_GROUP
-#include "generic/errvars-generic.c"
-#undef LOG_GROUP
-#include "generic/mppresent-generic.c"
-#undef LOG_GROUP
-#include "generic/uuid-generic.c"
-#undef LOG_GROUP
-#include "VBox/log-vbox.c"
-
-#ifdef RT_ARCH_AMD64
-# undef LOG_GROUP
-# include "common/alloc/heapsimple.c"
-#endif
-
-#if 0 /*def RT_ARCH_X86 - iprt/nocrt/limit.h clashes.*/
-# include "common/math/gcc/divdi3.c"
-# include "common/math/gcc/moddi3.c"
-# include "common/math/gcc/udivdi3.c"
-# include "common/math/gcc/udivmoddi4.c"
-# include "common/math/gcc/umoddi3.c"
-# include "common/math/gcc/qdivrem.c"
-#endif
-
-
-
Index: trunk/src/VBox/HostDrivers/Support/linux/combined-agnostic1.c
===================================================================
--- trunk/src/VBox/HostDrivers/Support/linux/combined-agnostic1.c	(revision 85523)
+++ trunk/src/VBox/HostDrivers/Support/linux/combined-agnostic1.c	(revision 85523)
@@ -0,0 +1,87 @@
+/* $Id$ */
+/** @file
+ * SUPDrv - Combine a bunch of OS agnostic sources into one compile unit.
+ */
+
+/*
+ * Copyright (C) 2006-2020 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ *
+ * The contents of this file may alternatively be used under the terms
+ * of the Common Development and Distribution License Version 1.0
+ * (CDDL) only, as it comes in the "COPYING.CDDL" file of the
+ * VirtualBox OSE distribution, in which case the provisions of the
+ * CDDL are applicable instead of those of the GPL.
+ *
+ * You may elect to license modified versions of this file under the
+ * terms and conditions of either the GPL or the CDDL or both.
+ */
+
+#define LOG_GROUP LOG_GROUP_DEFAULT
+#include "internal/iprt.h"
+#include <VBox/log.h>
+
+#undef LOG_GROUP
+#include "r0drv/alloc-r0drv.c"
+#undef LOG_GROUP
+#include "r0drv/initterm-r0drv.c"
+#undef LOG_GROUP
+#include "r0drv/memobj-r0drv.c"
+#undef LOG_GROUP
+#include "r0drv/mpnotification-r0drv.c"
+#undef LOG_GROUP
+#include "r0drv/powernotification-r0drv.c"
+#undef LOG_GROUP
+#include "r0drv/generic/semspinmutex-r0drv-generic.c"
+#undef LOG_GROUP
+#include "common/alloc/alloc.c"
+#undef LOG_GROUP
+#include "common/checksum/crc32.c"
+#undef LOG_GROUP
+#include "common/checksum/ipv4.c"
+#undef LOG_GROUP
+#include "common/checksum/ipv6.c"
+#undef LOG_GROUP
+#include "common/err/errinfo.c"
+#undef LOG_GROUP
+#include "common/log/log.c"
+#undef LOG_GROUP
+#include "common/log/logellipsis.c"
+#undef LOG_GROUP
+#include "common/log/logrel.c"
+#undef LOG_GROUP
+#include "common/log/logrelellipsis.c"
+#undef LOG_GROUP
+#include "common/log/logcom.c"
+#undef LOG_GROUP
+#include "common/log/logformat.c"
+#undef LOG_GROUP
+#include "common/misc/RTAssertMsg1Weak.c"
+#undef LOG_GROUP
+#include "common/misc/RTAssertMsg2.c"
+#undef LOG_GROUP
+#include "common/misc/RTAssertMsg2Add.c"
+#undef LOG_GROUP
+#include "common/misc/RTAssertMsg2AddWeak.c"
+#undef LOG_GROUP
+#include "common/misc/RTAssertMsg2AddWeakV.c"
+#undef LOG_GROUP
+#include "common/misc/RTAssertMsg2Weak.c"
+#undef LOG_GROUP
+#include "common/misc/RTAssertMsg2WeakV.c"
+#undef LOG_GROUP
+#include "common/misc/assert.c"
+#undef LOG_GROUP
+#include "common/misc/handletable.c"
+#undef LOG_GROUP
+#include "common/misc/handletablectx.c"
+#undef LOG_GROUP
+#include "common/misc/thread.c"
+
Index: trunk/src/VBox/HostDrivers/Support/linux/combined-agnostic2.c
===================================================================
--- trunk/src/VBox/HostDrivers/Support/linux/combined-agnostic2.c	(revision 85523)
+++ trunk/src/VBox/HostDrivers/Support/linux/combined-agnostic2.c	(revision 85523)
@@ -0,0 +1,96 @@
+/* $Id$ */
+/** @file
+ * SUPDrv - Combine a bunch of OS agnostic sources into one compile unit.
+ */
+
+/*
+ * Copyright (C) 2006-2020 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ *
+ * The contents of this file may alternatively be used under the terms
+ * of the Common Development and Distribution License Version 1.0
+ * (CDDL) only, as it comes in the "COPYING.CDDL" file of the
+ * VirtualBox OSE distribution, in which case the provisions of the
+ * CDDL are applicable instead of those of the GPL.
+ *
+ * You may elect to license modified versions of this file under the
+ * terms and conditions of either the GPL or the CDDL or both.
+ */
+
+#define LOG_GROUP LOG_GROUP_DEFAULT
+#include "internal/iprt.h"
+#include <VBox/log.h>
+
+#undef LOG_GROUP
+#include "common/string/RTStrCat.c"
+#undef LOG_GROUP
+#include "common/string/RTStrCopy.c"
+#undef LOG_GROUP
+#include "common/string/RTStrCopyEx.c"
+#undef LOG_GROUP
+#include "common/string/RTStrCopyP.c"
+#undef LOG_GROUP
+#include "common/string/RTStrEnd.c"
+#undef LOG_GROUP
+#include "common/string/RTStrNCmp.c"
+#undef LOG_GROUP
+#include "common/string/RTStrNLen.c"
+#undef LOG_GROUP
+#include "common/string/stringalloc.c"
+#undef LOG_GROUP
+#include "common/string/strformat.c"
+#undef LOG_GROUP
+#include "common/string/strformatnum.c"
+#undef LOG_GROUP
+#include "common/string/strformattype.c"
+#undef LOG_GROUP
+#include "common/string/strprintf.c"
+#undef LOG_GROUP
+#include "common/string/strtonum.c"
+#undef LOG_GROUP
+#include "common/table/avlpv.c"
+#undef LOG_GROUP
+#include "common/time/time.c"
+#undef LOG_GROUP
+#include "generic/RTAssertShouldPanic-generic.c"
+#undef LOG_GROUP
+#include "generic/RTLogWriteStdErr-stub-generic.c"
+#undef LOG_GROUP
+#include "generic/RTLogWriteStdOut-stub-generic.c"
+#undef LOG_GROUP
+#include "generic/RTLogWriteUser-generic.c"
+#undef LOG_GROUP
+#include "generic/RTMpGetArraySize-generic.c"
+#undef LOG_GROUP
+#include "generic/RTMpGetCoreCount-generic.c"
+#undef LOG_GROUP
+#include "generic/RTSemEventWait-2-ex-generic.c"
+#undef LOG_GROUP
+#include "generic/RTSemEventWaitNoResume-2-ex-generic.c"
+#undef LOG_GROUP
+#include "generic/RTSemEventMultiWait-2-ex-generic.c"
+#undef LOG_GROUP
+#include "generic/RTSemEventMultiWaitNoResume-2-ex-generic.c"
+#undef LOG_GROUP
+#include "generic/RTTimerCreate-generic.c"
+#undef LOG_GROUP
+#include "generic/errvars-generic.c"
+#undef LOG_GROUP
+#include "generic/mppresent-generic.c"
+#undef LOG_GROUP
+#include "generic/uuid-generic.c"
+#undef LOG_GROUP
+#include "VBox/log-vbox.c"
+
+#ifdef RT_ARCH_AMD64
+# undef LOG_GROUP
+# include "common/alloc/heapsimple.c"
+#endif
+
Index: trunk/src/VBox/HostDrivers/Support/linux/files_vboxdrv
===================================================================
--- trunk/src/VBox/HostDrivers/Support/linux/files_vboxdrv	(revision 85522)
+++ trunk/src/VBox/HostDrivers/Support/linux/files_vboxdrv	(revision 85523)
@@ -85,5 +85,6 @@
     ${PATH_ROOT}/include/VBox/vmm/hm_svm.h=>include/VBox/vmm/hm_svm.h \
     ${PATH_ROOT}/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c=>linux/SUPDrv-linux.c \
-    ${PATH_ROOT}/src/VBox/HostDrivers/Support/linux/combined-agnostic.c=>combined-agnostic.c \
+    ${PATH_ROOT}/src/VBox/HostDrivers/Support/linux/combined-agnostic1.c=>combined-agnostic1.c \
+    ${PATH_ROOT}/src/VBox/HostDrivers/Support/linux/combined-agnostic2.c=>combined-agnostic2.c \
     ${PATH_ROOT}/src/VBox/HostDrivers/Support/linux/combined-os-specific.c=>combined-os-specific.c \
     ${PATH_ROOT}/src/VBox/HostDrivers/Support/SUPDrv.cpp=>SUPDrv.c \
