From a12299203cb385c20e01d276b090a17807065e44 Mon Sep 17 00:00:00 2001 From: John Sully Date: Wed, 20 Mar 2019 04:14:33 +0000 Subject: [PATCH] ARM build fix: Don't use X64 asm here Former-commit-id: b775ebb382240876234e179b73866c7d63a209d6 --- src/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index 2ef54aa10..7ae04a2fa 100644 --- a/src/Makefile +++ b/src/Makefile @@ -45,8 +45,9 @@ endif endif USEASM?=true -# Do we use our assembly spinlock? +# Do we use our assembly spinlock? X64 only ifeq ($(uname_S),Linux) +ifeq ($(uname_M),x86_64) ifneq ($(@@),32bit) ifeq ($(USEASM),true) ASM_OBJ+= fastlock_x64.o @@ -55,6 +56,7 @@ ifeq ($(USEASM),true) endif endif endif +endif ifeq ($(COMPILER_NAME),clang) CXXFLAGS+= -stdlib=libc++