Commit 668c35f6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull Kbuild updates from Masahiro Yamada:
 "Kbuild core:
   - remove unneeded $(call cc-option,...) switches
   - consolidate Clang compiler flags into CLANG_FLAGS
   - announce the deprecation of SUBDIRS
   - fix single target build for external module
   - simplify the dependencies of 'prepare' stage targets
   - allow fixdep to directly write to .*.cmd files
   - simplify dependency generation for CONFIG_TRIM_UNUSED_KSYMS
   - change if_changed_rule to accept multi-line recipe
   - move .SECONDARY special target to scripts/Kbuild.include
   - remove redundant 'set -e'
   - improve parallel execution for CONFIG_HEADERS_CHECK
   - misc cleanups

  Treewide fixes and cleanups
   - set Clang flags correctly for PowerPC boot images
   - fix UML build error with CONFIG_GCC_PLUGINS
   - remove unneeded patterns from .gitignore files
   - refactor firmware/Makefile
   - remove unneeded rules for *offsets.s
   - avoid unneeded regeneration of intermediate .s files
   - clean up ./Kbuild

  Modpost:
   - remove unused -M, -K options
   - fix false positive warnings about section mismatch
   - use simple devtable lookup instead of linker magic
   - misc cleanups

  Coccinelle:
   - relax boolinit.cocci checks for overall consistency
   - fix warning messages of boolinit.cocci

  Other tools:
   - improve -dirty check of scripts/setlocalversion
   - add a tool to generate compile_commands.json from .*.cmd files"

* tag 'kbuild-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (51 commits)
  kbuild: remove unused cmd_gentimeconst
  kbuild: remove $(obj)/ prefixes in ./Kbuild
  treewide: add intermediate .s files to targets
  treewide: remove explicit rules for *offsets.s
  firmware: refactor firmware/Makefile
  firmware: remove unnecessary patterns from .gitignore
  scripts: remove unnecessary ihex2fw and check-lc_ctypes from .gitignore
  um: remove unused filechk_gen_header in Makefile
  scripts: add a tool to produce a compile_commands.json file
  kbuild: add -Werror=implicit-int flag unconditionally
  kbuild: add -Werror=strict-prototypes flag unconditionally
  kbuild: add -fno-PIE flag unconditionally
  scripts: coccinelle: Correct warning message
  scripts: coccinelle: only suggest true/false in files that already use them
  kbuild: handle part-of-module correctly for *.ll and *.symtypes
  kbuild: refactor part-of-module
  kbuild: refactor quiet_modtag
  kbuild: remove redundant quiet_modtag for $(obj-m)
  kbuild: refactor Makefile.asm-generic
  user/Makefile: Fix typo and capitalization in comment section
  ...
parents d8372ba8 dec28d8e

Documentation/kbuild/kbuild.txt

+1 −6
Original line number Original line Diff line number Diff line
@@ -81,12 +81,7 @@ KBUILD_EXTMOD 
--------------------------------------------------

--------------------------------------------------

Set the directory to look for the kernel source when building external

Set the directory to look for the kernel source when building external

modules.

modules.

The directory can be specified in several ways:

Setting "M=..." takes precedence over KBUILD_EXTMOD.

1) Use "M=..." on the command line

2) Environment variable KBUILD_EXTMOD

3) Environment variable SUBDIRS

The possibilities are listed in the order they take precedence.

Using "M=..." will always override the others.





KBUILD_OUTPUT

KBUILD_OUTPUT

--------------------------------------------------

--------------------------------------------------

Kbuild

+5 −16
Original line number Original line Diff line number Diff line
@@ -16,11 +16,7 @@ bounds-file := include/generated/bounds.h 
always  := $(bounds-file)

always  := $(bounds-file)

targets := kernel/bounds.s

targets := kernel/bounds.s





# We use internal kbuild rules to avoid the "is up to date" message from make

$(bounds-file): kernel/bounds.s FORCE

