2016-04-08 02:25:24

by Masahiro Yamada

Subject: [PATCH 1/2] kbuild: rename cmd_cc_i_c to cmd_cpp_i_c

This command just preprocesses .c files into .i files, so cmd_cpp_i_c
seems more suitable.

Signed-off-by: Masahiro Yamada <[email protected]>
---

scripts/Makefile.build | 6 +++---
tools/build/Makefile.build | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index e1bc190..7e4df13 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -152,11 +152,11 @@ cmd_cc_s_c = $(CC) $(c_flags) $(DISABLE_LTO) -fverbose-asm -S -o $@ $<
$(obj)/%.s: $(src)/%.c FORCE
$(call if_changed_dep,cc_s_c)

-quiet_cmd_cc_i_c = CPP $(quiet_modtag) $@
-cmd_cc_i_c = $(CPP) $(c_flags) -o $@ $<
+quiet_cmd_cpp_i_c = CPP $(quiet_modtag) $@
+cmd_cpp_i_c = $(CPP) $(c_flags) -o $@ $<

$(obj)/%.i: $(src)/%.c FORCE
- $(call if_changed_dep,cc_i_c)
+ $(call if_changed_dep,cpp_i_c)

cmd_gensymtypes = \
$(CPP) -D__GENKSYMS__ $(c_flags) $< | \
diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build
index ee566e8..27f3583 100644
--- a/tools/build/Makefile.build
+++ b/tools/build/Makefile.build
@@ -58,8 +58,8 @@ quiet_cmd_mkdir = MKDIR $(dir $@)
quiet_cmd_cc_o_c = CC $@
cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $<

-quiet_cmd_cc_i_c = CPP $@
- cmd_cc_i_c = $(CC) $(c_flags) -E -o $@ $<
+quiet_cmd_cpp_i_c = CPP $@
+ cmd_cpp_i_c = $(CC) $(c_flags) -E -o $@ $<

quiet_cmd_cc_s_c = AS $@
cmd_cc_s_c = $(CC) $(c_flags) -S -o $@ $<
@@ -83,11 +83,11 @@ $(OUTPUT)%.o: %.S FORCE

$(OUTPUT)%.i: %.c FORCE
$(call rule_mkdir)
- $(call if_changed_dep,cc_i_c)
+ $(call if_changed_dep,cpp_i_c)

$(OUTPUT)%.s: %.S FORCE
$(call rule_mkdir)
- $(call if_changed_dep,cc_i_c)
+ $(call if_changed_dep,cpp_i_c)

$(OUTPUT)%.s: %.c FORCE
$(call rule_mkdir)
--
1.9.1

2016-04-08 02:24:37

by Masahiro Yamada

Subject: [PATCH 2/2] kbuild: rename cmd_as_s_S to cmd_cpp_s_S

This command just preprocesses .S files into .s files, so cmd_cpp_s_S
seems more suitable.

Signed-off-by: Masahiro Yamada <[email protected]>
---

scripts/Makefile.build | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 7e4df13..e65a3e9 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -314,11 +314,11 @@ modkern_aflags := $(KBUILD_AFLAGS_KERNEL) $(AFLAGS_KERNEL)
$(real-objs-m) : modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)
$(real-objs-m:.o=.s): modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)

-quiet_cmd_as_s_S = CPP $(quiet_modtag) $@
-cmd_as_s_S = $(CPP) $(a_flags) -o $@ $<
+quiet_cmd_cpp_s_S = CPP $(quiet_modtag) $@
+cmd_cpp_s_S = $(CPP) $(a_flags) -o $@ $<

$(obj)/%.s: $(src)/%.S FORCE
- $(call if_changed_dep,as_s_S)
+ $(call if_changed_dep,cpp_s_S)

quiet_cmd_as_o_S = AS $(quiet_modtag) $@
cmd_as_o_S = $(CC) $(a_flags) -c -o $@ $<
--
1.9.1

2016-04-08 15:01:05

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH 1/2] kbuild: rename cmd_cc_i_c to cmd_cpp_i_c

