Revert "ARM: 8846/1: warn if divided syntax assembler is used"

This reverts commit ddb9b5f020cc832baf60d6d0a9c01222f34d5ae7.

GCC 4.7, which is still permitted, emits code using the original
syntax.  This means we end up with lots of assembler warnings when
building with a currently-supported version of gcc.

Revert the commit (with fixups to keep the follow-on -mauto-it
change) to avoid these warnings.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 1f7bbde5e23e75ea7f6d4d35cf1c48eb13bfaff6..bdb40d5263fc1b055818070c1fb4fea4d8574eec 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -112,15 +112,18 @@ ifeq ($(CONFIG_ARM_UNWIND),y)
 CFLAGS_ABI     +=-funwind-tables
 endif
 
+# Accept old syntax despite ".syntax unified"
+AFLAGS_NOWARN  :=$(call as-option,-Wa$(comma)-mno-warn-deprecated,-Wa$(comma)-W)
+
 ifeq ($(CONFIG_THUMB2_KERNEL),y)
-CFLAGS_ISA     :=-mthumb -Wa,-mimplicit-it=always
+CFLAGS_ISA     :=-mthumb -Wa,-mimplicit-it=always $(AFLAGS_NOWARN)
 AFLAGS_ISA     :=$(CFLAGS_ISA) -Wa$(comma)-mthumb
 # Work around buggy relocation from gas if requested:
 ifeq ($(CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11),y)
 KBUILD_CFLAGS_MODULE   +=-fno-optimize-sibling-calls
 endif
 else
-CFLAGS_ISA     :=$(call cc-option,-marm,)
+CFLAGS_ISA     :=$(call cc-option,-marm,) $(AFLAGS_NOWARN)
 AFLAGS_ISA     :=$(CFLAGS_ISA)
 endif