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

Commit e1a7eafb authored by Torsten Duwe's avatar Torsten Duwe Committed by Will Deacon
Browse files

efi/arm/arm64: Makefile: Replace -pg with CC_FLAGS_FTRACE 



In preparation for arm64 supporting ftrace built on other compiler
options, let's have Makefiles remove the $(CC_FLAGS_FTRACE) flags,
whatever these maybe, rather than assuming '-pg'.

While at it, fix arm32 as well. There should be no functional change as
a result of this patch.

Reviewed-by: default avatarMark Rutland <mark.rutland@arm.com>
Acked-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarTorsten Duwe <duwe@suse.de>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent edf072d3

drivers/firmware/efi/libstub/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ cflags-$(CONFIG_X86) += -m$(BITS) -D__KERNEL__ -O2 \ 


# arm64 uses the full KBUILD_CFLAGS so it's necessary to explicitly

# disable the stackleak plugin

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

				   $(DISABLE_STACKLEAK_PLUGIN)

cflags-$(CONFIG_ARM)		:= $(subst -pg,,$(KBUILD_CFLAGS)) \

cflags-$(CONFIG_ARM64)		:= $(subst $(CC_FLAGS_FTRACE),,$(KBUILD_CFLAGS)) \

				   -fpie $(DISABLE_STACKLEAK_PLUGIN)

cflags-$(CONFIG_ARM)		:= $(subst $(CC_FLAGS_FTRACE),,$(KBUILD_CFLAGS)) \

				   -fno-builtin -fpic \

				   $(call cc-option,-mno-single-pic-base)