lkml.org 
[lkml]   [2016]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 4/8] kbuild: de-duplicate fixdep usage
    Date
    The generation and postprocessing of automatic dependency rules is
    duplicated in rule_cc_o_c and if_changed_dep. Since this is not a
    trivial one-liner action, it is now abstracted under cmd_and_fixdep
    to simplify things and make future changes easier.

    In the rule_cc_o_c case that means the order of some commands has been
    altered, namely fixdep and related file manipulations are executed
    earlier, but they didn't depend on those commands that now execute later.

    Signed-off-by: Nicolas Pitre <nico@linaro.org>
    ---
    scripts/Kbuild.include | 5 ++++-
    scripts/Makefile.build | 9 ++-------
    2 files changed, 6 insertions(+), 8 deletions(-)

    diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
    index 1db6d73c8d..8a257fa663 100644
    --- a/scripts/Kbuild.include
    +++ b/scripts/Kbuild.include
    @@ -256,10 +256,13 @@ if_changed = $(if $(strip $(any-prereq) $(arg-check)), \
    # Execute the command and also postprocess generated .d dependencies file.
    if_changed_dep = $(if $(strip $(any-prereq) $(arg-check) ), \
    @set -e; \
    + $(cmd_and_fixdep))
    +
    +cmd_and_fixdep = \
    $(echo-cmd) $(cmd_$(1)); \
    scripts/basic/fixdep $(depfile) $@ '$(make-cmd)' > $(dot-target).tmp;\
    rm -f $(depfile); \
    - mv -f $(dot-target).tmp $(dot-target).cmd)
    + mv -f $(dot-target).tmp $(dot-target).cmd;

    # Usage: $(call if_changed_rule,foo)
    # Will check if $(cmd_foo) or any of the prerequisites changed,
    diff --git a/scripts/Makefile.build b/scripts/Makefile.build
    index f4b4320e0d..8134ee81ad 100644
    --- a/scripts/Makefile.build
    +++ b/scripts/Makefile.build
    @@ -243,14 +243,9 @@ endif

    define rule_cc_o_c
    $(call echo-cmd,checksrc) $(cmd_checksrc) \
    - $(call echo-cmd,cc_o_c) $(cmd_cc_o_c); \
    + $(call cmd_and_fixdep,cc_o_c) \
    $(cmd_modversions) \
    - $(call echo-cmd,record_mcount) \
    - $(cmd_record_mcount) \
    - scripts/basic/fixdep $(depfile) $@ '$(call make-cmd,cc_o_c)' > \
    - $(dot-target).tmp; \
    - rm -f $(depfile); \
    - mv -f $(dot-target).tmp $(dot-target).cmd
    + $(call echo-cmd,record_mcount) $(cmd_record_mcount)
    endef

    # List module undefined symbols (or empty line if not enabled)
    --
    2.5.0
    \
     
     \ /
      Last update: 2016-03-04 07:41    [W:2.762 / U:0.184 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site