kernel/bounds.s: kernel/bounds.c FORCE

	$(call if_changed_dep,cc_s_c)



$(obj)/$(bounds-file): kernel/bounds.s FORCE

	$(call filechk,offsets,__LINUX_BOUNDS_H__)

	$(call filechk,offsets,__LINUX_BOUNDS_H__)





#####

#####
@@ -30,15 +26,11 @@ timeconst-file := include/generated/timeconst.h 




targets += $(timeconst-file)

targets += $(timeconst-file)





quiet_cmd_gentimeconst = GEN     $@

define cmd_gentimeconst

	(echo $(CONFIG_HZ) | bc -q $< ) > $@

endef

define filechk_gentimeconst

define filechk_gentimeconst

	(echo $(CONFIG_HZ) | bc -q $< )

	(echo $(CONFIG_HZ) | bc -q $< )

endef

endef





$(obj)/$(timeconst-file): kernel/time/timeconst.bc FORCE

$(timeconst-file): kernel/time/timeconst.bc FORCE

	$(call filechk,gentimeconst)

	$(call filechk,gentimeconst)





#####

#####
@@ -50,12 +42,9 @@ offsets-file := include/generated/asm-offsets.h 
always  += $(offsets-file)

always  += $(offsets-file)

targets += arch/$(SRCARCH)/kernel/asm-offsets.s

targets += arch/$(SRCARCH)/kernel/asm-offsets.s





# We use internal kbuild rules to avoid the "is up to date" message from make

arch/$(SRCARCH)/kernel/asm-offsets.s: $(timeconst-file) $(bounds-file)

arch/$(SRCARCH)/kernel/asm-offsets.s: arch/$(SRCARCH)/kernel/asm-offsets.c \

                                      $(obj)/$(timeconst-file) $(obj)/$(bounds-file) FORCE

	$(call if_changed_dep,cc_s_c)





$(obj)/$(offsets-file): arch/$(SRCARCH)/kernel/asm-offsets.s FORCE

$(offsets-file): arch/$(SRCARCH)/kernel/asm-offsets.s FORCE

	$(call filechk,offsets,__ASM_OFFSETS_H__)

	$(call filechk,offsets,__ASM_OFFSETS_H__)





#####

#####
@@ -77,7 +66,7 @@ missing-syscalls: scripts/checksyscalls.sh $(offsets-file) FORCE 




extra-$(CONFIG_GDB_SCRIPTS) += build_constants_py

extra-$(CONFIG_GDB_SCRIPTS) += build_constants_py





build_constants_py: $(obj)/$(timeconst-file) $(obj)/$(bounds-file)

build_constants_py: $(timeconst-file) $(bounds-file)

	@$(MAKE) $(build)=scripts/gdb/linux $@

	@$(MAKE) $(build)=scripts/gdb/linux $@





# Keep these three files during make clean

# Keep these three files during make clean

Makefile

+51 −60
Original line number Original line Diff line number Diff line
@@ -186,6 +186,10 @@ endif 
# Old syntax make ... SUBDIRS=$PWD is still supported

# Old syntax make ... SUBDIRS=$PWD is still supported

# Setting the environment variable KBUILD_EXTMOD take precedence

# Setting the environment variable KBUILD_EXTMOD take precedence

ifdef SUBDIRS

ifdef SUBDIRS

  $(warning ================= WARNING ================)

  $(warning 'SUBDIRS' will be removed after Linux 5.3)

  $(warning Please use 'M=' or 'KBUILD_EXTMOD' instead)

  $(warning ==========================================)

  KBUILD_EXTMOD ?= $(SUBDIRS)

  KBUILD_EXTMOD ?= $(SUBDIRS)

endif

endif
@@ -422,10 +426,10 @@ LINUXINCLUDE := \ 
		-I$(objtree)/include \

		-I$(objtree)/include \

		$(USERINCLUDE)

		$(USERINCLUDE)





KBUILD_AFLAGS   := -D__ASSEMBLY__

