openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ANDROID: Reland "Kbuild: Support KBUILD_MIXED_TREE in Makefile.modfinal" 

This reverts commit 4f055f707c3c285dc855957f4206da9091c4beba.

Reason for revert: relanding non-upstream-able change
Bug: 202075496
Signed-off-by: Yifan Hong <elsk@google.com>

Change-Id: Idb8015b4fdb37fd14ad3ab9ed63ec853c018f04d
Signed-off-by: Will McVicker <willmcvicker@google.com>
This commit is contained in:
Yifan Hong 2021-11-08 23:08:14 +00:00 committed by Will McVicker
parent 3d42cc9e75
commit b7a492af2e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/Makefile.modfinal
View File

@ -12,6 +12,8 @@ include $(srctree)/scripts/Kbuild.include
# for c_flags and mod-prelink-ext
include $(srctree)/scripts/Makefile.lib
mixed-build-prefix = $(if $(KBUILD_MIXED_TREE),$(KBUILD_MIXED_TREE)/)
# find all modules listed in modules.order
modules := $(sort $(shell cat $(MODORDER)))
@ -39,10 +41,10 @@ quiet_cmd_ld_ko_o = LD [M] $@
quiet_cmd_btf_ko = BTF [M] $@
cmd_btf_ko = \
if [ -f vmlinux ]; then \
LLVM_OBJCOPY="$(OBJCOPY)" $(PAHOLE) -J --btf_base vmlinux $@; \
if [ -f $(mixed-build-prefix)vmlinux ]; then \
LLVM_OBJCOPY="$(OBJCOPY)" $(PAHOLE) -J --btf_base $(mixed-build-prefix)vmlinux $@; \
else \
printf "Skipping BTF generation for %s due to unavailability of vmlinux\n" $@ 1>&2; \
printf "Skipping BTF generation for %s due to unavailability of $(mixed-build-prefix)vmlinux\n" $@ 1>&2; \
fi;
# Same as newer-prereqs, but allows to exclude specified extra dependencies
@ -55,8 +57,8 @@ if_changed_except = $(if $(call newer_prereqs_except,$(2))$(cmd-check), \
# Re-generate module BTFs if either module's .ko or vmlinux changed
$(modules): %.ko: %$(mod-prelink-ext).o %.mod.o scripts/module.lds $(if $(KBUILD_BUILTIN),vmlinux) FORCE
+$(call if_changed_except,ld_ko_o,vmlinux)
$(modules): %.ko: %$(mod-prelink-ext).o %.mod.o scripts/module.lds $(if $(KBUILD_BUILTIN),$(mixed-build-prefix)vmlinux) FORCE
+$(call if_changed_except,ld_ko_o,$(mixed-build-prefix)vmlinux)
ifdef CONFIG_DEBUG_INFO_BTF_MODULES
+$(if $(newer-prereqs),$(call cmd,btf_ko))
endif