From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762831Ab3DCO6P (ORCPT ); Wed, 3 Apr 2013 10:58:15 -0400 Received: from nat28.tlf.novell.com ([130.57.49.28]:55874 "EHLO nat28.tlf.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762612Ab3DCO6O convert rfc822-to-8bit (ORCPT ); Wed, 3 Apr 2013 10:58:14 -0400 Message-Id: <515C5FD002000078000CA6DA@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.2 Date: Wed, 03 Apr 2013 15:58:56 +0100 From: "Jan Beulich" To: "H. Peter Anvin" Cc: , "Matt Fleming" , , , Subject: Re: [PATCH] x86: fix rebuild with EFI_STUB enabled References: <515C5D2502000078000CA6AD@nat28.tlf.novell.com> <5a3182e0-580a-42f4-a17f-925836cca7d2@email.android.com> In-Reply-To: <5a3182e0-580a-42f4-a17f-925836cca7d2@email.android.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8BIT Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org >>> On 03.04.13 at 16:48, "H. Peter Anvin" wrote: > This looks awesome for 3.10, but getting a minimal fix for 3.9/stable would > be good, too. Do you really view this as relevant for stable? Considering that this had been this way for a while with apparently no-one having noticed, I wouldn't think so. Nor would I see a strong need for this to go into 3.9. Jan > Jan Beulich wrote: > >>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. >> >>Signed-off-by: Jan Beulich >>Cc: Matthew Garrett >>Cc: Matt Fleming >>--- >> arch/x86/boot/compressed/Makefile | 5 ++--- >> 1 file changed, 2 insertions(+), 3 deletions(-) >> >>--- 3.9-rc5/arch/x86/boot/compressed/Makefile >>+++ 3.9-rc5-x86-EFI-stub-rebuild/arch/x86/boot/compressed/Makefile >>@@ -4,7 +4,7 @@ >> # 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 += -fno-strict-aliasing -fPIC >>@@ -29,7 +29,6 @@ VMLINUX_OBJS = $(obj)/vmlinux.lds $(obj) >> $(obj)/piggy.o >> >> $(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) >> VMLINUX_OBJS += $(obj)/eboot.o $(obj)/efi_stub_$(BITS).o >>@@ -43,7 +42,7 @@ OBJCOPYFLAGS_vmlinux.bin := -R .comment >> $(obj)/vmlinux.bin: vmlinux FORCE >> $(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 >> quiet_cmd_relocs = RELOCS $@ > > -- > Sent from my mobile phone. Please excuse brevity and lack of formatting.