Changeset 107650 in vbox for trunk/src/VBox/VMM/Makefile.kmk

Timestamp:

Jan 10, 2025 1:42:28 PM (8 days ago)

Author:

vboxsync

Message:

VMM/CPUM,++: Made the HostFeatures match the host when targeting x86 guests on arm64 hosts. Merged and deduplicated code targeting x86 & amd64. jiraref:VBP-1470

File:

• trunk/src/VBox/VMM/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/VMM/Makefile.kmk

@@ -416 +416 @@
         VMMR3/CPUM-armv8.cpp \
         VMMR3/CPUMDbg-armv8.cpp \
+        VMMAll/CPUMAllCpuId.cpp \
         VMMR3/CPUMR3CpuId-armv8.cpp \
         VMMR3/CPUMR3Db-armv8.cpp \
@@ -1074 +1075 @@
  ##
  # Turn the header $2 into the DTrace library script $1.
+ # @todo ARM: this needs adjusting for the non-native VBoxVMM variant!
  #
  define def_vmm_lib_dtrace_preprocess
@@ -1083 +1085 @@
                 -D VBOX_FOR_DTRACE_LIB \
                 -D VBOX_FOR_DTRACE_LIB_$(toupper $(KBUILD_TARGET_ARCH)) \
+                -D $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64",VBOX_VMM_TARGET_X86,VBOX_VMM_TARGET_ARMV8) \
                 -D IN_RING0 \
                 -D RT_C_DECLS_BEGIN= \