From 79c4b747053aa72a597840e058152d487ee8f6e0 Mon Sep 17 00:00:00 2001
From: Andrey Vagin <avagin@openvz.org>
Date: Wed, 24 Dec 2014 11:42:00 +0300
Subject: [PATCH] arm: fix compilation on ARMv7

/tmp/ccq2xzf8.s: Assembler messages:
/tmp/ccq2xzf8.s:5748: Error: thumb conditional instruction should be in IT block -- strexeq r1,r2,[r3]'

Cc: Alexander Kartashov <alekskartashov@parallels.com>
Cc: Ruslan Kuprieiv <kupruser@gmail.com>
Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index 6b3e06d9c..6b0911516 100644
--- a/Makefile
+++ b/Makefile
@@ -64,6 +64,8 @@ ifeq ($(shell echo $(ARCH) | sed -e 's/arm.*/arm/'),arm)
 	SRCARCH      := arm
 	DEFINES      := -DCONFIG_ARMV$(ARMV)
 
+	USERCFLAGS += -Wa,-mimplicit-it=always
+
 	ifeq ($(ARMV),6)
 		USERCFLAGS += -march=armv6
 	endif