From e87942efda1e93f5503360c069aef7d14e6f2ac1 Mon Sep 17 00:00:00 2001 From: klzgrad Date: Sat, 30 Nov 2019 22:38:31 +0800 Subject: [PATCH] allocator: Improve MIPS coverage of spinlocks --- src/base/allocator/partition_allocator/yield_processor.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/base/allocator/partition_allocator/yield_processor.h b/src/base/allocator/partition_allocator/yield_processor.h index d51b102902..2c1d04aad3 100644 --- a/src/base/allocator/partition_allocator/yield_processor.h +++ b/src/base/allocator/partition_allocator/yield_processor.h @@ -22,12 +22,12 @@ #define YIELD_PROCESSOR __asm__ __volatile__("pause") #elif (defined(ARCH_CPU_ARMEL) && __ARM_ARCH >= 6) || defined(ARCH_CPU_ARM64) #define YIELD_PROCESSOR __asm__ __volatile__("yield") -#elif defined(ARCH_CPU_MIPSEL) +#elif defined(ARCH_CPU_MIPSEL) && __mips_isa_rev < 2 // The MIPS32 docs state that the PAUSE instruction is a no-op on older // architectures (first added in MIPS32r2). To avoid assembler errors when // targeting pre-r2, we must encode the instruction manually. #define YIELD_PROCESSOR __asm__ __volatile__(".word 0x00000140") -#elif defined(ARCH_CPU_MIPS64EL) && __mips_isa_rev >= 2 +#elif defined(ARCH_CPU_MIPS_FAMILY) && __mips_isa_rev >= 2 // Don't bother doing using .word here since r2 is the lowest supported mips64 // that Chromium supports. #define YIELD_PROCESSOR __asm__ __volatile__("pause")