KBUILD_AFLAGS   := -D__ASSEMBLY__ -fno-PIE

KBUILD_CFLAGS   := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \

KBUILD_CFLAGS   := -Wall -Wundef -Werror=strict-prototypes -Wno-trigraphs \

		   -fno-strict-aliasing -fno-common -fshort-wchar \

		   -fno-strict-aliasing -fno-common -fshort-wchar -fno-PIE \

		   -Werror-implicit-function-declaration \

		   -Werror-implicit-function-declaration -Werror=implicit-int \

		   -Wno-format-security \

		   -Wno-format-security \

		   -std=gnu89

		   -std=gnu89

KBUILD_CPPFLAGS := -D__KERNEL__

KBUILD_CPPFLAGS := -D__KERNEL__
@@ -487,18 +491,18 @@ endif 




ifneq ($(shell $(CC) --version 2>&1 | head -n 1 | grep clang),)

ifneq ($(shell $(CC) --version 2>&1 | head -n 1 | grep clang),)

ifneq ($(CROSS_COMPILE),)

ifneq ($(CROSS_COMPILE),)

CLANG_TARGET	:= --target=$(notdir $(CROSS_COMPILE:%-=%))

CLANG_FLAGS	:= --target=$(notdir $(CROSS_COMPILE:%-=%))

GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD)))

GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD)))

CLANG_PREFIX	:= --prefix=$(GCC_TOOLCHAIN_DIR)

CLANG_FLAGS	+= --prefix=$(GCC_TOOLCHAIN_DIR)

GCC_TOOLCHAIN	:= $(realpath $(GCC_TOOLCHAIN_DIR)/..)

GCC_TOOLCHAIN	:= $(realpath $(GCC_TOOLCHAIN_DIR)/..)

endif

endif

ifneq ($(GCC_TOOLCHAIN),)

ifneq ($(GCC_TOOLCHAIN),)

CLANG_GCC_TC	:= --gcc-toolchain=$(GCC_TOOLCHAIN)

CLANG_FLAGS	+= --gcc-toolchain=$(GCC_TOOLCHAIN)

endif

endif

KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX)

CLANG_FLAGS	+= -no-integrated-as

KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX)

KBUILD_CFLAGS	+= $(CLANG_FLAGS)

KBUILD_CFLAGS += $(call cc-option, -no-integrated-as)

KBUILD_AFLAGS	+= $(CLANG_FLAGS)

KBUILD_AFLAGS += $(call cc-option, -no-integrated-as)

export CLANG_FLAGS

endif

endif





RETPOLINE_CFLAGS_GCC := -mindirect-branch=thunk-extern -mindirect-branch-register

RETPOLINE_CFLAGS_GCC := -mindirect-branch=thunk-extern -mindirect-branch-register
@@ -510,9 +514,6 @@ RETPOLINE_VDSO_CFLAGS := $(call cc-option,$(RETPOLINE_VDSO_CFLAGS_GCC),$(call cc 
export RETPOLINE_CFLAGS

export RETPOLINE_CFLAGS

export RETPOLINE_VDSO_CFLAGS

export RETPOLINE_VDSO_CFLAGS





KBUILD_CFLAGS	+= $(call cc-option,-fno-PIE)

KBUILD_AFLAGS	+= $(call cc-option,-fno-PIE)



# check for 'asm goto'

# check for 'asm goto'

ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)

ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)

  CC_HAVE_ASM_GOTO := 1

  CC_HAVE_ASM_GOTO := 1
@@ -828,12 +829,6 @@ KBUILD_CFLAGS += $(call cc-option,-fno-stack-check,) 
# conserve stack if available

# conserve stack if available

KBUILD_CFLAGS   += $(call cc-option,-fconserve-stack)

KBUILD_CFLAGS   += $(call cc-option,-fconserve-stack)





# disallow errors like 'EXPORT_GPL(foo);' with missing header

KBUILD_CFLAGS   += $(call cc-option,-Werror=implicit-int)



