forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771 
 kernel/scripts/Makefile.build
....@@ -16,6 +16,8 @@
1616 lib-y :=
1717 lib-m :=
1818 always :=
19
+always-y :=
20
+always-m :=
1921 targets :=
2022 subdir-y :=
2123 subdir-m :=
....@@ -36,96 +38,80 @@
3638 
3739 include scripts/Kbuild.include
3840 
39
-# For backward compatibility check that these variables do not change
40
-save-cflags := $(CFLAGS)
41
-
4241 # The filename Kbuild has precedence over Makefile
4342 kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
4443 kbuild-file := $(if $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Kbuild,$(kbuild-dir)/Makefile)
4544 include $(kbuild-file)
4645 
47
-# If the save-* variables changed error out
48
-ifeq ($(KBUILD_NOPEDANTIC),)
49
-        ifneq ("$(save-cflags)","$(CFLAGS)")
50
-                $(error CFLAGS was changed in "$(kbuild-file)". Fix it to use ccflags-y)
51
-        endif
52
-endif
53
-
5446 include scripts/Makefile.lib
5547 
56
-# Do not include host rules unless needed
57
-ifneq ($(hostprogs-y)$(hostprogs-m)$(hostlibs-y)$(hostlibs-m)$(hostcxxlibs-y)$(hostcxxlibs-m),)
48
+# Do not include hostprogs rules unless needed.
49
+# $(sort ...) is used here to remove duplicated words and excessive spaces.
50
+hostprogs := $(sort $(hostprogs))
51
+ifneq ($(hostprogs),)
5852 include scripts/Makefile.host
53
+endif
54
+
55
+# Do not include userprogs rules unless needed.
56
+# $(sort ...) is used here to remove duplicated words and excessive spaces.
57
+userprogs := $(sort $(userprogs))
58
+ifneq ($(userprogs),)
59
+include scripts/Makefile.userprogs
5960 endif
6061 
6162 ifndef obj
6263 $(warning kbuild: Makefile.build is included improperly)
6364 endif
6465 
66
+ifeq ($(need-modorder),)
67
+ifneq ($(obj-m),)
68
+$(warning $(patsubst %.o,'%.ko',$(obj-m)) will not be built even though obj-m is specified.)
69
+$(warning You cannot use subdir-y/m to visit a module Makefile. Use obj-y/m instead.)
70
+endif
71
+endif
72
+
6573 # ===========================================================================
6674 
75
+# subdir-builtin and subdir-modorder may contain duplications. Use $(sort ...)
76
+subdir-builtin := $(sort $(filter %/built-in.a, $(real-obj-y)))
77
+subdir-modorder := $(sort $(filter %/modules.order, $(obj-m)))
78
+
79
+targets-for-builtin := $(extra-y)
80
+
6781 ifneq ($(strip $(lib-y) $(lib-m) $(lib-)),)
68
-lib-target := $(obj)/lib.a
69
-real-obj-y += $(obj)/lib-ksyms.o
82
+targets-for-builtin += $(obj)/lib.a
7083 endif
7184 
72
-ifneq ($(strip $(real-obj-y) $(need-builtin)),)
73
-builtin-target := $(obj)/built-in.a
85
+ifdef need-builtin
86
+targets-for-builtin += $(obj)/built-in.a
7487 endif
7588 
76
-modorder-target := $(obj)/modules.order
89
+targets-for-modules := $(patsubst %.o, %.mod, $(filter %.o, $(obj-m)))
7790 
78
-# We keep a list of all modules in $(MODVERDIR)
91
+ifdef need-modorder
92
+targets-for-modules += $(obj)/modules.order
93
+endif
7994 
80
-__build: $(if $(KBUILD_BUILTIN),$(builtin-target) $(lib-target) $(extra-y)) \
81
-	 $(if $(KBUILD_MODULES),$(obj-m) $(modorder-target)) \
82
-	 $(subdir-ym) $(always)
83
-	@:
95
+targets += $(targets-for-builtin) $(targets-for-modules)
8496 
8597 # Linus' kernel sanity checking tool
86
-ifneq ($(KBUILD_CHECKSRC),0)
87
-  ifeq ($(KBUILD_CHECKSRC),2)
88
-    quiet_cmd_force_checksrc = CHECK   $<
89
-          cmd_force_checksrc = $(CHECK) $(CHECKFLAGS) $(c_flags) $< ;
90
-  else
91
-      quiet_cmd_checksrc     = CHECK   $<
92
-            cmd_checksrc     = $(CHECK) $(CHECKFLAGS) $(c_flags) $< ;
93
-  endif
98
+ifeq ($(KBUILD_CHECKSRC),1)
99
+  quiet_cmd_checksrc       = CHECK   $<
100
+        cmd_checksrc       = $(CHECK) $(CHECKFLAGS) $(c_flags) $<
101
+else ifeq ($(KBUILD_CHECKSRC),2)
102
+  quiet_cmd_force_checksrc = CHECK   $<
103
+        cmd_force_checksrc = $(CHECK) $(CHECKFLAGS) $(c_flags) $<
94104 endif
95105 
96
-ifneq ($(KBUILD_ENABLE_EXTRA_GCC_CHECKS),)
97
-  cmd_checkdoc = $(srctree)/scripts/kernel-doc -none $< ;
98
-endif
99
-
100
-# Do section mismatch analysis for each module/built-in.a
101
-ifdef CONFIG_DEBUG_SECTION_MISMATCH
102
-  cmd_secanalysis = ; scripts/mod/modpost $@
106
+ifneq ($(KBUILD_EXTRA_WARN),)
107
+  cmd_checkdoc = $(srctree)/scripts/kernel-doc -none $<
103108 endif
104109 
105110 # Compile C sources (.c)
106111 # ---------------------------------------------------------------------------
107112 
108
-# Default is built-in, unless we know otherwise
109
-modkern_cflags =                                          \
110
-	$(if $(part-of-module),                           \
111
-		$(KBUILD_CFLAGS_MODULE) $(CFLAGS_MODULE), \
112
-		$(KBUILD_CFLAGS_KERNEL) $(CFLAGS_KERNEL))
113
-quiet_modtag := $(empty)   $(empty)
114
-
115
-$(real-obj-m)        : part-of-module := y
116
-$(real-obj-m:.o=.i)  : part-of-module := y
117
-$(real-obj-m:.o=.s)  : part-of-module := y
118
-$(real-obj-m:.o=.lst): part-of-module := y
119
-
120
-$(real-obj-m)        : quiet_modtag := [M]
121
-$(real-obj-m:.o=.i)  : quiet_modtag := [M]
122
-$(real-obj-m:.o=.s)  : quiet_modtag := [M]
123
-$(real-obj-m:.o=.lst): quiet_modtag := [M]
124
-
125
-$(obj-m)             : quiet_modtag := [M]
126
-
127113 quiet_cmd_cc_s_c = CC $(quiet_modtag)  $@
128
-cmd_cc_s_c       = $(CC) $(c_flags) $(DISABLE_LTO) -fverbose-asm -S -o $@ $<
114
+      cmd_cc_s_c = $(CC) -fverbose-asm $(filter-out $(DEBUG_CFLAGS) $(CC_FLAGS_LTO), $(c_flags)) -S -o $@ $<
129115 
130116 $(obj)/%.s: $(src)/%.c FORCE
131117 	$(call if_changed_dep,cc_s_c)
....@@ -139,14 +125,13 @@
139125 # These mirror gensymtypes_S and co below, keep them in synch.
140126 cmd_gensymtypes_c =                                                         \
141127     $(CPP) -D__GENKSYMS__ $(c_flags) $< |                                   \
142
-    $(GENKSYMS) $(if $(1), -T $(2))                                         \
128
+    scripts/genksyms/genksyms $(if $(1), -T $(2))                           \
143129      $(patsubst y,-R,$(CONFIG_MODULE_REL_CRCS))                             \
144130      $(if $(KBUILD_PRESERVE),-p)                                            \
145131      -r $(firstword $(wildcard $(2:.symtypes=.symref) /dev/null))
146132 
147133 quiet_cmd_cc_symtypes_c = SYM $(quiet_modtag) $@
148134 cmd_cc_symtypes_c =                                                         \
149
-    set -e;                                                                 \
150135     $(call cmd_gensymtypes_c,true,$@) >/dev/null;                           \
151136     test -s $@ || rm -f $@
152137 
....@@ -166,69 +151,49 @@
166151 # (See cmd_cc_o_c + relevant part of rule_cc_o_c)
167152 
168153 quiet_cmd_cc_o_c = CC $(quiet_modtag)  $@
154
+      cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $<
169155 
170
-ifndef CONFIG_MODVERSIONS
171
-cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $<
172
-
173
-else
156
+ifdef CONFIG_MODVERSIONS
174157 # When module versioning is enabled the following steps are executed:
175
-# o compile a .tmp_<file>.o from <file>.c
176
-# o if .tmp_<file>.o doesn't contain a __ksymtab version, i.e. does
177
-#   not export symbols, we just rename .tmp_<file>.o to <file>.o and
178
-#   are done.
158
+# o compile a <file>.o from <file>.c
159
+# o if <file>.o doesn't contain a __ksymtab version, i.e. does
160
+#   not export symbols, it's done.
179161 # o otherwise, we calculate symbol versions using the good old
180162 #   genksyms on the preprocessed source and postprocess them in a way
181163 #   that they are usable as a linker script
182
-# o generate <file>.o from .tmp_<file>.o using the linker to
164
+# o generate .tmp_<file>.o from <file>.o using the linker to
183165 #   replace the unresolved symbols __crc_exported_symbol with
184166 #   the actual value of the checksum generated by genksyms
185
-
186
-cmd_cc_o_c = $(CC) $(c_flags) -c -o $(@D)/.tmp_$(@F) $<
167
+# o remove .tmp_<file>.o to <file>.o
187168 
188169 ifdef CONFIG_LTO_CLANG
189170 # Generate .o.symversions files for each .o with exported symbols, and link these
190171 # to the kernel and/or modules at the end.
191172 cmd_modversions_c =								\
192
-	if $(OBJDUMP) -h $(@D)/.tmp_$(@F) >/dev/null 2>/dev/null; then		\
193
-		if $(OBJDUMP) -h $(@D)/.tmp_$(@F) | grep -q __ksymtab; then	\
194
-			$(call cmd_gensymtypes_c,$(KBUILD_SYMTYPES),$(@:.o=.symtypes)) \
195
-			    > $(@D)/$(@F).symversions;				\
196
-		fi;								\
197
-	else									\
198
-		if $(LLVM_NM) $(@D)/.tmp_$(@F) | grep -q __ksymtab; then	\
199
-			$(call cmd_gensymtypes_c,$(KBUILD_SYMTYPES),$(@:.o=.symtypes)) \
200
-			    > $(@D)/$(@F).symversions;				\
201
-		fi;								\
202
-	fi;									\
203
-	mv -f $(@D)/.tmp_$(@F) $@;
173
+	if $(NM) $@ 2>/dev/null | grep -q __ksymtab; then			\
174
+		$(call cmd_gensymtypes_c,$(KBUILD_SYMTYPES),$(@:.o=.symtypes))	\
175
+		    > $@.symversions;						\
176
+	fi;
204177 else
205178 cmd_modversions_c =								\
206
-	if $(OBJDUMP) -h $(@D)/.tmp_$(@F) | grep -q __ksymtab; then		\
179
+	if $(OBJDUMP) -h $@ | grep -q __ksymtab; then				\
207180 		$(call cmd_gensymtypes_c,$(KBUILD_SYMTYPES),$(@:.o=.symtypes))	\
208181 		    > $(@D)/.tmp_$(@F:.o=.ver);					\
209182 										\
210
-		$(LD) $(KBUILD_LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F) 		\
183
+		$(LD) $(KBUILD_LDFLAGS) -r -o $(@D)/.tmp_$(@F) $@ 		\
211184 			-T $(@D)/.tmp_$(@F:.o=.ver);				\
212
-		rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver);		\
213
-	else									\
214185 		mv -f $(@D)/.tmp_$(@F) $@;					\
215
-	fi;
186
+		rm -f $(@D)/.tmp_$(@F:.o=.ver);					\
187
+	fi
216188 endif
217189 endif
218190 
219
-ifdef CONFIG_FTRACE_MCOUNT_RECORD
220
-ifndef CC_USING_RECORD_MCOUNT
191
+ifdef CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT
221192 # compiler will not generate __mcount_loc use recordmcount or recordmcount.pl
222193 ifdef BUILD_C_RECORDMCOUNT
223194 ifeq ("$(origin RECORDMCOUNT_WARN)", "command line")
224195   RECORDMCOUNT_FLAGS = -w
225196 endif
226
-
227
-ifdef CONFIG_LTO_CLANG
228
-# With LTO, we postpone running recordmcount until after the LTO link step, so
229
-# let's export the parameters for the link script.
230
-export RECORDMCOUNT_FLAGS
231
-else
232197 # Due to recursion, we must skip empty.o.
233198 # The empty.o file is created in the make process in order to determine
234199 # the target endianness and word size. It is made before all other C
....@@ -237,68 +202,39 @@
237202 	if [ $(@) != "scripts/mod/empty.o" ]; then	\
238203 		$(objtree)/scripts/recordmcount $(RECORDMCOUNT_FLAGS) "$(@)";	\
239204 	fi;
240
-endif
241
-
242205 recordmcount_source := $(srctree)/scripts/recordmcount.c \
243206 		    $(srctree)/scripts/recordmcount.h
244
-else # !BUILD_C_RECORDMCOUNT
245
-sub_cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \
207
+else
208
+sub_cmd_record_mcount = perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \
246209 	"$(if $(CONFIG_CPU_BIG_ENDIAN),big,little)" \
247210 	"$(if $(CONFIG_64BIT),64,32)" \
248211 	"$(OBJDUMP)" "$(OBJCOPY)" "$(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS)" \
249212 	"$(LD) $(KBUILD_LDFLAGS)" "$(NM)" "$(RM)" "$(MV)" \
250213 	"$(if $(part-of-module),1,0)" "$(@)";
251
-
252214 recordmcount_source := $(srctree)/scripts/recordmcount.pl
253215 endif # BUILD_C_RECORDMCOUNT
254
-
255
-ifndef CONFIG_LTO_CLANG
256
-cmd_record_mcount =						\
257
-	if [ "$(findstring $(CC_FLAGS_FTRACE),$(_c_flags))" =	\
258
-	     "$(CC_FLAGS_FTRACE)" ]; then			\
259
-		$(sub_cmd_record_mcount)			\
260
-	fi;
261
-endif # CONFIG_LTO_CLANG
262
-endif # CC_USING_RECORD_MCOUNT
263
-endif # CONFIG_FTRACE_MCOUNT_RECORD
216
+cmd_record_mcount = $(if $(findstring $(strip $(CC_FLAGS_FTRACE)),$(_c_flags)),	\
217
+	$(sub_cmd_record_mcount))
218
+endif # CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT
264219 
265220 ifdef CONFIG_STACK_VALIDATION
221
+ifndef CONFIG_LTO_CLANG
266222 ifneq ($(SKIP_STACK_VALIDATION),1)
267223 
268224 __objtool_obj := $(objtree)/tools/objtool/objtool
269
-
270
-objtool_args = $(if $(CONFIG_UNWINDER_ORC),orc generate,check)
271
-
272
-objtool_args += $(if $(part-of-module), --module,)
273
-
274
-ifndef CONFIG_FRAME_POINTER
275
-objtool_args += --no-fp
276
-endif
277
-ifdef CONFIG_GCOV_KERNEL
278
-objtool_args += --no-unreachable
279
-endif
280
-ifdef CONFIG_RETPOLINE
281
-  objtool_args += --retpoline
282
-endif
283
-
284
-
285
-ifdef CONFIG_MODVERSIONS
286
-objtool_o = $(@D)/.tmp_$(@F)
287
-else
288
-objtool_o = $(@)
289
-endif
290225 
291226 # 'OBJECT_FILES_NON_STANDARD := y': skip objtool checking for a directory
292227 # 'OBJECT_FILES_NON_STANDARD_foo.o := 'y': skip objtool checking for a file
293228 # 'OBJECT_FILES_NON_STANDARD_foo.o := 'n': override directory skip for a file
294229 cmd_objtool = $(if $(patsubst y%,, \
295230 	$(OBJECT_FILES_NON_STANDARD_$(basetarget).o)$(OBJECT_FILES_NON_STANDARD)n), \
296
-	$(__objtool_obj) $(objtool_args) "$(objtool_o)";)
231
+	$(__objtool_obj) $(objtool_args) $@)
297232 objtool_obj = $(if $(patsubst y%,, \
298233 	$(OBJECT_FILES_NON_STANDARD_$(basetarget).o)$(OBJECT_FILES_NON_STANDARD)n), \
299234 	$(__objtool_obj))
300235 
301236 endif # SKIP_STACK_VALIDATION
237
+endif # CONFIG_LTO_CLANG
302238 endif # CONFIG_STACK_VALIDATION
303239 
304240 # Rebuild all objects when objtool changes, or is enabled/disabled.
....@@ -306,40 +242,44 @@
306242 	      $(wildcard include/config/orc/unwinder.h		\
307243 			 include/config/stack/validation.h)
308244 
245
+ifdef CONFIG_TRIM_UNUSED_KSYMS
246
+cmd_gen_ksymdeps = \
247
+	$(CONFIG_SHELL) $(srctree)/scripts/gen_ksymdeps.sh $@ >> $(dot-target).cmd
248
+
249
+# List module undefined symbols
250
+undefined_syms = $(NM) $< | $(AWK) '$$1 == "U" { printf("%s%s", x++ ? " " : "", $$2) }';
251
+endif
252
+
309253 define rule_cc_o_c
310
-	$(call echo-cmd,checksrc) $(cmd_checksrc)			  \
311
-	$(call cmd_and_fixdep,cc_o_c)					  \
312
-	$(cmd_checkdoc)							  \
313
-	$(call echo-cmd,objtool) $(cmd_objtool)				  \
314
-	$(cmd_modversions_c)						  \
315
-	$(call echo-cmd,record_mcount) $(cmd_record_mcount)
254
+	$(call cmd_and_fixdep,cc_o_c)
255
+	$(call cmd,gen_ksymdeps)
256
+	$(call cmd,checksrc)
257
+	$(call cmd,checkdoc)
258
+	$(call cmd,objtool)
259
+	$(call cmd,modversions_c)
260
+	$(call cmd,record_mcount)
316261 endef
317262 
318263 define rule_as_o_S
319
-	$(call cmd_and_fixdep,as_o_S)					  \
320
-	$(call echo-cmd,objtool) $(cmd_objtool)				  \
321
-	$(cmd_modversions_S)
264
+	$(call cmd_and_fixdep,as_o_S)
265
+	$(call cmd,gen_ksymdeps)
266
+	$(call cmd,objtool)
267
+	$(call cmd,modversions_S)
322268 endef
323269 
324
-# List module undefined symbols (or empty line if not enabled)
325
-ifdef CONFIG_TRIM_UNUSED_KSYMS
326
-cmd_undef_syms = $(NM) $@ | sed -n 's/^  *U //p' | xargs echo
327
-else
328
-cmd_undef_syms = echo
329
-endif
330
-
331270 # Built-in and composite module parts
332
-$(obj)/%.o: $(src)/%.c $(recordmcount_source) $(objtool_dep) FORCE
333
-	$(call cmd,force_checksrc)
271
+.SECONDEXPANSION:
272
+$(obj)/%.o: $(src)/%.c $(recordmcount_source) $$(objtool_dep) FORCE
334273 	$(call if_changed_rule,cc_o_c)
335
-
336
-# Single-part modules are special since we need to mark them in $(MODVERDIR)
337
-
338
-$(single-used-m): $(obj)/%.o: $(src)/%.c $(recordmcount_source) $(objtool_dep) FORCE
339274 	$(call cmd,force_checksrc)
340
-	$(call if_changed_rule,cc_o_c)
341
-	@{ echo $(@:.o=.ko); echo $@; \
342
-	   $(cmd_undef_syms); } > $(MODVERDIR)/$(@F:.o=.mod)
275
+
276
+cmd_mod = { \
277
+	echo $(if $($*-objs)$($*-y)$($*-m), $(addprefix $(obj)/, $($*-objs) $($*-y) $($*-m)), $(@:.mod=.o)); \
278
+	$(undefined_syms) echo; \
279
+	} > $@
280
+
281
+$(obj)/%.mod: $(obj)/%.o FORCE
282
+	$(call if_changed,mod)
343283 
344284 quiet_cmd_cc_lst_c = MKLST   $@
345285       cmd_cc_lst_c = $(CC) $(c_flags) -g -c -o $*.o $< && \
....@@ -351,11 +291,6 @@
351291 
352292 # Compile assembler sources (.S)
353293 # ---------------------------------------------------------------------------
354
-
355
-modkern_aflags := $(KBUILD_AFLAGS_KERNEL) $(AFLAGS_KERNEL)
356
-
357
-$(real-obj-m)      : modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)
358
-$(real-obj-m:.o=.s): modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)
359294 
360295 # .S file exports must have their C prototypes defined in asm/asm-prototypes.h
361296 # or a file that it includes, in order to get versioned symbols. We build a
....@@ -369,20 +304,19 @@
369304 #
370305 # These mirror gensymtypes_c and co above, keep them in synch.
371306 cmd_gensymtypes_S =                                                         \
372
-    (echo "\#include <linux/kernel.h>" ;                                    \
307
+   { echo "\#include <linux/kernel.h>" ;                                    \
373308      echo "\#include <asm/asm-prototypes.h>" ;                              \
374309     $(CPP) $(a_flags) $< |                                                  \
375310      grep "\<___EXPORT_SYMBOL\>" |                                          \
376
-     sed 's/.*___EXPORT_SYMBOL[[:space:]]*\([a-zA-Z0-9_]*\)[[:space:]]*,.*/EXPORT_SYMBOL(\1);/' ) | \
311
+     sed 's/.*___EXPORT_SYMBOL[[:space:]]*\([a-zA-Z0-9_]*\)[[:space:]]*,.*/EXPORT_SYMBOL(\1);/' ; } | \
377312     $(CPP) -D__GENKSYMS__ $(c_flags) -xc - |                                \
378
-    $(GENKSYMS) $(if $(1), -T $(2))                                         \
313
+    scripts/genksyms/genksyms $(if $(1), -T $(2))                           \
379314      $(patsubst y,-R,$(CONFIG_MODULE_REL_CRCS))                             \
380315      $(if $(KBUILD_PRESERVE),-p)                                            \
381316      -r $(firstword $(wildcard $(2:.symtypes=.symref) /dev/null))
382317 
383318 quiet_cmd_cc_symtypes_S = SYM $(quiet_modtag) $@
384319 cmd_cc_symtypes_S =                                                         \
385
-    set -e;                                                                 \
386320     $(call cmd_gensymtypes_S,true,$@) >/dev/null;                           \
387321     test -s $@ || rm -f $@
388322 
....@@ -397,43 +331,31 @@
397331 	$(call if_changed_dep,cpp_s_S)
398332 
399333 quiet_cmd_as_o_S = AS $(quiet_modtag)  $@
334
+      cmd_as_o_S = $(CC) $(a_flags) -c -o $@ $<
400335 
401
-ifndef CONFIG_MODVERSIONS
402
-cmd_as_o_S = $(CC) $(a_flags) -c -o $@ $<
403
-
404
-else
405
-
406
-ASM_PROTOTYPES := $(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/asm-prototypes.h)
407
-
408
-ifeq ($(ASM_PROTOTYPES),)
409
-cmd_as_o_S = $(CC) $(a_flags) -c -o $@ $<
410
-
411
-else
336
+ifdef CONFIG_ASM_MODVERSIONS
412337 
413338 # versioning matches the C process described above, with difference that
414339 # we parse asm-prototypes.h C header to get function definitions.
415340 
416
-cmd_as_o_S = $(CC) $(a_flags) -c -o $(@D)/.tmp_$(@F) $<
417
-
418341 cmd_modversions_S =								\
419
-	if $(OBJDUMP) -h $(@D)/.tmp_$(@F) | grep -q __ksymtab; then		\
342
+	if $(OBJDUMP) -h $@ | grep -q __ksymtab; then				\
420343 		$(call cmd_gensymtypes_S,$(KBUILD_SYMTYPES),$(@:.o=.symtypes))	\
421344 		    > $(@D)/.tmp_$(@F:.o=.ver);					\
422345 										\
423
-		$(LD) $(KBUILD_LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F) 		\
346
+		$(LD) $(KBUILD_LDFLAGS) -r -o $(@D)/.tmp_$(@F) $@ 		\
424347 			-T $(@D)/.tmp_$(@F:.o=.ver);				\
425
-		rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver);		\
426
-	else									\
427348 		mv -f $(@D)/.tmp_$(@F) $@;					\
428
-	fi;
429
-endif
349
+		rm -f $(@D)/.tmp_$(@F:.o=.ver);					\
350
+	fi
430351 endif
431352 
432
-$(obj)/%.o: $(src)/%.S $(objtool_dep) FORCE
353
+$(obj)/%.o: $(src)/%.S $$(objtool_dep) FORCE
433354 	$(call if_changed_rule,as_o_S)
434355 
435
-targets += $(filter-out $(subdir-obj-y), $(real-obj-y)) $(real-obj-m) $(lib-y)
436
-targets += $(extra-y) $(MAKECMDGOALS) $(always)
356
+targets += $(filter-out $(subdir-builtin), $(real-obj-y))
357
+targets += $(filter-out $(subdir-modorder), $(real-obj-m))
358
+targets += $(lib-y) $(always-y) $(MAKECMDGOALS)
437359 
438360 # Linker scripts preprocessor (.lds.S -> .lds)
439361 # ---------------------------------------------------------------------------
....@@ -446,9 +368,9 @@
446368 
447369 # ASN.1 grammar
448370 # ---------------------------------------------------------------------------
449
-quiet_cmd_asn1_compiler = ASN.1   $@
371
+quiet_cmd_asn1_compiler = ASN.1   $(basename $@).[ch]
450372       cmd_asn1_compiler = $(objtree)/scripts/asn1_compiler $< \
451
-				$(subst .h,.c,$@) $(subst .c,.h,$@)
373
+				$(basename $@).c $(basename $@).h
452374 
453375 $(obj)/%.asn1.c $(obj)/%.asn1.h: $(src)/%.asn1 $(objtree)/scripts/asn1_compiler
454376 	$(call cmd,asn1_compiler)
....@@ -457,158 +379,75 @@
457379 # ---------------------------------------------------------------------------
458380 
459381 # To build objects in subdirs, we need to descend into the directories
460
-$(sort $(subdir-obj-y)): $(subdir-ym) ;
382
+$(subdir-builtin): $(obj)/%/built-in.a: $(obj)/% ;
383
+$(subdir-modorder): $(obj)/%/modules.order: $(obj)/% ;
461384 
462
-ifdef CONFIG_LTO_CLANG
463
-  ifdef CONFIG_MODVERSIONS
464
-    # combine symversions for later processing
465
-    update_lto_symversions =						\
466
-	rm -f $@.symversions; 						\
467
-	for i in $(foreach n,						\
468
-			$(filter-out FORCE,$^),				\
469
-			$(if $(wildcard $(n).symversions),$(n))); do	\
470
-		cat $$i.symversions >> $@.symversions;			\
471
-	done;
472
-  endif
473
-  # rebuild the symbol table with llvm-ar to include IR files
474
-  update_lto_symtable = ;				\
475
-	mv -f $@ $@.tmp;				\
476
-	$(LLVM_AR) rcsT$(KBUILD_ARFLAGS) $@ 		\
477
-		$$($(AR) t $@.tmp); 			\
478
-	rm -f $@.tmp
385
+# combine symversions for later processing
386
+quiet_cmd_update_lto_symversions = SYMVER  $@
387
+ifeq ($(CONFIG_LTO_CLANG) $(CONFIG_MODVERSIONS),y y)
388
+      cmd_update_lto_symversions =					\
389
+	rm -f $@.symversions						\
390
+	$(foreach n, $(filter-out FORCE,$^),				\
391
+		$(if $(shell test -s $(n).symversions && echo y),	\
392
+			; cat $(n).symversions >> $@.symversions))
393
+else
394
+      cmd_update_lto_symversions = echo >/dev/null
479395 endif
480396 
481397 #
482
-# Rule to compile a set of .o files into one .o file
398
+# Rule to compile a set of .o files into one .a file (without symbol table)
483399 #
484
-ifdef builtin-target
485400 
486
-# built-in.a archives are made with no symbol table or index which
487
-# makes them small and fast, but unable to be used by the linker.
488
-# scripts/link-vmlinux.sh builds an aggregate built-in.a with a symbol
489
-# table and index.
490401 quiet_cmd_ar_builtin = AR      $@
491
-      cmd_ar_builtin = $(update_lto_symversions) \
492
-		     rm -f $@; \
493
-                     $(AR) rcSTP$(KBUILD_ARFLAGS) $@ $(filter $(real-obj-y), $^)
402
+      cmd_ar_builtin = rm -f $@; $(AR) cDPrST $@ $(real-prereqs)
494403 
495
-$(builtin-target): $(real-obj-y) FORCE
496
-	$(call if_changed,ar_builtin)
404
+quiet_cmd_ar_and_symver = AR      $@
405
+      cmd_ar_and_symver = $(cmd_update_lto_symversions); $(cmd_ar_builtin)
497406 
498
-targets += $(builtin-target)
499
-endif # builtin-target
407
+$(obj)/built-in.a: $(real-obj-y) FORCE
408
+	$(call if_changed,ar_and_symver)
500409 
501410 #
502411 # Rule to create modules.order file
503412 #
504413 # Create commands to either record .ko file or cat modules.order from
505414 # a subdirectory
506
-modorder-cmds =						\
507
-	$(foreach m, $(modorder),			\
508
-		$(if $(filter %/modules.order, $m),	\
509
-			cat $m;, echo kernel/$m;))
415
+# Add $(obj-m) as the prerequisite to avoid updating the timestamp of
416
+# modules.order unless contained modules are updated.
510417 
511
-$(modorder-target): $(subdir-ym) FORCE
512
-	$(Q)(cat /dev/null; $(modorder-cmds)) > $@
418
+cmd_modules_order = { $(foreach m, $(real-prereqs), \
419
+	$(if $(filter %/modules.order, $m), cat $m, echo $(patsubst %.o,%.ko,$m));) :; } \
420
+	| $(AWK) '!x[$$0]++' - > $@
421
+
422
+$(obj)/modules.order: $(obj-m) FORCE
423
+	$(call if_changed,modules_order)
513424 
514425 #
515
-# Rule to compile a set of .o files into one .a file
426
+# Rule to compile a set of .o files into one .a file (with symbol table)
516427 #
517
-ifdef lib-target
518
-quiet_cmd_link_l_target = AR      $@
428
+quiet_cmd_ar_lib = AR      $@
429
+      cmd_ar_lib = $(cmd_update_lto_symversions); $(cmd_ar)
519430 
520
-# lib target archives do get a symbol table and index
521
-cmd_link_l_target = 					\
522
-	$(update_lto_symversions)			\
523
-	rm -f $@; 					\
524
-	$(AR) rcsTP$(KBUILD_ARFLAGS) $@ $(lib-y)	\
525
-	$(update_lto_symtable)
431
+$(obj)/lib.a: $(lib-y) FORCE
432
+	$(call if_changed,ar_lib)
526433 
527
-$(lib-target): $(lib-y) FORCE
528
-	$(call if_changed,link_l_target)
529
-
530
-targets += $(lib-target)
531
-
532
-dummy-object = $(obj)/.lib_exports.o
533
-ksyms-lds = $(dot-target).lds
534
-
535
-quiet_cmd_export_list = EXPORTS $@
536
-filter_export_list = sed -ne '/___ksymtab/s/.*+\([^ ]*\).*/EXTERN(\1)/p'
537
-link_export_list = rm -f $(dummy-object); \
538
-	echo | $(CC) $(a_flags) -c -o $(dummy-object) -x assembler -;\
539
-	$(LD) $(ld_flags) -r -o $@ -T $(ksyms-lds) $(dummy-object);\
540
-	rm $(dummy-object) $(ksyms-lds)
541
-
434
+# NOTE:
435
+# Do not replace $(filter %.o,^) with $(real-prereqs). When a single object
436
+# module is turned into a multi object module, $^ will contain header file
437
+# dependencies recorded in the .*.cmd file.
542438 ifdef CONFIG_LTO_CLANG
543
-# objdump doesn't understand IR files and llvm-nm doesn't support archives,
544
-# so we'll walk through each file in the archive separately
545
-cmd_export_list = 					\
546
-	rm -f $(ksyms-lds);				\
547
-	for o in $$($(AR) t $<); do			\
548
-		if $(OBJDUMP) -h $$o >/dev/null 2>/dev/null; then \
549
-			$(OBJDUMP) -h $$o | 		\
550
-				$(filter_export_list) 	\
551
-				>>$(ksyms-lds);		\
552
-		else					\
553
-			$(LLVM_NM) $$o |		\
554
-				$(filter_export_list) 	\
555
-				>>$(ksyms-lds);		\
556
-		fi; 					\
557
-	done;						\
558
-	$(link_export_list)
439
+quiet_cmd_link_multi-m = AR [M]  $@
440
+cmd_link_multi-m =						\
441
+	$(cmd_update_lto_symversions);				\
442
+	rm -f $@; 						\
443
+	$(AR) cDPrsT $@ $(filter %.o %.a,$^)
559444 else
560
-cmd_export_list = $(OBJDUMP) -h $< | $(filter_export_list) >$(ksyms-lds); \
561
-	$(link_export_list)
562
-endif
563
-
564
-$(obj)/lib-ksyms.o: $(lib-target) FORCE
565
-	$(call if_changed,export_list)
566
-
567
-targets += $(obj)/lib-ksyms.o
568
-
569
-endif
570
-
571
-#
572
-# Rule to link composite objects
573
-#
574
-#  Composite objects are specified in kbuild makefile as follows:
575
-#    <composite-object>-objs := <list of .o files>
576
-#  or
577
-#    <composite-object>-y    := <list of .o files>
578
-#  or
579
-#    <composite-object>-m    := <list of .o files>
580
-#  The -m syntax only works if <composite object> is a module
581
-link_multi_deps =                     \
582
-$(filter $(addprefix $(obj)/,         \
583
-$($(subst $(obj)/,,$(@:.o=-objs)))    \
584
-$($(subst $(obj)/,,$(@:.o=-y)))       \
585
-$($(subst $(obj)/,,$(@:.o=-m)))), $^)
586
-
587
-cmd_link_multi-link = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps) $(cmd_secanalysis)
588
-
589
-quiet_cmd_link_multi-y = AR      $@
590
-cmd_link_multi-y = $(update_lto_symversions) \
591
-	rm -f $@; $(AR) rcSTP$(KBUILD_ARFLAGS) $@ $(link_multi_deps) \
592
-	$(update_lto_symtable)
593
-
594445 quiet_cmd_link_multi-m = LD [M]  $@
595
-
596
-ifdef CONFIG_LTO_CLANG
597
-  # don't compile IR until needed
598
-  cmd_link_multi-m = $(cmd_link_multi-y)
599
-else
600
-  cmd_link_multi-m = $(cmd_link_multi-link)
446
+      cmd_link_multi-m = $(LD) $(ld_flags) -r -o $@ $(filter %.o,$^)
601447 endif
602
-
603
-$(multi-used-y): FORCE
604
-	$(call if_changed,link_multi-y)
605448 
606449 $(multi-used-m): FORCE
607450 	$(call if_changed,link_multi-m)
608
-	@{ echo $(@:.o=.ko); echo $(link_multi_deps); \
609
-	   $(cmd_undef_syms); } > $(MODVERDIR)/$(@F:.o=.mod)
610
-
611
-$(call multi_depend, $(multi-used-y), .o, -objs -y)
612451 $(call multi_depend, $(multi-used-m), .o, -objs -y -m)
613452 
614453 targets += $(multi-used-m)
....@@ -629,12 +468,55 @@
629468 	   $(call intermediate_targets, .lex.o, .lex.c) \
630469 	   $(call intermediate_targets, .tab.o, .tab.c .tab.h)
631470 
471
+# Build
472
+# ---------------------------------------------------------------------------
473
+
474
+ifdef single-build
475
+
476
+KBUILD_SINGLE_TARGETS := $(filter $(obj)/%, $(KBUILD_SINGLE_TARGETS))
477
+
478
+curdir-single := $(sort $(foreach x, $(KBUILD_SINGLE_TARGETS), \
479
+			$(if $(filter $(x) $(basename $(x)).o, $(targets)), $(x))))
480
+
481
+# Handle single targets without any rule: show "Nothing to be done for ..." or
482
+# "No rule to make target ..." depending on whether the target exists.
483
+unknown-single := $(filter-out $(addsuffix /%, $(subdir-ym)), \
484
+			$(filter-out $(curdir-single), $(KBUILD_SINGLE_TARGETS)))
485
+
486
+single-subdirs := $(foreach d, $(subdir-ym), \
487
+			$(if $(filter $(d)/%, $(KBUILD_SINGLE_TARGETS)), $(d)))
488
+
489
+__build: $(curdir-single) $(single-subdirs)
490
+ifneq ($(unknown-single),)
491
+	$(Q)$(MAKE) -f /dev/null $(unknown-single)
492
+endif
493
+	@:
494
+
495
+ifeq ($(curdir-single),)
496
+# Nothing to do in this directory. Do not include any .*.cmd file for speed-up
497
+targets :=
498
+else
499
+targets += $(curdir-single)
500
+endif
501
+
502
+else
503
+
504
+__build: $(if $(KBUILD_BUILTIN), $(targets-for-builtin)) \
505
+	 $(if $(KBUILD_MODULES), $(targets-for-modules)) \
506
+	 $(subdir-ym) $(always-y)
507
+	@:
508
+
509
+endif
510
+
632511 # Descending
633512 # ---------------------------------------------------------------------------
634513 
635514 PHONY += $(subdir-ym)
636515 $(subdir-ym):
637
-	$(Q)$(MAKE) $(build)=$@ need-builtin=$(if $(findstring $@,$(subdir-obj-y)),1)
516
+	$(Q)$(MAKE) $(build)=$@ \
517
+	$(if $(filter $@/, $(KBUILD_SINGLE_TARGETS)),single-build=) \
518
+	need-builtin=$(if $(filter $@/built-in.a, $(subdir-builtin)),1) \
519
+	need-modorder=$(if $(filter $@/modules.order, $(subdir-modorder)),1)
638520 
639521 # Add FORCE to the prequisites of a target to force it to be always rebuilt.
640522 # ---------------------------------------------------------------------------
....@@ -648,25 +530,17 @@
648530 # optimization, we don't need to read them if the target does not
649531 # exist, we will rebuild anyway in that case.
650532 
651
-cmd_files := $(wildcard $(foreach f,$(sort $(targets)),$(dir $(f)).$(notdir $(f)).cmd))
533
+existing-targets := $(wildcard $(sort $(targets)))
652534 
653
-ifneq ($(cmd_files),)
654
-  include $(cmd_files)
655
-endif
535
+-include $(foreach f,$(existing-targets),$(dir $(f)).$(notdir $(f)).cmd)
656536 
657
-ifneq ($(KBUILD_SRC),)
658537 # Create directories for object files if they do not exist
659
-obj-dirs := $(sort $(obj) $(patsubst %/,%, $(dir $(targets))))
660
-# If cmd_files exist, their directories apparently exist.  Skip mkdir.
661
-exist-dirs := $(sort $(patsubst %/,%, $(dir $(cmd_files))))
662
-obj-dirs := $(strip $(filter-out $(exist-dirs), $(obj-dirs)))
538
+obj-dirs := $(sort $(patsubst %/,%, $(dir $(targets))))
539
+# If targets exist, their directories apparently exist. Skip mkdir.
540
+existing-dirs := $(sort $(patsubst %/,%, $(dir $(existing-targets))))
541
+obj-dirs := $(strip $(filter-out $(existing-dirs), $(obj-dirs)))
663542 ifneq ($(obj-dirs),)
664543 $(shell mkdir -p $(obj-dirs))
665544 endif
666
-endif
667
-
668
-# Some files contained in $(targets) are intermediate artifacts.
669
-# We never want them to be removed automatically.
670
-.SECONDARY: $(targets)
671545 
672546 .PHONY: $(PHONY)