(+ Arnd) On 4 January 2016 at 13:31, Will Deacon <will.deacon@xxxxxxx> wrote: > On Wed, Dec 23, 2015 at 10:29:28AM +0100, Ard Biesheuvel wrote: >> 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. >> >> Reported-by: Will Deacon <will.deacon@xxxxxxx> >> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx> >> --- >> drivers/firmware/efi/libstub/Makefile | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) > > Cheers, Ard. The kernel now builds and boots as an EFI application for > me when the dreaded #define if config option is enabled: > > Tested-by: Will Deacon <will.deacon@xxxxxxx> > > Will > @Matt: this is causing randconfig build errors for ARM in -next. Mind if we take this through some other tree? >> diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile >> index 3c0467d3688c..c0ddd1b8dca3 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)) >> 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.5.0 >> -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
