From: Daniel Kiper Date: Wed, 25 Nov 2015 16:24:36 +0000 (+0100) Subject: x86/boot: check for not allowed sections before linking X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~2171 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d380b3559734739ae009cd3c0e9aabb5602863e2;p=xen.git x86/boot: check for not allowed sections before linking Currently check for not allowed sections is performed just after compilation. However, if compilation succeeds and check fails then second build will create xen.gz/xen.efi without any visible error. This happens because %.o: %.c recipe created object file during first run and make do not execute this recipe during second run. So, look for not allowed sections before linking. This way check will be executed every time. Signed-off-by: Daniel Kiper Reviewed-by: Jan Beulich --- diff --git a/xen/arch/x86/boot/build32.mk b/xen/arch/x86/boot/build32.mk index c208249ca8..4a1421f6ba 100644 --- a/xen/arch/x86/boot/build32.mk +++ b/xen/arch/x86/boot/build32.mk @@ -16,11 +16,7 @@ CFLAGS := $(filter-out -flto,$(CFLAGS)) $(OBJCOPY) -O binary $< $@ %.lnk: %.o - $(LD) $(LDFLAGS_DIRECT) -N -Ttext 0 -o $@ $< - -%.o: %.c - $(CC) $(CFLAGS) -c -fpic $< -o $@ - $(OBJDUMP) -h $@ | sed -n '/[0-9]/{s,00*,0,g;p;}' |\ + $(OBJDUMP) -h $< | sed -n '/[0-9]/{s,00*,0,g;p;}' |\ while read idx name sz rest; do \ case "$$name" in \ .data|.data.*|.rodata|.rodata.*|.bss|.bss.*) \ @@ -29,6 +25,10 @@ CFLAGS := $(filter-out -flto,$(CFLAGS)) exit $$(expr $$idx + 1);; \ esac; \ done + $(LD) $(LDFLAGS_DIRECT) -N -Ttext 0 -o $@ $< + +%.o: %.c + $(CC) $(CFLAGS) -c -fpic $< -o $@ reloc.o: reloc.c $(RELOC_DEPS)