Changeset 100191 in vbox for trunk/src/VBox/Additions/common/VBoxGuest/linux

Timestamp:

Jun 16, 2023 8:04:11 AM (23 months ago)

Author:

vboxsync

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

157897

Message:

*: Some of the easy build fixes for linux.arm64 not warranting their own commit, bugref:10457

Location:

trunk/src/VBox/Additions/common/VBoxGuest/linux

Files:

• Makefile (modified) (1 diff)
• combined-agnostic.c (modified) (1 diff)
• files_vboxguest (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/linux/Makefile

@@ -169 +169 @@
 ifeq ($(VBOX_KBUILD_TARGET_ARCH),amd64)
 VBOXMOD_DEFS += VBOX_WITH_64_BITS_GUESTS
+else ifeq ($(VBOX_KBUILD_TARGET_ARCH),arm64)
+VBOXMOD_DEFS += VBOX_WITH_64_BITS_GUESTS
 endif
 ifeq ($(KERN_VERSION),24)

trunk/src/VBox/Additions/common/VBoxGuest/linux/combined-agnostic.c

@@ -172 +172 @@
 #include "VBox/logbackdoor.c"
 #undef LOG_GROUP
-#include "VBox/RTLogWriteVmm-amd64-x86.c"
+#if defined(RT_ARCH_AMD) || defined(RT_ARCH_X86)
+# include "VBox/RTLogWriteVmm-amd64-x86.c"
+#else
+# include "generic/RTLogWriteVmm-stub-generic.c"
+#endif
 
 #ifdef RT_ARCH_AMD64
 # undef LOG_GROUP
 # include "common/alloc/heapsimple.c"
+#endif
+
+#if defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
+# undef LOG_GROUP
+# include "common/asm/ASMMultU64ByU32DivByU32-generic.c"
 #endif
 

trunk/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest

@@ -42 +42 @@
     ${PATH_ROOT}/include/iprt/asm.h=>include/iprt/asm.h \
     ${PATH_ROOT}/include/iprt/asm-amd64-x86.h=>include/iprt/asm-amd64-x86.h \
+    ${PATH_ROOT}/include/iprt/asm-arm.h=>include/iprt/asm-arm.h \
     ${PATH_ROOT}/include/iprt/asm-math.h=>include/iprt/asm-math.h \
     ${PATH_ROOT}/include/iprt/assert.h=>include/iprt/assert.h \
@@ -126 +127 @@
     ${PATH_ROOT}/src/VBox/Runtime/common/alloc/alloc.cpp=>common/alloc/alloc.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/alloc/heapsimple.cpp=>common/alloc/heapsimple.c \
+    ${PATH_ROOT}/src/VBox/Runtime/common/asm/ASMMultU64ByU32DivByU32-generic.cpp=>common/asm/ASMMultU64ByU32DivByU32-generic.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/checksum/crc32.cpp=>common/checksum/crc32.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp=>common/err/RTErrConvertFromErrno.c \
@@ -187 +189 @@
     ${PATH_ROOT}/src/VBox/Runtime/generic/RTLogWriteStdErr-stub-generic.cpp=>generic/RTLogWriteStdErr-stub-generic.c \
     ${PATH_ROOT}/src/VBox/Runtime/generic/RTLogWriteStdOut-stub-generic.cpp=>generic/RTLogWriteStdOut-stub-generic.c \
+    ${PATH_ROOT}/src/VBox/Runtime/generic/RTLogWriteVmm-stub-generic.cpp=>generic/RTLogWriteVmm-stub-generic.c \
     ${PATH_ROOT}/src/VBox/Runtime/generic/RTMpGetCoreCount-generic.cpp=>generic/RTMpGetCoreCount-generic.c \
     ${PATH_ROOT}/src/VBox/Runtime/generic/RTSemEventWait-2-ex-generic.cpp=>generic/RTSemEventWait-2-ex-generic.c \