[PATCH 1/2] kbuild: hide most of targets when running config or mixed targets

[PATCH 1/2] kbuild: hide most of targets when running config or mixed targets

[Masahiro Yamada]

When mixed/config targets are being processed, the top Makefile
does not need to parse the rest of targets.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 4d5c883..4b76e22 100644
--- a/Makefile
+++ b/Makefile
@@ -1615,9 +1615,6 @@ namespacecheck:
 export_report:
 	$(PERL) $(srctree)/scripts/export_report.pl
 
-endif #ifeq ($(config-targets),1)
-endif #ifeq ($(mixed-targets),1)
-
 PHONY += checkstack kernelrelease kernelversion image_name
 
 # UML needs a little special treatment here.  It wants to use the host
@@ -1732,6 +1729,8 @@ ifneq ($(cmd_files),)
   include $(cmd_files)
 endif
 
+endif   # ifeq ($(config-targets),1)
+endif   # ifeq ($(mixed-targets),1)
 endif	# skip-makefile
 
 PHONY += FORCE
-- 
2.7.4

[PATCH 2/2] kbuild: remove dead code in cmd_files calculation in top Makefile

[Masahiro Yamada]

Nobody sets 'targets' in the top-level Makefile or arch/*/Makefile,
hence $(targets) is empty.

$(wildcard .*.cmd) will do for including the .vmlinux.cmd file.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 4b76e22..8f6dbfc 100644
--- a/Makefile
+++ b/Makefile
@@ -1721,8 +1721,7 @@ cmd_crmodverdir = $(Q)mkdir -p $(MODVERDIR) \
                   $(if $(KBUILD_MODULES),; rm -f $(MODVERDIR)/*)
 
 # read all saved command lines
-
-cmd_files := $(wildcard .*.cmd $(foreach f,$(sort $(targets)),$(dir $(f)).$(notdir $(f)).cmd))
+cmd_files := $(wildcard .*.cmd)
 
 ifneq ($(cmd_files),)
   $(cmd_files): ;	# Do not try to update included dependency files
-- 
2.7.4

Re: [PATCH 2/2] kbuild: remove dead code in cmd_files calculation in top Makefile

[Masahiro Yamada]

2018-09-12 15:43 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:
> Nobody sets 'targets' in the top-level Makefile or arch/*/Makefile,
> hence $(targets) is empty.
>
> $(wildcard .*.cmd) will do for including the .vmlinux.cmd file.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---

Applied to linux-kbuild.


>  Makefile | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 4b76e22..8f6dbfc 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1721,8 +1721,7 @@ cmd_crmodverdir = $(Q)mkdir -p $(MODVERDIR) \
>                    $(if $(KBUILD_MODULES),; rm -f $(MODVERDIR)/*)
>
>  # read all saved command lines
> -
> -cmd_files := $(wildcard .*.cmd $(foreach f,$(sort $(targets)),$(dir $(f)).$(notdir $(f)).cmd))
> +cmd_files := $(wildcard .*.cmd)
>
>  ifneq ($(cmd_files),)
>    $(cmd_files): ;      # Do not try to update included dependency files
> --
> 2.7.4
>



-- 
Best Regards
Masahiro Yamada

Re: [PATCH 1/2] kbuild: hide most of targets when running config or mixed targets

[Masahiro Yamada]

2018-09-12 15:43 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:
> When mixed/config targets are being processed, the top Makefile
> does not need to parse the rest of targets.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---

Applied to linux-kbuild.


>  Makefile | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 4d5c883..4b76e22 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1615,9 +1615,6 @@ namespacecheck:
>  export_report:
>         $(PERL) $(srctree)/scripts/export_report.pl
>
> -endif #ifeq ($(config-targets),1)
> -endif #ifeq ($(mixed-targets),1)
> -
>  PHONY += checkstack kernelrelease kernelversion image_name
>
>  # UML needs a little special treatment here.  It wants to use the host
> @@ -1732,6 +1729,8 @@ ifneq ($(cmd_files),)
>    include $(cmd_files)
>  endif
>
> +endif   # ifeq ($(config-targets),1)
> +endif   # ifeq ($(mixed-targets),1)
>  endif  # skip-makefile
>
>  PHONY += FORCE
> --
> 2.7.4
>



-- 
Best Regards
Masahiro Yamada