Index: /trunk/src/VBox/HostDrivers/Support/Makefile.kmk
===================================================================
--- /trunk/src/VBox/HostDrivers/Support/Makefile.kmk	(revision 87232)
+++ /trunk/src/VBox/HostDrivers/Support/Makefile.kmk	(revision 87233)
@@ -163,5 +163,4 @@
 	SUPLibLdr.cpp \
 	SUPLibSem.cpp \
-	SUPLibTracerA.asm \
 	SUPLibAll.cpp \
 	SUPR3HardenedIPRT.cpp \
@@ -169,4 +168,8 @@
 	$(KBUILD_TARGET)/SUPLib-$(KBUILD_TARGET).cpp \
  	$(VBOX_SUP_WIN_CERTS_FILE)
+SUPR3_SOURCES.amd64 = \
+	SUPLibTracerA.asm
+SUPR3_SOURCES.x86   = \
+	SUPLibTracerA.asm
 ifdef VBOX_WITH_HARDENING
  SUPR3_SOURCES.win  = \
Index: /trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h
===================================================================
--- /trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h	(revision 87232)
+++ /trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h	(revision 87233)
@@ -40,7 +40,7 @@
  * and 64-bit processes.
  */
-#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_SPARC64)
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_SPARC64) || defined(RT_ARCH_ARM64)
 # define SUP_IOCTL_FLAG     128
-#elif defined(RT_ARCH_X86) || defined(RT_ARCH_SPARC)
+#elif defined(RT_ARCH_X86) || defined(RT_ARCH_SPARC)   || defined(RT_ARCH_ARM32)
 # define SUP_IOCTL_FLAG     0
 #else
@@ -142,5 +142,5 @@
 #ifdef RT_ARCH_AMD64
 # pragma pack(8)                        /* paranoia. */
-#else
+#elif defined(RT_ARCH_X86)
 # pragma pack(4)                        /* paranoia. */
 #endif
@@ -1705,5 +1705,7 @@
 
 
-#pragma pack()                          /* paranoia */
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+# pragma pack()                         /* paranoia */
+#endif
 
 #endif /* !VBOX_INCLUDED_SRC_Support_SUPDrvIOC_h */
