Changeset 98960 in vbox

Timestamp:

Mar 14, 2023 1:08:54 PM (21 months ago)

Author:

vboxsync

Message:

scm fixes

Location:

trunk

Files:

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

trunk/include/Makefile.kmk

@@ -145 +145 @@
         VBox/vmm/pdmpcidevint.h \
         VBox/vmm/vmmr3vtable-def.h \
-        VBox/vmm/cpumctx-x86-amd64.h \
-        VBox/vmm/cpumctx-armv8.h \
+        VBox/vmm/cpumctx-x86-amd64.h \
+        VBox/vmm/cpumctx-armv8.h \
         iprt/runtime-loader.h \
         iprt/mangling.h \
@@ -162 +162 @@
         VBox/vmm/cpumctx.h \
         VBox/vmm/cpumctx-v1_6.h \
+        VBox/vmm/cpumctx-x86-amd64.h \
         VBox/vmm/dbgfcorefmt.h
 endif
@@ -167 +168 @@
 ifn1of ($(KBUILD_TARGET_ARCH), arm32 arm64)
  VBOX_HDRS_OMIT += \
-        iprt/asm-arm.h
+        iprt/asm-arm.h \
+        VBox/vmm/cpumctx-armv8.h
 endif
 

trunk/src/VBox/VMM/Makefile.kmk

@@ -317 +317 @@
 
 ifdef VBOX_WITH_VIRT_ARMV8
-#
-# The VMM DLL - ARMv8 variant.
-#
+ #
+ # The VMM DLL - ARMv8 variant.
+ #
  DLLS += VBoxVMMArm
  VBoxVMMArm_TEMPLATE = VBoxR3DllNoPic
  VBoxVMMArm_SONAME.linux = VBoxVMMArm.so
- 
+
  VBoxVMMArm_DEFS     = VBOX_VMM_TARGET_ARMV8 VBOX_IN_VMM IN_VMM_R3 IN_DIS IN_DBG $(VMM_COMMON_DEFS)
  ifdef VBOX_WITH_VUSB
@@ -340 +340 @@
  # VBoxVMMArm_DEFS   += VBOX_WITH_DBGF_FLOW_TRACING
  #endif
- 
+
  VBoxVMMArm_INCS     = \
         include \
@@ -467 +467 @@
         VMMAll/PDMAllNetShaper.cpp
  endif
- 
+
  VBoxVMMArm_SOURCES.darwin.arm64 += \
         VMMR3/NEMR3Native-darwin.cpp
  VBoxVMMArm_DEFS.darwin.arm64   += VBOX_WITH_NATIVE_NEM
- 
+
  VBoxVMMArm_LIBS = \
         $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB)
@@ -480 +480 @@
  VBoxVMMArm_LIBS += \
         $(LIB_RUNTIME)
- 
+
  VBoxVMMArm_LDFLAGS.darwin = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxVMMArm.dylib
 endif