lkml.org 
[lkml]   [2018]   [Sep]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.18 104/136] MIPS: boot: fix build rule of vmlinux.its.S
    Date
    From: Masahiro Yamada <yamada.masahiro@socionext.com>

    [ Upstream commit 67e09db507db3e1642ddce512a4313d20addd6e5 ]

    As Documentation/kbuild/makefile.txt says, it is a typical mistake
    to forget the FORCE prerequisite for the rule invoked by if_changed.

    Add the FORCE to the prerequisite, but it must be filtered-out from
    the files passed to the 'cat' command. Because this rule generates
    .vmlinux.its.S.cmd, vmlinux.its.S must be specified as targets so
    that the .cmd file is included.

    Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
    Patchwork: https://patchwork.linux-mips.org/patch/19097/
    Signed-off-by: Paul Burton <paul.burton@mips.com>
    Cc: Kees Cook <keescook@chromium.org>
    Cc: linux-kernel@vger.kernel.org
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    arch/mips/boot/Makefile | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/arch/mips/boot/Makefile b/arch/mips/boot/Makefile
    index c22da16d67b8..5c7bfa8478e7 100644
    --- a/arch/mips/boot/Makefile
    +++ b/arch/mips/boot/Makefile
    @@ -118,10 +118,12 @@ ifeq ($(ADDR_BITS),64)
    itb_addr_cells = 2
    endif

    +targets += vmlinux.its.S
    +
    quiet_cmd_its_cat = CAT $@
    - cmd_its_cat = cat $^ >$@
    + cmd_its_cat = cat $(filter-out $(PHONY), $^) >$@

    -$(obj)/vmlinux.its.S: $(addprefix $(srctree)/arch/mips/$(PLATFORM)/,$(ITS_INPUTS))
    +$(obj)/vmlinux.its.S: $(addprefix $(srctree)/arch/mips/$(PLATFORM)/,$(ITS_INPUTS)) FORCE
    $(call if_changed,its_cat)

    quiet_cmd_cpp_its_S = ITS $@
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-09-17 05:30    [W:4.221 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site