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

Commit 1622ac23 authored by Ian Campbell's avatar Ian Campbell Committed by Ingo Molnar
Browse files

x86: define OBJCOPYFLAGS explicitly for each target. 



Do this rather than defining a global version and overriding it in
almost all cases in order to make subsequent patches simpler.

Signed-off-by: default avatarIan Campbell <ijc@hellion.org.uk>
Acked-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent cf89ec92

arch/x86/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ KBUILD_AFLAGS += $(cfi) $(cfi-sigframe) 
KBUILD_CFLAGS += $(cfi) $(cfi-sigframe)



LDFLAGS := -m elf_$(UTS_MACHINE)

OBJCOPYFLAGS := -O binary -R .note -R .comment -S



# Speed up the build

KBUILD_CFLAGS += -pipe

arch/x86/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ $(obj)/zImage $(obj)/bzImage: $(obj)/setup.bin \ 
	$(call if_changed,image)

	@echo 'Kernel: $@ is ready' ' (#'`cat .version`')'



OBJCOPYFLAGS_vmlinux.bin := -O binary -R .note -R .comment -S

$(obj)/vmlinux.bin: $(obj)/compressed/vmlinux FORCE

	$(call if_changed,objcopy)
@@ -90,7 +91,6 @@ $(obj)/setup.elf: $(src)/setup.ld $(SETUP_OBJS) FORCE 
	$(call if_changed,ld)



OBJCOPYFLAGS_setup.bin	:= -O binary



$(obj)/setup.bin: $(obj)/setup.elf FORCE

	$(call if_changed,objcopy)

arch/x86/boot/compressed/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ $(obj)/vmlinux: $(src)/vmlinux_$(BITS).lds $(obj)/head_$(BITS).o $(obj)/misc.o $ 
	$(call if_changed,ld)

	@:



OBJCOPYFLAGS_vmlinux.bin := -O binary -R .note -R .comment -S

$(obj)/vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)