lkml.org 
[lkml]   [2019]   [Apr]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 043/131] efi: stub: define DISABLE_BRANCH_PROFILING for all architectures
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit b523e185bba36164ca48a190f5468c140d815414 ]

    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: Matt Fleming <matt@codeblueprint.co.uk>
    Reported-by: Will Deacon <will.deacon@arm.com>
    Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
    Signed-off-by: Will Deacon <will.deacon@arm.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/firmware/efi/libstub/Makefile | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile
    index 88bd6829a358..edb45f72b34c 100644
    --- a/drivers/firmware/efi/libstub/Makefile
    +++ b/drivers/firmware/efi/libstub/Makefile
    @@ -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)) -fpie
    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)

    --
    2.19.1


    \
     
     \ /
      Last update: 2019-04-01 19:46    [W:3.292 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site