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

Commit 06c0ec0b authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

x86/build: Turn off -fcf-protection for realmode targets 



[ Upstream commit 9fcb51c14da2953de585c5c6e50697b8a6e91a7b ]

The new Ubuntu GCC packages turn on -fcf-protection globally,
which causes a build failure in the x86 realmode code:

  cc1: error: ‘-fcf-protection’ is not compatible with this target

Turn it off explicitly on compilers that understand this option.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20210323124846.1584944-1-arnd@kernel.org


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 882d5a99

arch/x86/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ M16_CFLAGS := $(call cc-option, -m16, $(CODE16GCC_CFLAGS)) 
REALMODE_CFLAGS	:= $(M16_CFLAGS) -g -Os -DDISABLE_BRANCH_PROFILING \

		   -Wall -Wstrict-prototypes -march=i386 -mregparm=3 \

		   -fno-strict-aliasing -fomit-frame-pointer -fno-pic \

		   -mno-mmx -mno-sse

		   -mno-mmx -mno-sse $(call cc-option,-fcf-protection=none)



REALMODE_CFLAGS += $(call __cc-option, $(CC), $(REALMODE_CFLAGS), -ffreestanding)

REALMODE_CFLAGS += $(call __cc-option, $(CC), $(REALMODE_CFLAGS), -fno-stack-protector)