Changeset 106426 in vbox for trunk/src/VBox/Runtime/r3/win

Timestamp:

Oct 17, 2024 10:57:54 AM (4 months ago)

Author:

vboxsync

Message:

Runtime/r3/win/thread*-win.cpp: Build fix for arm64, bugref:10392

Location:

trunk/src/VBox/Runtime/r3/win

Files:

• thread-win.cpp (modified) (2 diffs)
• thread2-win.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/r3/win/thread-win.cpp

@@ -50 +50 @@
 #include "internal/iprt.h"
 
-#include <iprt/asm-amd64-x86.h>
+#if defined(RT_ARCH_X86) || defined(RT_ARCH_AMD64)
+# include <iprt/asm-amd64-x86.h>
+#elif defined(RT_ARCH_ARM64)
+# include <iprt/asm-arm.h>
+#endif
 #include <iprt/assert.h>
 #include <iprt/cpuset.h>
@@ -244 +248 @@
     {
         void *pvTeb = NtCurrentTeb();
-# ifdef RT_ARCH_AMD64
+# if defined(RT_ARCH_AMD64) ||defined(RT_ARCH_ARM64)
         pOleTlsData = *(struct MySOleTlsData **)((uintptr_t)pvTeb + 0x1758); /*TEB.ReservedForOle*/
-# elif RT_ARCH_X86
+# elif defined(RT_ARCH_X86)
         pOleTlsData = *(struct MySOleTlsData **)((uintptr_t)pvTeb + 0x0f80); /*TEB.ReservedForOle*/
 # else

trunk/src/VBox/Runtime/r3/win/thread2-win.cpp

@@ -45 +45 @@
 #include "internal/iprt.h"
 
-#include <iprt/asm-amd64-x86.h>
+#if defined(RT_ARCH_X86) || defined(RT_ARCH_AMD64)
+# include <iprt/asm-amd64-x86.h>
+#elif defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
+# include <iprt/asm-arm.h>
+#endif
 #include <iprt/errcore.h>
 #include <iprt/log.h>