Changeset 98924 in vbox

Timestamp:

Mar 12, 2023 6:03:45 PM (21 months ago)

Author:

vboxsync

Message:

ValidationKit: Support bs3-timing-1 on arm, bugref:9898

Location:

trunk/src/VBox/ValidationKit

Files:

• Makefile.kmk (modified) (2 diffs)
• bootsectors/bs3-timing-1-32.c32 (modified) (1 diff)

trunk/src/VBox/ValidationKit/Makefile.kmk

@@ -51 +51 @@
 include $(PATH_SUB_CURRENT)/tests/Makefile.kmk
 ifneq ($(KBUILD_HOST),os2)            # needs yasm
- if1of ($(KBUILD_TARGET_ARCH), amd64 x86) # needs yasm
+ if1of ($(KBUILD_TARGET_ARCH), amd64 x86 arm64) # needs yasm
   include $(PATH_SUB_CURRENT)/bootsectors/Makefile.kmk
  endif
@@ -207 +207 @@
         $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/loadgeneratorR0.r0
   endif
-  ifn1of ($(os).$(arch), os2.x86 os2.amd64 darwin.arm64) ## not compiling bootsectors, no yasm.  could fix this better.
+  ifn1of ($(os), os2) ## not compiling bootsectors, no yasm.  could fix this better.
    VBOX_VALIDATIONKIT_FILESPEC += \
         $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/bs3-timing-1$(TMP_SUFF_EXE)

trunk/src/VBox/ValidationKit/bootsectors/bs3-timing-1-32.c32

@@ -42 +42 @@
 # include <bs3kit.h>
 #endif
-#include <iprt/asm-amd64-x86.h>
+#if defined(RT_ARcH_ARM) || defined(RT_ARCH_ARM64)
+# include <iprt/asm-arm.h>
+#else
+# include <iprt/asm-amd64-x86.h>
+#endif
 #include <iprt/asm-math.h>
 #include <iprt/asm.h>