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

Commit b523e185 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Will Deacon
Browse files

efi: stub: define DISABLE_BRANCH_PROFILING for all architectures 



This moves the DISABLE_BRANCH_PROFILING define from the x86 specific
to the general CFLAGS definition for the stub. This fixes build errors
when building for arm64 with CONFIG_PROFILE_ALL_BRANCHES_ENABLED.

Reviewed-by: default avatarMatt Fleming <matt@codeblueprint.co.uk>
Reported-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent ee03353b

drivers/firmware/efi/libstub/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ cflags-$(CONFIG_X86_32) := -march=i386 
cflags-$(CONFIG_X86_64)		:= -mcmodel=small

cflags-$(CONFIG_X86)		+= -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2 \

				   -fPIC -fno-strict-aliasing -mno-red-zone \

				   -mno-mmx -mno-sse -DDISABLE_BRANCH_PROFILING

				   -mno-mmx -mno-sse



cflags-$(CONFIG_ARM64)		:= $(subst -pg,,$(KBUILD_CFLAGS))

cflags-$(CONFIG_ARM)		:= $(subst -pg,,$(KBUILD_CFLAGS)) \
@@ -16,7 +16,7 @@ cflags-$(CONFIG_ARM) := $(subst -pg,,$(KBUILD_CFLAGS)) \ 


cflags-$(CONFIG_EFI_ARMSTUB)	+= -I$(srctree)/scripts/dtc/libfdt



KBUILD_CFLAGS			:= $(cflags-y) \

KBUILD_CFLAGS			:= $(cflags-y) -DDISABLE_BRANCH_PROFILING \

				   $(call cc-option,-ffreestanding) \

				   $(call cc-option,-fno-stack-protector)