Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c540b9ff authored by Catalin Marinas's avatar Catalin Marinas Committed by Russell King
Browse files

ARM: 5904/1: ARM: Always generate the IT instruction when compiling for Thumb-2 



Current behaviour is to generate the IT instruction only for Thumb-2
code. However, the kernel helpers in entry-armv.S are compiled to ARM in
a unified syntax file (if THUMB2_KERNEL). Recent compilers warn about
missing IT instruction in unified assembly syntax files. The patch
changes the "-mimplicit-it" gas option to "always".

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent df2e615a

arch/arm/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -94,7 +94,7 @@ CFLAGS_ABI +=-funwind-tables 
endif

endif





ifeq ($(CONFIG_THUMB2_KERNEL),y)

ifeq ($(CONFIG_THUMB2_KERNEL),y)

AFLAGS_AUTOIT	:=$(call as-option,-Wa$(comma)-mimplicit-it=thumb,-Wa$(comma)-mauto-it)

AFLAGS_AUTOIT	:=$(call as-option,-Wa$(comma)-mimplicit-it=always,-Wa$(comma)-mauto-it)

AFLAGS_NOWARN	:=$(call as-option,-Wa$(comma)-mno-warn-deprecated,-Wa$(comma)-W)

AFLAGS_NOWARN	:=$(call as-option,-Wa$(comma)-mno-warn-deprecated,-Wa$(comma)-W)

CFLAGS_THUMB2	:=-mthumb $(AFLAGS_AUTOIT) $(AFLAGS_NOWARN)

CFLAGS_THUMB2	:=-mthumb $(AFLAGS_AUTOIT) $(AFLAGS_NOWARN)

AFLAGS_THUMB2	:=$(CFLAGS_THUMB2) -Wa$(comma)-mthumb

AFLAGS_THUMB2	:=$(CFLAGS_THUMB2) -Wa$(comma)-mthumb