# require functions to have arguments in prototypes, not empty 'int foo()'

KBUILD_CFLAGS   += $(call cc-option,-Werror=strict-prototypes)



# Prohibit date/time macros, which would make the build non-deterministic

# Prohibit date/time macros, which would make the build non-deterministic

KBUILD_CFLAGS   += $(call cc-option,-Werror=date-time)

KBUILD_CFLAGS   += $(call cc-option,-Werror=date-time)
@@ -1026,14 +1021,13 @@ cmd_link-vmlinux = \ 
	$(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true)

	$(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true)





vmlinux: scripts/link-vmlinux.sh autoksyms_recursive $(vmlinux-deps) FORCE

vmlinux: scripts/link-vmlinux.sh autoksyms_recursive $(vmlinux-deps) FORCE

ifdef CONFIG_HEADERS_CHECK

	$(Q)$(MAKE) -f $(srctree)/Makefile headers_check

endif

ifdef CONFIG_GDB_SCRIPTS

ifdef CONFIG_GDB_SCRIPTS

	$(Q)ln -fsn $(abspath $(srctree)/scripts/gdb/vmlinux-gdb.py)

	$(Q)ln -fsn $(abspath $(srctree)/scripts/gdb/vmlinux-gdb.py)

endif

endif

	+$(call if_changed,link-vmlinux)

	+$(call if_changed,link-vmlinux)





targets := vmlinux



# Build samples along the rest of the kernel. This needs headers_install.

# Build samples along the rest of the kernel. This needs headers_install.

ifdef CONFIG_SAMPLES

ifdef CONFIG_SAMPLES

vmlinux-dirs += samples

vmlinux-dirs += samples
@@ -1051,7 +1045,7 @@ $(sort $(vmlinux-deps)): $(vmlinux-dirs) ; 
# Error messages still appears in the original language

# Error messages still appears in the original language





PHONY += $(vmlinux-dirs)

PHONY += $(vmlinux-dirs)

$(vmlinux-dirs): prepare scripts

$(vmlinux-dirs): prepare

	$(Q)$(MAKE) $(build)=$@ need-builtin=1

	$(Q)$(MAKE) $(build)=$@ need-builtin=1





define filechk_kernel.release

define filechk_kernel.release
@@ -1066,7 +1060,7 @@ include/config/kernel.release: $(srctree)/Makefile FORCE 
# Carefully list dependencies so we do not try to build scripts twice

# Carefully list dependencies so we do not try to build scripts twice

# in parallel

# in parallel

PHONY += scripts

PHONY += scripts

scripts: scripts_basic scripts_dtc asm-generic gcc-plugins $(autoksyms_h)

scripts: scripts_basic scripts_dtc

	$(Q)$(MAKE) $(build)=$(@)

	$(Q)$(MAKE) $(build)=$(@)





# Things we need to do before we recursively start building the kernel

# Things we need to do before we recursively start building the kernel
@@ -1099,22 +1093,23 @@ prepare2: prepare3 outputmakefile asm-generic 
prepare1: prepare2 $(version_h) $(autoksyms_h) include/generated/utsrelease.h

prepare1: prepare2 $(version_h) $(autoksyms_h) include/generated/utsrelease.h

	$(cmd_crmodverdir)

	$(cmd_crmodverdir)





archprepare: archheaders archscripts prepare1 scripts_basic

archprepare: archheaders archscripts prepare1 scripts





prepare0: archprepare gcc-plugins

prepare0: archprepare

	$(Q)$(MAKE) $(build)=scripts/mod

	$(Q)$(MAKE) $(build)=.

	$(Q)$(MAKE) $(build)=.





# All the preparing..

# All the preparing..

prepare: prepare0 prepare-objtool

prepare: prepare0 prepare-objtool





# Support for using generic headers in asm-generic

# Support for using generic headers in asm-generic

asm-generic := -f $(srctree)/scripts/Makefile.asm-generic obj



