History

Merge tag 'kbuild-v4.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull more Kbuild updates from Masahiro Yamada: - use 'pwd' instead of '/bin/pwd' for portability - clean up Makefiles - fix ld-option for clang - fix malloc'ed data size in Kconfig - fix parallel building along with coccicheck - fix a minor issue of package building - prompt to use "rpm-pkg" instead of "rpm" - clean up *.i and *.lst patterns by "make clean" * tag 'kbuild-v4.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: kbuild: drop $(extra-y) from real-objs-y kbuild: clean up *.i and *.lst patterns by make clean kbuild: rpm: prompt to use "rpm-pkg" if "rpm" target is used kbuild: pkg: use --transform option to prefix paths in tar coccinelle: fix parallel build with CHECK=scripts/coccicheck kconfig/symbol.c: use correct pointer type argument for sizeof kbuild: Set KBUILD_CFLAGS before incl. arch Makefile kbuild: remove all dummy assignments to obj- kbuild: create built-in.o automatically if parent directory wants it kbuild: /bin/pwd -> pwd

Linus Torvalds committed 8 years ago

Commit 5e2fda42 parents f61ec2c 10aaa3b29 files · +58 −113Browse files

Unified · Split

29 files
  1. Documentation/ia64/xen.txt +1 −1
  2. Makefile +39 −38
  3. arch/arm/mach-uniphier/Makefile +0 −1
  4. arch/mips/boot/dts/brcm/Makefile +0 −3
  5. arch/mips/boot/dts/cavium-octeon/Makefile +0 −3
  6. arch/mips/boot/dts/img/Makefile +0 −3
  7. arch/mips/boot/dts/ingenic/Makefile +0 −3
  8. arch/mips/boot/dts/lantiq/Makefile +0 −3
  9. arch/mips/boot/dts/mti/Makefile +0 −3
  10. arch/mips/boot/dts/netlogic/Makefile +0 −3
  11. arch/mips/boot/dts/ni/Makefile +0 −3
  12. arch/mips/boot/dts/pic32/Makefile +0 −3
  13. arch/mips/boot/dts/qca/Makefile +0 −3
  14. arch/mips/boot/dts/ralink/Makefile +0 −3
  15. arch/mips/boot/dts/xilfpga/Makefile +0 −3
  16. firmware/Makefile +0 −3
  17. samples/bpf/Makefile +0 −3
  18. samples/hidraw/Makefile +0 −3
  19. samples/seccomp/Makefile +0 −3
  20. samples/sockmap/Makefile +0 −3
  21. samples/statx/Makefile +0 −3
  22. samples/uhid/Makefile +0 −3
  23. scripts/Makefile.build +2 −2
  24. scripts/Makefile.lib +1 −1
  25. scripts/coccicheck +9 −6
  26. scripts/kconfig/symbol.c +1 −1
  27. scripts/package/Makefile +3 −4
  28. tools/power/cpupower/Makefile +1 −1
  29. tools/scripts/Makefile.include +1 −1
