From 68c455a6d6ef1e61284d6dc778dc9279d2c95dc4 Mon Sep 17 00:00:00 2001
From: John Sully <john@csquare.ca>
Date: Thu, 16 Apr 2020 20:01:24 -0400
Subject: [PATCH] Always link libatomic

Former-commit-id: 7aeae62f84fe958bcda9925f76180a7e149a337e
---
 src/Makefile | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 78568b736..197e5beea 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -83,10 +83,6 @@ ifneq (,$(findstring armv,$(uname_M)))
 endif
 endif
 
-ifneq (,$(findstring armv,$(uname_M)))
-	FINAL_LIBS+=-latomic
-endif	
-
 # Backwards compatibility for selecting an allocator
 ifeq ($(USE_TCMALLOC),yes)
 	MALLOC=tcmalloc
@@ -110,18 +106,9 @@ endif
 FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
 FINAL_CXXFLAGS=$(CXX_STD) $(WARN) $(OPT) $(DEBUG) $(CXXFLAGS) $(REDIS_CFLAGS)
 FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
-FINAL_LIBS+=-lm -lcurl
+FINAL_LIBS+=-lm -lcurl -latomic
 DEBUG=-g -ggdb
 
-# Linux ARM needs -latomic at linking time
-ifneq (,$(filter aarch64 armv,$(uname_M)))
-        FINAL_LIBS+=-latomic
-else
-ifneq (,$(findstring armv,$(uname_M)))
-        FINAL_LIBS+=-latomic
-endif
-endif
-
 ifeq ($(uname_S),SunOS)
 	# SunOS
         ifneq ($(@@),32bit)