PHONY += asm-generic uapi-asm-generic

PHONY += asm-generic uapi-asm-generic

asm-generic: uapi-asm-generic

asm-generic: uapi-asm-generic

	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \

	$(Q)$(MAKE) $(asm-generic)=arch/$(SRCARCH)/include/generated/asm

	            src=asm obj=arch/$(SRCARCH)/include/generated/asm

uapi-asm-generic:

uapi-asm-generic:

	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \

	$(Q)$(MAKE) $(asm-generic)=arch/$(SRCARCH)/include/generated/uapi/asm

	            src=uapi/asm obj=arch/$(SRCARCH)/include/generated/uapi/asm





PHONY += prepare-objtool

PHONY += prepare-objtool

prepare-objtool: $(objtool_target)

prepare-objtool: $(objtool_target)
@@ -1199,6 +1194,10 @@ headers_check: headers_install 
	$(Q)$(MAKE) $(hdr-inst)=include/uapi dst=include HDRCHECK=1

	$(Q)$(MAKE) $(hdr-inst)=include/uapi dst=include HDRCHECK=1

	$(Q)$(MAKE) $(hdr-inst)=arch/$(SRCARCH)/include/uapi $(hdr-dst) HDRCHECK=1

	$(Q)$(MAKE) $(hdr-inst)=arch/$(SRCARCH)/include/uapi $(hdr-dst) HDRCHECK=1





ifdef CONFIG_HEADERS_CHECK

all: headers_check

endif



# ---------------------------------------------------------------------------

# ---------------------------------------------------------------------------

# Kernel selftest

# Kernel selftest
@@ -1283,7 +1282,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin) 




# Target to prepare building external modules

# Target to prepare building external modules

PHONY += modules_prepare

PHONY += modules_prepare

modules_prepare: prepare scripts

modules_prepare: prepare





# Target to install modules

# Target to install modules

PHONY += modules_install

PHONY += modules_install
@@ -1551,9 +1550,6 @@ else # KBUILD_EXTMOD 




# We are always building modules

# We are always building modules

KBUILD_MODULES := 1

KBUILD_MODULES := 1

PHONY += crmodverdir

crmodverdir:

	$(cmd_crmodverdir)





PHONY += $(objtree)/Module.symvers

PHONY += $(objtree)/Module.symvers

$(objtree)/Module.symvers:

$(objtree)/Module.symvers:
@@ -1565,7 +1561,7 @@ $(objtree)/Module.symvers: 




module-dirs := $(addprefix _module_,$(KBUILD_EXTMOD))

module-dirs := $(addprefix _module_,$(KBUILD_EXTMOD))

PHONY += $(module-dirs) modules

PHONY += $(module-dirs) modules

$(module-dirs): crmodverdir $(objtree)/Module.symvers

$(module-dirs): prepare $(objtree)/Module.symvers

	$(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)

	$(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)





modules: $(module-dirs)

modules: $(module-dirs)
@@ -1604,10 +1600,9 @@ help: 
	@echo  '  clean           - remove generated files in module directory only'

	@echo  '  clean           - remove generated files in module directory only'

	@echo  ''

	@echo  ''





# Dummies...

PHONY += prepare

PHONY += prepare scripts

prepare:

prepare: ;

	$(cmd_crmodverdir)

scripts: ;

endif # KBUILD_EXTMOD

endif # KBUILD_EXTMOD





clean: $(clean-dirs)

clean: $(clean-dirs)
@@ -1712,36 +1707,33 @@ else 
        target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))

        target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))

endif

endif





%.s: %.c prepare scripts FORCE

%.s: %.c prepare FORCE

	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)

	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)

%.i: %.c prepare scripts FORCE

%.i: %.c prepare FORCE

	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)

	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)

%.o: %.c prepare scripts FORCE

%.o: %.c prepare FORCE

	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)

	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)

%.lst: %.c prepare scripts FORCE

%.lst: %.c prepare FORCE

	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)

	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)

