diff --git a/src/coreclr/gc/env/gcenv.base.h b/src/coreclr/gc/env/gcenv.base.h index 0aa1d0bd673f27a38e4436f5ab4fc0e27ba1a911..59eb74862f5ca3382d4769bc9d247957142971e6 100644 --- a/src/coreclr/gc/env/gcenv.base.h +++ b/src/coreclr/gc/env/gcenv.base.h @@ -227,15 +227,10 @@ typedef DWORD (WINAPI *PTHREAD_START_ROUTINE)(void* lpThreadParameter); #endif // defined(__i386__) || defined(__x86_64__) -#ifdef __aarch64__ +#if defined(__arm__) || defined(__aarch64__) #define YieldProcessor() asm volatile ("yield") #define MemoryBarrier __sync_synchronize -#endif // __aarch64__ - -#ifdef __arm__ - #define YieldProcessor() - #define MemoryBarrier __sync_synchronize -#endif // __arm__ +#endif // __arm__ || __aarch64__ #endif // _MSC_VER diff --git a/src/coreclr/pal/inc/pal.h b/src/coreclr/pal/inc/pal.h index 8e0553e02e88892402cead1948cb28db6918ef09..532c3e82d3ded037a15062b1cf2d9aa406a8aab7 100644 --- a/src/coreclr/pal/inc/pal.h +++ b/src/coreclr/pal/inc/pal.h @@ -3582,7 +3582,7 @@ YieldProcessor() __asm__ __volatile__( "rep\n" "nop"); -#elif defined(HOST_ARM64) +#elif defined(HOST_ARM) || defined(HOST_ARM64) __asm__ __volatile__( "yield"); #else return;