x86: Get rid of Makefile.postlink · tjh.dev/kernel@e6a03a6

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

x86: Get rid of Makefile.postlink

Instead of generating the vmlinux.relocs file (needed by the
decompressor build to construct the KASLR relocation tables) as a
vmlinux postlink step, which is dubious because it depends on data that
is stripped from vmlinux before the build completes, generate it from
vmlinux.unstripped, which has been introduced specifically for this
purpose.

This ensures that each artifact is rebuilt as needed, rather than as a
side effect of another build rule.

This effectively reverts commit

9d9173e9ceb6 ("x86/build: Avoid relocation information in final vmlinux")

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

authored by

Ard Biesheuvel and committed by

Masahiro Yamada 1 year ago e6a03a66 ac4f0678

+6 -41

2 changed files

expand all

arch

x86

Makefile.postlink

boot

compressed

Makefile

-38

arch/x86/Makefile.postlink

··· 1 - # SPDX-License-Identifier: GPL-2.0 2 - # =========================================================================== 3 - # Post-link x86 pass 4 - # =========================================================================== 5 - # 6 - # 1. Separate relocations from vmlinux into vmlinux.relocs. 7 - # 2. Strip relocations from vmlinux. 8 - 9 - PHONY := __archpost 10 - __archpost: 11 - 12 - -include include/config/auto.conf 13 - include $(srctree)/scripts/Kbuild.include 14 - 15 - CMD_RELOCS = arch/x86/tools/relocs 16 - OUT_RELOCS = arch/x86/boot/compressed 17 - quiet_cmd_relocs = RELOCS $(OUT_RELOCS)/vmlinux.relocs 18 - cmd_relocs = \ 19 - mkdir -p $(OUT_RELOCS); \ 20 - $(CMD_RELOCS) $@ > $(OUT_RELOCS)/vmlinux.relocs; \ 21 - $(CMD_RELOCS) --abs-relocs $@ 22 - 23 - # `@true` prevents complaint when there is nothing to be done 24 - 25 - vmlinux vmlinux.unstripped: FORCE 26 - @true 27 - ifeq ($(CONFIG_X86_NEED_RELOCS),y) 28 - $(call cmd,relocs) 29 - endif 30 - 31 - clean: 32 - @rm -f $(OUT_RELOCS)/vmlinux.relocs 33 - 34 - PHONY += FORCE clean 35 - 36 - FORCE: 37 - 38 - .PHONY: $(PHONY)

+6 -3

arch/x86/boot/compressed/Makefile

··· 117 117 118 118 targets += $(patsubst $(obj)/%,%,$(vmlinux-objs-y)) vmlinux.bin.all vmlinux.relocs 119 119 120 - # vmlinux.relocs is created by the vmlinux postlink step. 121 - $(obj)/vmlinux.relocs: vmlinux 122 - @true 120 + CMD_RELOCS = arch/x86/tools/relocs 121 + quiet_cmd_relocs = RELOCS $@ 122 + cmd_relocs = $(CMD_RELOCS) $< > $@;$(CMD_RELOCS) --abs-relocs $< 123 + 124 + $(obj)/vmlinux.relocs: vmlinux.unstripped FORCE 125 + $(call if_changed,relocs) 123 126 124 127 vmlinux.bin.all-y := $(obj)/vmlinux.bin 125 128 vmlinux.bin.all-$(CONFIG_X86_NEED_RELOCS) += $(obj)/vmlinux.relocs

Configure Feed

Configure Feed