From: Vineet Gupta <vgupta@synopsys.com>
Date: Tue, 8 Nov 2016 16:47:14 +0000 (-0800)
Subject: Revert "ARC: build: retire old toggles"
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=76a08404742e6da79f1e5002ac39033dc79d94da;p=linux-beck.git

Revert "ARC: build: retire old toggles"

This has caused a bunch of build failures at a few sites, with GNU
2015.12 and older as the assembler seems to need -mlock to be able to
grok llock/scond instructions for ARC700 builds.
different places since the
older tools still seem to release
of tools which most people are using seem to trip with the -mlock flag
not being passed.

This reverts commit c3005475889c7c730638f95d13be3360f0b33e98.
---

diff --git a/arch/arc/Makefile b/arch/arc/Makefile
index 864adad52280..aa82d13d4213 100644
--- a/arch/arc/Makefile
+++ b/arch/arc/Makefile
@@ -50,6 +50,9 @@ atleast_gcc44 :=  $(call cc-ifversion, -ge, 0404, y)
 
 cflags-$(atleast_gcc44)			+= -fsection-anchors
 
+cflags-$(CONFIG_ARC_HAS_LLSC)		+= -mlock
+cflags-$(CONFIG_ARC_HAS_SWAPE)		+= -mswape
+
 ifdef CONFIG_ISA_ARCV2
 
 ifndef CONFIG_ARC_HAS_LL64