summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2019-05-16 01:17:17 +0300
committerRussell King <rmk+kernel@armlinux.org.uk>2019-05-16 01:17:17 +0300
commitb752bb405a13f11b2db0a24d52da85cf7f8c0fea (patch)
tree72202fe3d35efe7faaca7aa2b16f61ddac0885f7 /arch/arm
parentfe00e50b2db8c60e4ec90befad1f5bab8ca2c800 (diff)
downloadlinux-b752bb405a13f11b2db0a24d52da85cf7f8c0fea.tar.xz
Revert "ARM: 8846/1: warn if divided syntax assembler is used"
This reverts commit e8c24bbda7d5eba6df5ca45e5462fd3f96b8f217. 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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 1f7bbde5e23e..bdb40d5263fc 100644
--- 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