Changeset 106546 in vbox for trunk

Timestamp:

Oct 21, 2024 7:58:11 AM (6 months ago)

Author:

vboxsync

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

165380

Message:

include/iprt/asm.h: Make it build on win.arm64, bugref:10392 [attempted build fix]

File:

• trunk/include/iprt/asm.h (modified) (2 diffs)

trunk/include/iprt/asm.h

@@ -6370 +6370 @@
 DECLINLINE(uint32_t) ASMAtomicUoOrExU32(uint32_t volatile RT_FAR *pu32, uint32_t u32) RT_NOTHROW_DEF
 {
-#if RT_INLINE_ASM_USES_INTRIN /** @todo Check what the compiler generates... */
+#if defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
+# if RT_INLINE_ASM_USES_INTRIN /** @todo Check what the compiler generates... */
     return (uint32_t)_InterlockedOr_nf((long volatile RT_FAR *)pu32, u32);
-
-#elif defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
-# if defined(RTASM_ARM64_USE_FEAT_LSE)
+# elif defined(RTASM_ARM64_USE_FEAT_LSE)
     uint32_t u32OldRet;
     __asm__ __volatile__("Lstart_ASMAtomicOrExU32_%=:\n\t"
@@ -6382 +6381 @@
                          : [fBitsToSet] "r"   (u32)
                          : );
-# else
+    return u32OldRet;
+# else
+    uint32_t u32OldRet;
     RTASM_ARM_LOAD_MODIFY_STORE_RET_OLD_32(ASMAtomicUoOrExU32, pu32, NO_BARRIER,
                                            "orr %w[uNew], %w[uOld], %w[uVal]\n\t",
                                            "orr %[uNew], %[uOld], %[uVal]\n\t",
                                            [uVal] "r" (u32));
-# endif
     return u32OldRet;
-
+# endif
 #else
     return ASMAtomicOrExU32(pu32, u32); /* (we have no unordered cmpxchg primitive atm.) */