Documentation/ia64/xen.txt+1−1
@@ -41,7 +41,7 @@ Getting and Building Xen and Dom0 · 40 unmodified lines
41 41
42 5. make initrd for Dom0/DomU42 5. make initrd for Dom0/DomU
43 # make -C linux-2.6.18-xen.hg ARCH=ia64 modules_install \43 # make -C linux-2.6.18-xen.hg ARCH=ia64 modules_install \
44 O=$(/bin/pwd)/build-linux-2.6.18-xen_ia6444 O=$(pwd)/build-linux-2.6.18-xen_ia64
45 # mkinitrd -f /boot/efi/efi/redhat/initrd-2.6.18.8-xen.img \45 # mkinitrd -f /boot/efi/efi/redhat/initrd-2.6.18.8-xen.img \
46 2.6.18.8-xen --builtin mptspi --builtin mptbase \46 2.6.18.8-xen --builtin mptspi --builtin mptbase \
47 --builtin mptscsih --builtin uhci-hcd --builtin ohci-hcd \47 --builtin mptscsih --builtin uhci-hcd --builtin ohci-hcd \
Makefile+39−38
@@ -132,7 +132,7 @@ ifneq ($(KBUILD_OUTPUT),) · 131 unmodified lines
132# check that the output directory actually exists132# check that the output directory actually exists
133saved-output := $(KBUILD_OUTPUT)133saved-output := $(KBUILD_OUTPUT)
134KBUILD_OUTPUT := $(shell mkdir -p $(KBUILD_OUTPUT) && cd $(KBUILD_OUTPUT) \134KBUILD_OUTPUT := $(shell mkdir -p $(KBUILD_OUTPUT) && cd $(KBUILD_OUTPUT) \
135 && /bin/pwd)135 && pwd)
136$(if $(KBUILD_OUTPUT),, \136$(if $(KBUILD_OUTPUT),, \
137 $(error failed to create output directory "$(saved-output)"))137 $(error failed to create output directory "$(saved-output)"))
138 138
@@ -474,6 +474,38 @@ ifneq ($(KBUILD_SRC),) · 335 unmodified lines
474 $(srctree) $(objtree) $(VERSION) $(PATCHLEVEL)474 $(srctree) $(objtree) $(VERSION) $(PATCHLEVEL)
475endif475endif
476 476
477ifeq ($(cc-name),clang)
478ifneq ($(CROSS_COMPILE),)
479CLANG_TARGET := --target=$(notdir $(CROSS_COMPILE:%-=%))
480GCC_TOOLCHAIN := $(realpath $(dir $(shell which $(LD)))/..)
481endif
482ifneq ($(GCC_TOOLCHAIN),)
483CLANG_GCC_TC := --gcc-toolchain=$(GCC_TOOLCHAIN)
484endif
485KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)
486KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)
487KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)
488KBUILD_CFLAGS += $(call cc-disable-warning, unused-variable)
489KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier)
490KBUILD_CFLAGS += $(call cc-disable-warning, gnu)
491KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)
492# Quiet clang warning: comparison of unsigned expression < 0 is always false
493KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare)
494# CLANG uses a _MergedGlobals as optimization, but this breaks modpost, as the
495# source of a reference will be _MergedGlobals and not on of the whitelisted names.
496# See modpost pattern 2
497KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)
498KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior)
499KBUILD_CFLAGS += $(call cc-option, -no-integrated-as)
500KBUILD_AFLAGS += $(call cc-option, -no-integrated-as)
501else
502
503# These warnings generated too much noise in a regular build.
504# Use make W=1 to enable them (see scripts/Makefile.extrawarn)
505KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)
506KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)
507endif
508
477ifeq ($(config-targets),1)509ifeq ($(config-targets),1)
478# ===========================================================================510# ===========================================================================
479# *config targets only - make sure prerequisites are updated, and descend511# *config targets only - make sure prerequisites are updated, and descend
@@ -684,38 +716,6 @@ ifdef CONFIG_CC_STACKPROTECTOR · 204 unmodified lines
684endif716endif
685KBUILD_CFLAGS += $(stackp-flag)717KBUILD_CFLAGS += $(stackp-flag)
686 718
687ifeq ($(cc-name),clang)
688ifneq ($(CROSS_COMPILE),)
689CLANG_TARGET := --target=$(notdir $(CROSS_COMPILE:%-=%))
690GCC_TOOLCHAIN := $(realpath $(dir $(shell which $(LD)))/..)
691endif
692ifneq ($(GCC_TOOLCHAIN),)
693CLANG_GCC_TC := --gcc-toolchain=$(GCC_TOOLCHAIN)
694endif
695KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)
696KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)
697KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)
698KBUILD_CFLAGS += $(call cc-disable-warning, unused-variable)
699KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier)
700KBUILD_CFLAGS += $(call cc-disable-warning, gnu)
701KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)
702# Quiet clang warning: comparison of unsigned expression < 0 is always false
703KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare)
704# CLANG uses a _MergedGlobals as optimization, but this breaks modpost, as the
705# source of a reference will be _MergedGlobals and not on of the whitelisted names.
706# See modpost pattern 2
707KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)
708KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior)
709KBUILD_CFLAGS += $(call cc-option, -no-integrated-as)
710KBUILD_AFLAGS += $(call cc-option, -no-integrated-as)
711else
712
713# These warnings generated too much noise in a regular build.
714# Use make W=1 to enable them (see scripts/Makefile.extrawarn)
715KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)
716KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)
717endif
718
719ifdef CONFIG_FRAME_POINTER719ifdef CONFIG_FRAME_POINTER
720KBUILD_CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls720KBUILD_CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls
721else721else
@@ -1009,7 +1009,7 @@ $(sort $(vmlinux-deps)): $(vmlinux-dirs) ; · 287 unmodified lines
1009 1009
1010PHONY += $(vmlinux-dirs)1010PHONY += $(vmlinux-dirs)
1011$(vmlinux-dirs): prepare scripts1011$(vmlinux-dirs): prepare scripts
1012 $(Q)$(MAKE) $(build)=$@1012 $(Q)$(MAKE) $(build)=$@ need-builtin=1
1013 1013
1014define filechk_kernel.release1014define filechk_kernel.release
1015 echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))"1015 echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))"
@@ -1337,8 +1337,9 @@ package-dir := scripts/package · 321 unmodified lines
1337 $(Q)$(MAKE) $(build)=$(package-dir) $@1337 $(Q)$(MAKE) $(build)=$(package-dir) $@
1338%pkg: include/config/kernel.release FORCE1338%pkg: include/config/kernel.release FORCE
1339 $(Q)$(MAKE) $(build)=$(package-dir) $@1339 $(Q)$(MAKE) $(build)=$(package-dir) $@
1340rpm: include/config/kernel.release FORCE1340rpm: rpm-pkg
1341 $(Q)$(MAKE) $(build)=$(package-dir) $@1341 @echo " WARNING: \"rpm\" target will be removed after Linux 4.18"
1342 @echo " Please use \"rpm-pkg\" instead."
1342 1343
1343 1344
1344# Brief documentation of the typical targets used1345# Brief documentation of the typical targets used
@@ -1546,9 +1547,9 @@ clean: $(clean-dirs) · 201 unmodified lines
1546 $(call cmd,rmdirs)1547 $(call cmd,rmdirs)
1547 $(call cmd,rmfiles)1548 $(call cmd,rmfiles)
1548 @find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \1549 @find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \
1549 \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \1550 \( -name '*.[aios]' -o -name '*.ko' -o -name '.*.cmd' \
1550 -o -name '*.ko.*' -o -name '*.dtb' -o -name '*.dtb.S' \1551 -o -name '*.ko.*' -o -name '*.dtb' -o -name '*.dtb.S' \
1551 -o -name '*.dwo' \1552 -o -name '*.dwo' -o -name '*.lst' \
1552 -o -name '*.su' \1553 -o -name '*.su' \
1553 -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \1554 -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
1554 -o -name '*.symtypes' -o -name 'modules.order' \1555 -o -name '*.symtypes' -o -name 'modules.order' \
arch/arm/mach-uniphier/Makefile+0−1
@@ -1 +0,0 @@
1obj- += dummy.o
arch/mips/boot/dts/brcm/Makefile+0−3
@@ -35,6 +35,3 @@ dtb-$(CONFIG_DT_NONE) += \ · 34 unmodified lines
35 bcm97435svmb.dtb35 bcm97435svmb.dtb
36 36
37obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))37obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
38
39# Force kbuild to make empty built-in.o if necessary
40obj- += dummy.o
arch/mips/boot/dts/cavium-octeon/Makefile+0−3
@@ -2,6 +2,3 @@ · 1 unmodified line
2dtb-$(CONFIG_CAVIUM_OCTEON_SOC) += octeon_3xxx.dtb octeon_68xx.dtb2dtb-$(CONFIG_CAVIUM_OCTEON_SOC) += octeon_3xxx.dtb octeon_68xx.dtb
3 3
4obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))4obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
5
6# Force kbuild to make empty built-in.o if necessary
7obj- += dummy.o
arch/mips/boot/dts/img/Makefile+0−3
@@ -3,6 +3,3 @@ dtb-$(CONFIG_FIT_IMAGE_FDT_BOSTON) += boston.dtb · 2 unmodified lines
3 3
4dtb-$(CONFIG_MACH_PISTACHIO) += pistachio_marduk.dtb4dtb-$(CONFIG_MACH_PISTACHIO) += pistachio_marduk.dtb
5obj-$(CONFIG_MACH_PISTACHIO) += pistachio_marduk.dtb.o5obj-$(CONFIG_MACH_PISTACHIO) += pistachio_marduk.dtb.o
6
7# Force kbuild to make empty built-in.o if necessary
8obj- += dummy.o
arch/mips/boot/dts/ingenic/Makefile+0−3
@@ -3,6 +3,3 @@ dtb-$(CONFIG_JZ4740_QI_LB60) += qi_lb60.dtb · 2 unmodified lines
3dtb-$(CONFIG_JZ4780_CI20) += ci20.dtb3dtb-$(CONFIG_JZ4780_CI20) += ci20.dtb
4 4
5obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))5obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
6
7# Force kbuild to make empty built-in.o if necessary
8obj- += dummy.o
arch/mips/boot/dts/lantiq/Makefile+0−3
@@ -2,6 +2,3 @@ · 1 unmodified line
2dtb-$(CONFIG_DT_EASY50712) += easy50712.dtb2dtb-$(CONFIG_DT_EASY50712) += easy50712.dtb
3 3
4obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))4obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
5
6# Force kbuild to make empty built-in.o if necessary
7obj- += dummy.o
arch/mips/boot/dts/mti/Makefile+0−3
@@ -3,6 +3,3 @@ dtb-$(CONFIG_MIPS_MALTA) += malta.dtb · 2 unmodified lines
3dtb-$(CONFIG_LEGACY_BOARD_SEAD3) += sead3.dtb3dtb-$(CONFIG_LEGACY_BOARD_SEAD3) += sead3.dtb
4 4
5obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))5obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
6
7# Force kbuild to make empty built-in.o if necessary
8obj- += dummy.o
arch/mips/boot/dts/netlogic/Makefile+0−3
@@ -6,6 +6,3 @@ dtb-$(CONFIG_DT_XLP_GVP) += xlp_gvp.dtb · 5 unmodified lines
6dtb-$(CONFIG_DT_XLP_RVP) += xlp_rvp.dtb6dtb-$(CONFIG_DT_XLP_RVP) += xlp_rvp.dtb
7 7
8obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))8obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
9
10# Force kbuild to make empty built-in.o if necessary
11obj- += dummy.o
arch/mips/boot/dts/ni/Makefile+0−3
@@ -1,4 +1 @@
1dtb-$(CONFIG_FIT_IMAGE_FDT_NI169445) += 169445.dtb1dtb-$(CONFIG_FIT_IMAGE_FDT_NI169445) += 169445.dtb
2
3# Force kbuild to make empty built-in.o if necessary
4obj- += dummy.o
arch/mips/boot/dts/pic32/Makefile+0−3
@@ -5,6 +5,3 @@ dtb-$(CONFIG_DTB_PIC32_NONE) += \ · 4 unmodified lines
5 pic32mzda_sk.dtb5 pic32mzda_sk.dtb
6 6
7obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))7obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
8
9# Force kbuild to make empty built-in.o if necessary
10obj- += dummy.o
arch/mips/boot/dts/qca/Makefile+0−3
@@ -5,6 +5,3 @@ dtb-$(CONFIG_ATH79) += ar9331_dpt_module.dtb · 4 unmodified lines
5dtb-$(CONFIG_ATH79) += ar9331_dragino_ms14.dtb5dtb-$(CONFIG_ATH79) += ar9331_dragino_ms14.dtb
6dtb-$(CONFIG_ATH79) += ar9331_omega.dtb6dtb-$(CONFIG_ATH79) += ar9331_omega.dtb
7dtb-$(CONFIG_ATH79) += ar9331_tl_mr3020.dtb7dtb-$(CONFIG_ATH79) += ar9331_tl_mr3020.dtb
8
9# Force kbuild to make empty built-in.o if necessary
10obj- += dummy.o
arch/mips/boot/dts/ralink/Makefile+0−3
@@ -7,6 +7,3 @@ dtb-$(CONFIG_DTB_OMEGA2P) += omega2p.dtb · 6 unmodified lines
7dtb-$(CONFIG_DTB_VOCORE2) += vocore2.dtb7dtb-$(CONFIG_DTB_VOCORE2) += vocore2.dtb
8 8
9obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))9obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
10
11# Force kbuild to make empty built-in.o if necessary
12obj- += dummy.o
arch/mips/boot/dts/xilfpga/Makefile+0−3
@@ -2,6 +2,3 @@ · 1 unmodified line
2dtb-$(CONFIG_FIT_IMAGE_FDT_XILFPGA) += nexys4ddr.dtb2dtb-$(CONFIG_FIT_IMAGE_FDT_XILFPGA) += nexys4ddr.dtb
3 3
4obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))4obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
5
6# Force kbuild to make empty built-in.o if necessary
7obj- += dummy.o
firmware/Makefile+0−3
@@ -59,6 +59,3 @@ endif · 58 unmodified lines
59 59
60targets := $(patsubst $(obj)/%,%, \60targets := $(patsubst $(obj)/%,%, \
61 $(shell find $(obj) -name \*.gen.S 2>/dev/null))61 $(shell find $(obj) -name \*.gen.S 2>/dev/null))
62# Without this, built-in.o won't be created when it's empty, and the
63# final vmlinux link will fail.
64obj- := dummy
samples/bpf/Makefile+0−3
@@ -1,7 +1,4 @@
1# SPDX-License-Identifier: GPL-2.01# SPDX-License-Identifier: GPL-2.0
2# kbuild trick to avoid linker error. Can be omitted if a module is built.
3obj- := dummy.o
4
5# List of programs to build2# List of programs to build
6hostprogs-y := test_lru_dist3hostprogs-y := test_lru_dist
7hostprogs-y += sock_example4hostprogs-y += sock_example
samples/hidraw/Makefile+0−3
@@ -1,7 +1,4 @@
1# SPDX-License-Identifier: GPL-2.01# SPDX-License-Identifier: GPL-2.0
2# kbuild trick to avoid linker error. Can be omitted if a module is built.
3obj- := dummy.o
4
5# List of programs to build2# List of programs to build
6hostprogs-y := hid-example3hostprogs-y := hid-example
7 4
samples/seccomp/Makefile+0−3
@@ -1,7 +1,4 @@
1# SPDX-License-Identifier: GPL-2.01# SPDX-License-Identifier: GPL-2.0
2# kbuild trick to avoid linker error. Can be omitted if a module is built.
3obj- := dummy.o
4
5hostprogs-$(CONFIG_SAMPLE_SECCOMP) := bpf-fancy dropper bpf-direct2hostprogs-$(CONFIG_SAMPLE_SECCOMP) := bpf-fancy dropper bpf-direct
6 3
7HOSTCFLAGS_bpf-fancy.o += -I$(objtree)/usr/include4HOSTCFLAGS_bpf-fancy.o += -I$(objtree)/usr/include
samples/sockmap/Makefile+0−3
@@ -1,6 +1,3 @@
1# kbuild trick to avoid linker error. Can be omitted if a module is built.
2obj- := dummy.o
3
4# List of programs to build1# List of programs to build
5hostprogs-y := sockmap2hostprogs-y := sockmap
6 3
samples/statx/Makefile+0−3
@@ -1,6 +1,3 @@
1# kbuild trick to avoid linker error. Can be omitted if a module is built.
2obj- := dummy.o
3
4# List of programs to build1# List of programs to build
5hostprogs-$(CONFIG_SAMPLE_STATX) := test-statx2hostprogs-$(CONFIG_SAMPLE_STATX) := test-statx
6 3
samples/uhid/Makefile+0−3
@@ -1,6 +1,3 @@
1# kbuild trick to avoid linker error. Can be omitted if a module is built.
2obj- := dummy.o
3
4# List of programs to build1# List of programs to build
5hostprogs-y := uhid-example2hostprogs-y := uhid-example
6 3
scripts/Makefile.build+2−2
@@ -76,7 +76,7 @@ lib-target := $(obj)/lib.a · 75 unmodified lines
76obj-y += $(obj)/lib-ksyms.o76obj-y += $(obj)/lib-ksyms.o
77endif77endif
78 78
79ifneq ($(strip $(obj-y) $(obj-m) $(obj-) $(subdir-m) $(lib-target)),)79ifneq ($(strip $(obj-y) $(need-builtin)),)
80builtin-target := $(obj)/built-in.o80builtin-target := $(obj)/built-in.o
81endif81endif
82 82
@@ -566,7 +566,7 @@ targets := $(filter-out $(PHONY), $(targets)) · 483 unmodified lines
566 566
567PHONY += $(subdir-ym)567PHONY += $(subdir-ym)
568$(subdir-ym):568$(subdir-ym):
569 $(Q)$(MAKE) $(build)=$@569 $(Q)$(MAKE) $(build)=$@ need-builtin=$(if $(findstring $@,$(subdir-obj-y)),1)
570 570
571# Add FORCE to the prequisites of a target to force it to be always rebuilt.571# Add FORCE to the prequisites of a target to force it to be always rebuilt.
572# ---------------------------------------------------------------------------572# ---------------------------------------------------------------------------
scripts/Makefile.lib+1−1
@@ -57,7 +57,7 @@ multi-objs-m := $(foreach m, $(multi-used-m), $($(m:.o=-objs)) $($(m:.o=-y))) · 56 unmodified lines
57subdir-obj-y := $(filter %/built-in.o, $(obj-y))57subdir-obj-y := $(filter %/built-in.o, $(obj-y))
58 58
59# Replace multi-part objects by their individual parts, look at local dir only59# Replace multi-part objects by their individual parts, look at local dir only
60real-objs-y := $(foreach m, $(filter-out $(subdir-obj-y), $(obj-y)), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))),$($(m:.o=-objs)) $($(m:.o=-y)),$(m))) $(extra-y)60real-objs-y := $(foreach m, $(filter-out $(subdir-obj-y), $(obj-y)), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))),$($(m:.o=-objs)) $($(m:.o=-y)),$(m)))
61real-objs-m := $(foreach m, $(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m))),$($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m)),$(m)))61real-objs-m := $(foreach m, $(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m))),$($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m)),$(m)))
62 62
63# DTB63# DTB
scripts/coccicheck+9−6
@@ -30,12 +30,6 @@ else · 29 unmodified lines
30 VERBOSE=030 VERBOSE=0
31fi31fi
32 32
33if [ -z "$J" ]; then
34 NPROC=$(getconf _NPROCESSORS_ONLN)
35else
36 NPROC="$J"
37fi
38
39FLAGS="--very-quiet"33FLAGS="--very-quiet"
40 34
41# You can use SPFLAGS to append extra arguments to coccicheck or override any35# You can use SPFLAGS to append extra arguments to coccicheck or override any
@@ -70,6 +64,9 @@ if [ "$C" = "1" -o "$C" = "2" ]; then · 28 unmodified lines
70 # Take only the last argument, which is the C file to test64 # Take only the last argument, which is the C file to test
71 shift $(( $# - 1 ))65 shift $(( $# - 1 ))
72 OPTIONS="$COCCIINCLUDE $1"66 OPTIONS="$COCCIINCLUDE $1"
67
68 # No need to parallelize Coccinelle since this mode takes one input file.
69 NPROC=1
73else70else
74 ONLINE=071 ONLINE=0
75 if [ "$KBUILD_EXTMOD" = "" ] ; then72 if [ "$KBUILD_EXTMOD" = "" ] ; then
@@ -77,6 +74,12 @@ else · 1 unmodified line
77 else74 else
78 OPTIONS="--dir $KBUILD_EXTMOD $COCCIINCLUDE"75 OPTIONS="--dir $KBUILD_EXTMOD $COCCIINCLUDE"
79 fi76 fi
77
78 if [ -z "$J" ]; then
79 NPROC=$(getconf _NPROCESSORS_ONLN)
80 else
81 NPROC="$J"
82 fi
80fi83fi
81 84
82if [ "$KBUILD_EXTMOD" != "" ] ; then85if [ "$KBUILD_EXTMOD" != "" ] ; then
scripts/kconfig/symbol.c+1−1
@@ -1061,7 +1061,7 @@ struct symbol **sym_re_search(const char *pattern) · 1060 unmodified lines
1061 }1061 }
1062 if (sym_match_arr) {1062 if (sym_match_arr) {
1063 qsort(sym_match_arr, cnt, sizeof(struct sym_match), sym_rel_comp);1063 qsort(sym_match_arr, cnt, sizeof(struct sym_match), sym_rel_comp);
1064 sym_arr = malloc((cnt+1) * sizeof(struct symbol));1064 sym_arr = malloc((cnt+1) * sizeof(struct symbol *));
1065 if (!sym_arr)1065 if (!sym_arr)
1066 goto sym_re_search_free;1066 goto sym_re_search_free;
1067 for (i = 0; i < cnt; i++)1067 for (i = 0; i < cnt; i++)
scripts/package/Makefile+3−4
@@ -39,14 +39,13 @@ if test "$(objtree)" != "$(srctree)"; then \ · 38 unmodified lines
39 false; \39 false; \
40fi ; \40fi ; \
41$(srctree)/scripts/setlocalversion --save-scmversion; \41$(srctree)/scripts/setlocalversion --save-scmversion; \
42ln -sf $(srctree) $(2); \
43tar -cz $(RCS_TAR_IGNORE) -f $(2).tar.gz \42tar -cz $(RCS_TAR_IGNORE) -f $(2).tar.gz \
44 $(addprefix $(2)/,$(TAR_CONTENT) $(3)); \43 --transform 's:^:$(2)/:S' $(TAR_CONTENT) $(3); \
45rm -f $(2) $(objtree)/.scmversion44rm -f $(objtree)/.scmversion
46 45
47# rpm-pkg46# rpm-pkg
48# ---------------------------------------------------------------------------47# ---------------------------------------------------------------------------
49rpm-pkg rpm: FORCE48rpm-pkg: FORCE
50 $(MAKE) clean49 $(MAKE) clean
51 $(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec50 $(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec
52 $(call cmd,src_tar,$(KERNELPATH),kernel.spec)51 $(call cmd,src_tar,$(KERNELPATH),kernel.spec)
tools/power/cpupower/Makefile+1−1
@@ -26,7 +26,7 @@ endif · 25 unmodified lines
26 26
27ifneq ($(OUTPUT),)27ifneq ($(OUTPUT),)
28# check that the output directory actually exists28# check that the output directory actually exists
29OUTDIR := $(shell cd $(OUTPUT) && /bin/pwd)29OUTDIR := $(shell cd $(OUTPUT) && pwd)
30$(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist))30$(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist))
31endif31endif
32 32
tools/scripts/Makefile.include+1−1
@@ -13,7 +13,7 @@ endif · 12 unmodified lines
13 13
14# check that the output directory actually exists14# check that the output directory actually exists
15ifneq ($(OUTPUT),)15ifneq ($(OUTPUT),)
16OUTDIR := $(shell cd $(OUTPUT) && /bin/pwd)16OUTDIR := $(shell cd $(OUTPUT) && pwd)
17$(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist))17$(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist))
18endif18endif
19 19