%.s: %.S prepare scripts FORCE

%.s: %.S prepare FORCE

	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)

	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)

%.o: %.S prepare scripts FORCE

%.o: %.S prepare FORCE

	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)

	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)

%.symtypes: %.c prepare scripts FORCE

%.symtypes: %.c prepare FORCE

	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)

	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)

%.ll: %.c prepare scripts FORCE

%.ll: %.c prepare FORCE

	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)

	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)





# Modules

# Modules

/: prepare scripts FORCE

/: prepare FORCE

	$(cmd_crmodverdir)

	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \

	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \

	$(build)=$(build-dir)

	$(build)=$(build-dir)

# Make sure the latest headers are built for Documentation

# Make sure the latest headers are built for Documentation

Documentation/ samples/: headers_install

Documentation/ samples/: headers_install

%/: prepare scripts FORCE

%/: prepare FORCE

	$(cmd_crmodverdir)

	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \

	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \

	$(build)=$(build-dir)

	$(build)=$(build-dir)

%.ko: prepare scripts FORCE

%.ko: prepare FORCE

	$(cmd_crmodverdir)

	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1)   \

	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1)   \

	$(build)=$(build-dir) $(@:.ko=.o)

	$(build)=$(build-dir) $(@:.ko=.o)

	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost

	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
@@ -1765,13 +1757,12 @@ quiet_cmd_depmod = DEPMOD $(KERNELRELEASE) 
cmd_crmodverdir = $(Q)mkdir -p $(MODVERDIR) \

cmd_crmodverdir = $(Q)mkdir -p $(MODVERDIR) \

                  $(if $(KBUILD_MODULES),; rm -f $(MODVERDIR)/*)

                  $(if $(KBUILD_MODULES),; rm -f $(MODVERDIR)/*)





# read all saved command lines

# read saved command lines for existing targets

cmd_files := $(wildcard .*.cmd)

existing-targets := $(wildcard $(sort $(targets)))





ifneq ($(cmd_files),)

cmd_files := $(foreach f,$(existing-targets),$(dir $(f)).$(notdir $(f)).cmd)

$(cmd_files): ;	# Do not try to update included dependency files

$(cmd_files): ;	# Do not try to update included dependency files

  include $(cmd_files)

-include $(cmd_files)

endif





endif   # ifeq ($(config-targets),1)

endif   # ifeq ($(config-targets),1)

endif   # ifeq ($(mixed-targets),1)

endif   # ifeq ($(mixed-targets),1)

arch/arm/crypto/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -67,4 +67,4 @@ $(src)/sha512-core.S_shipped: $(src)/sha512-armv4.pl 
	$(call cmd,perl)

	$(call cmd,perl)

endif

endif





targets += sha256-core.S sha512-core.S
 
clean-files += sha256-core.S sha512-core.S

arch/arm/mach-at91/Makefile

+2 −3
Original line number Original line Diff line number Diff line
@@ -19,10 +19,9 @@ ifeq ($(CONFIG_PM_DEBUG),y) 
CFLAGS_pm.o += -DDEBUG

CFLAGS_pm.o += -DDEBUG

endif

endif





arch/arm/mach-at91/pm_data-offsets.s: arch/arm/mach-at91/pm_data-offsets.c

	$(call if_changed_dep,cc_s_c)



include/generated/at91_pm_data-offsets.h: arch/arm/mach-at91/pm_data-offsets.s FORCE

include/generated/at91_pm_data-offsets.h: arch/arm/mach-at91/pm_data-offsets.s FORCE

	$(call filechk,offsets,__PM_DATA_OFFSETS_H__)

	$(call filechk,offsets,__PM_DATA_OFFSETS_H__)





arch/arm/mach-at91/pm_suspend.o: include/generated/at91_pm_data-offsets.h

arch/arm/mach-at91/pm_suspend.o: include/generated/at91_pm_data-offsets.h



targets += pm_data-offsets.s