mirror of https://github.com/OpenIPC/firmware.git
86 lines
3.2 KiB
Diff
86 lines
3.2 KiB
Diff
diff -drupN a/scripts/Makefile.modpost b/scripts/Makefile.modpost
|
|
--- a/scripts/Makefile.modpost 2018-08-06 17:23:04.000000000 +0300
|
|
+++ b/scripts/Makefile.modpost 2022-06-12 05:28:14.000000000 +0300
|
|
@@ -82,12 +82,28 @@ modpost = scripts/mod/modpost
|
|
|
|
MODPOST_OPT=$(subst -i,-n,$(filter -i,$(MAKEFLAGS)))
|
|
|
|
+# If CONFIG_LTO_CLANG is enabled, .o files are either LLVM IR, or empty, so we
|
|
+# need to link them into actual objects before passing them to modpost
|
|
+modpost-ext = $(if $(CONFIG_LTO_CLANG),.lto,)
|
|
+
|
|
+ifdef CONFIG_LTO_CLANG
|
|
+quiet_cmd_cc_lto_link_modules = LD [M] $@
|
|
+cmd_cc_lto_link_modules = \
|
|
+ $(LD) $(ld_flags) -r -o $(@) \
|
|
+ $(shell [ -s $(@:$(modpost-ext).o=.o.symversions) ] && \
|
|
+ echo -T $(@:$(modpost-ext).o=.o.symversions)) \
|
|
+ --whole-archive $(filter-out FORCE,$^)
|
|
+
|
|
+$(modules:.ko=$(modpost-ext).o): %$(modpost-ext).o: %.o FORCE
|
|
+ $(call if_changed,cc_lto_link_modules)
|
|
+endif
|
|
+
|
|
# We can go over command line length here, so be careful.
|
|
quiet_cmd_modpost = MODPOST $(words $(filter-out vmlinux FORCE, $^)) modules
|
|
- cmd_modpost = $(MODLISTCMD) | sed 's/\.ko$$/.o/' | $(modpost) $(MODPOST_OPT) -s -T -
|
|
+ cmd_modpost = $(MODLISTCMD) | sed 's/\.ko$$/$(modpost-ext)\.o/' | $(modpost) $(MODPOST_OPT) -s -T -
|
|
|
|
PHONY += __modpost
|
|
-__modpost: $(modules:.ko=.o) FORCE
|
|
+__modpost: $(modules:.ko=$(modpost-ext).o) FORCE
|
|
$(call cmd,modpost) $(wildcard vmlinux)
|
|
|
|
quiet_cmd_kernel-mod = MODPOST $@
|
|
@@ -98,8 +114,7 @@ vmlinux.o: FORCE
|
|
|
|
# Declare generated files as targets for modpost
|
|
$(symverfile): __modpost ;
|
|
-$(modules:.ko=.mod.c): __modpost ;
|
|
-
|
|
+$(modules:.ko=$(modpost-ext).mod.c): __modpost ;
|
|
|
|
# Step 5), compile all *.mod.c files
|
|
|
|
@@ -110,22 +125,37 @@ quiet_cmd_cc_o_c = CC $@
|
|
cmd_cc_o_c = $(CC) $(c_flags) $(KBUILD_CFLAGS_MODULE) $(CFLAGS_MODULE) \
|
|
-c -o $@ $<
|
|
|
|
-$(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE
|
|
+$(modules:.ko=.mod.o): %.mod.o: %$(modpost-ext).mod.c FORCE
|
|
$(call if_changed_dep,cc_o_c)
|
|
|
|
-targets += $(modules:.ko=.mod.o)
|
|
+targets += $(modules:.ko=$(modpost-ext).mod.o)
|
|
|
|
ARCH_POSTLINK := $(wildcard $(srctree)/arch/$(SRCARCH)/Makefile.postlink)
|
|
|
|
# Step 6), final link of the modules with optional arch pass after final link
|
|
quiet_cmd_ld_ko_o = LD [M] $@
|
|
+
|
|
+ifdef CONFIG_LTO_CLANG
|
|
+ cmd_ld_ko_o = \
|
|
+ $(LD) -r $(LDFLAGS) \
|
|
+ $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \
|
|
+ $(shell [ -s $(@:.ko=.o.symversions) ] && \
|
|
+ echo -T $(@:.ko=.o.symversions)) \
|
|
+ -o $@ --whole-archive \
|
|
+ $(filter-out FORCE,$(^:$(modpost-ext).o=.o))
|
|
+
|
|
+ ifdef CONFIG_FTRACE_MCOUNT_RECORD
|
|
+ cmd_ld_ko_o += ; $(objtree)/scripts/recordmcount $(RECORDMCOUNT_FLAGS) $@
|
|
+ endif
|
|
+else
|
|
cmd_ld_ko_o = \
|
|
$(LD) -r $(LDFLAGS) \
|
|
$(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \
|
|
-o $@ $(filter-out FORCE,$^) ; \
|
|
$(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true)
|
|
+endif
|
|
|
|
-$(modules): %.ko :%.o %.mod.o FORCE
|
|
+$(modules): %.ko: %$(modpost-ext).o %.mod.o FORCE
|
|
+$(call if_changed,ld_ko_o)
|
|
|
|
targets += $(modules)
|