Em Fri, Apr 08, 2016 at 11:24:47AM +0900, Masahiro Yamada escreveu:
> This command just preprocesses .c files into .i files, so cmd_cpp_i_c
> seems more suitable.

Thanks for doing it to the tools/build/ copy, looks sensible, I guess
this can go via the kbuild tree?

Acked-by: Arnaldo Carvalho de Melo <[email protected]>

- Arnaldo

> Signed-off-by: Masahiro Yamada <[email protected]>
> ---
>
> scripts/Makefile.build | 6 +++---
> tools/build/Makefile.build | 8 ++++----
> 2 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/scripts/Makefile.build b/scripts/Makefile.build
> index e1bc190..7e4df13 100644
> --- a/scripts/Makefile.build
> +++ b/scripts/Makefile.build
> @@ -152,11 +152,11 @@ cmd_cc_s_c = $(CC) $(c_flags) $(DISABLE_LTO) -fverbose-asm -S -o $@ $<
> $(obj)/%.s: $(src)/%.c FORCE
> $(call if_changed_dep,cc_s_c)
>
> -quiet_cmd_cc_i_c = CPP $(quiet_modtag) $@
> -cmd_cc_i_c = $(CPP) $(c_flags) -o $@ $<
> +quiet_cmd_cpp_i_c = CPP $(quiet_modtag) $@
> +cmd_cpp_i_c = $(CPP) $(c_flags) -o $@ $<
>
> $(obj)/%.i: $(src)/%.c FORCE
> - $(call if_changed_dep,cc_i_c)
> + $(call if_changed_dep,cpp_i_c)
>
> cmd_gensymtypes = \
> $(CPP) -D__GENKSYMS__ $(c_flags) $< | \
> diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build
> index ee566e8..27f3583 100644
> --- a/tools/build/Makefile.build
> +++ b/tools/build/Makefile.build
> @@ -58,8 +58,8 @@ quiet_cmd_mkdir = MKDIR $(dir $@)
> quiet_cmd_cc_o_c = CC $@
> cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $<
>
> -quiet_cmd_cc_i_c = CPP $@
> - cmd_cc_i_c = $(CC) $(c_flags) -E -o $@ $<
> +quiet_cmd_cpp_i_c = CPP $@
> + cmd_cpp_i_c = $(CC) $(c_flags) -E -o $@ $<
>
> quiet_cmd_cc_s_c = AS $@
> cmd_cc_s_c = $(CC) $(c_flags) -S -o $@ $<
> @@ -83,11 +83,11 @@ $(OUTPUT)%.o: %.S FORCE
>
> $(OUTPUT)%.i: %.c FORCE
> $(call rule_mkdir)
> - $(call if_changed_dep,cc_i_c)
> + $(call if_changed_dep,cpp_i_c)
>
> $(OUTPUT)%.s: %.S FORCE
> $(call rule_mkdir)
> - $(call if_changed_dep,cc_i_c)
> + $(call if_changed_dep,cpp_i_c)
>
> $(OUTPUT)%.s: %.c FORCE
> $(call rule_mkdir)
> --
> 1.9.1

2016-04-20 08:50:05

by Michal Marek

Subject: Re: [PATCH 1/2] kbuild: rename cmd_cc_i_c to cmd_cpp_i_c

On Fri, Apr 08, 2016 at 12:00:57PM -0300, Arnaldo Carvalho de Melo wrote:
> Em Fri, Apr 08, 2016 at 11:24:47AM +0900, Masahiro Yamada escreveu:
> > This command just preprocesses .c files into .i files, so cmd_cpp_i_c
> > seems more suitable.
>
> Thanks for doing it to the tools/build/ copy, looks sensible, I guess
> this can go via the kbuild tree?
>
> Acked-by: Arnaldo Carvalho de Melo <[email protected]>
>
> - Arnaldo
>
> > Signed-off-by: Masahiro Yamada <[email protected]>

Applied both patches to kbuild.git#kbuild.

Michal