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

Commit 91870824 authored by Jan Beulich's avatar Jan Beulich Committed by H. Peter Anvin
Browse files

x86: Fix rebuild with EFI_STUB enabled 



eboot.o and efi_stub_$(BITS).o didn't get added to "targets", and hence
their .cmd files don't get included by the build machinery, leading to
the files always getting rebuilt.

Rather than adding the two files individually, take the opportunity and
add $(VMLINUX_OBJS) to "targets" instead, thus allowing the assignment
at the top of the file to be shrunk quite a bit.

At the same time, remove a pointless flags override line - the variable
assigned to was misspelled anyway, and the options added are
meaningless for assembly sources.

[ hpa: the patch is not minimal, but I am taking it for -urgent anyway
  since the excess impact of the patch seems to be small enough. ]

Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
Link: http://lkml.kernel.org/r/515C5D2502000078000CA6AD@nat28.tlf.novell.com


Cc: Matthew Garrett <mjg@redhat.com>
Cc: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 8b4b9f27

arch/x86/boot/compressed/Makefile

+2 −3
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ 
# create a compressed vmlinux image from the original vmlinux

# create a compressed vmlinux image from the original vmlinux

#

#





targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma vmlinux.bin.xz vmlinux.bin.lzo head_$(BITS).o misc.o string.o cmdline.o early_serial_console.o piggy.o

targets := vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma vmlinux.bin.xz vmlinux.bin.lzo





KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2

KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2

KBUILD_CFLAGS += -fno-strict-aliasing -fPIC

KBUILD_CFLAGS += -fno-strict-aliasing -fPIC
@@ -29,7 +29,6 @@ VMLINUX_OBJS = $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o \ 
	$(obj)/piggy.o

	$(obj)/piggy.o





$(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone

$(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone

$(obj)/efi_stub_$(BITS).o: KBUILD_CLFAGS += -fshort-wchar -mno-red-zone





ifeq ($(CONFIG_EFI_STUB), y)

ifeq ($(CONFIG_EFI_STUB), y)

	VMLINUX_OBJS += $(obj)/eboot.o $(obj)/efi_stub_$(BITS).o

	VMLINUX_OBJS += $(obj)/eboot.o $(obj)/efi_stub_$(BITS).o
@@ -43,7 +42,7 @@ OBJCOPYFLAGS_vmlinux.bin := -R .comment -S 
$(obj)/vmlinux.bin: vmlinux FORCE

$(obj)/vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)

	$(call if_changed,objcopy)





targets += vmlinux.bin.all vmlinux.relocs

targets += $(patsubst $(obj)/%,%,$(VMLINUX_OBJS)) vmlinux.bin.all vmlinux.relocs





CMD_RELOCS = arch/x86/tools/relocs

CMD_RELOCS = arch/x86/tools/relocs

quiet_cmd_relocs = RELOCS  $@

quiet_cmd_relocs = RELOCS  $@