From patchwork Tue Nov 20 01:05:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 151532 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3380621ljp; Mon, 19 Nov 2018 17:07:03 -0800 (PST) X-Google-Smtp-Source: AJdET5cl0rBAnEQSnVj8zRjWi+XbptJ4FKZKN4xoqREgZe8EPqmz7N/jm3RvQfMCVk7yDvDvDTAh X-Received: by 2002:a63:da14:: with SMTP id c20mr21393599pgh.233.1542676023457; Mon, 19 Nov 2018 17:07:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542676023; cv=none; d=google.com; s=arc-20160816; b=OnJYgcr3j1i7y4W/5q2RGpswsopnUzYNiDyjjIutzBiIhmpQ2wL6p3VuExdXFIQkkx L8smQy557OYQvO43ukK9bAzXWojVu4a5XeTYIwHsm6XbZHYphJ9jc/kjjRe1dS/5J1/o 0sw2yA/rX80FKh9dtuIAximZ9f5u9UAIEjEKGRhODNJda2W6kvVUGMLOsbqR9lbpgpkb ylO1gSm3ICSRvDWxZ73Fjcow6vg4etqmLPYwcNgZyksMm39SyhQT1V5hzi3lsTMC/eR1 MzOAK3B3JgdH9zkg4LiicwayDlneYq9CkBhbn5wK5kuEbbF1vrxqdEX9LNYBEzNk00Lt PaXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=5BzTqVAJb2FAdAx//unkzpW5FFm31SMMv6bkjPNROS0=; b=IHkv46PE1RUtXchsGjB2LFUpVIhJxb1eN/vXMF3WMQW8znrU0d1KONoYtS3k5ZJN6V anLIuizHoNSZaa35mUhKKEyLjmDdqAp4cwlDZbHrSFUUm7YFZxZU9u5Fgq91/4Bl3hmu XmxN+MSi12ZCubie36UpZh6xCBkME+Lce2RU9/D+oRCWnDBlnHxdyHF+P/vK04D9P8Wg FQIaIMyAR7Ua/bBnRmEQYyWteWQXSVR36Dp8ZHYe48ApLkfCfMq2mYJ2UD2I51ZPoi1w 8B9eXtFSQliNXIQc8+Sp10EfGWuzXBfoHp9AUCjClko0Yq7xV0OZg9W4GB1EHeAdQm7l WOJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=cHA3IUKR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j189si38467046pgd.185.2018.11.19.17.07.03; Mon, 19 Nov 2018 17:07:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=cHA3IUKR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732524AbeKTLdV (ORCPT + 32 others); Tue, 20 Nov 2018 06:33:21 -0500 Received: from conuserg-11.nifty.com ([210.131.2.78]:34063 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732157AbeKTLdO (ORCPT ); Tue, 20 Nov 2018 06:33:14 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-11.nifty.com with ESMTP id wAK15ZEe029284; Tue, 20 Nov 2018 10:05:41 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com wAK15ZEe029284 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1542675942; bh=5BzTqVAJb2FAdAx//unkzpW5FFm31SMMv6bkjPNROS0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cHA3IUKRfbj6FNW5cHvTQdHge2z3GjAJgzwVaeTtNXhLVoiXEEugtwTOy4DbCvZ1y wwP4jaSzCMaqr75B2zSJYa/mthziDYqV+TF4/B5yhvBpJ/fHJzx6s4dkKgRLoFpCZD SuXZNqy/fR5QtelvR8tq1U1WqrCIyBJ2Loofpuxa/VWmvL/BVbxfwHmlI+m8ejqBq+ h3fjRf7Pe9SAbkvAsR1Gb7Tchj/zHj+mLVtHC/E4r8fgUYT9A/MPKlEgXK20suXdp1 efLf+aEOyFFDtvYDWqyORO4kZmnzoG20Sml9oAyv6HnOrUb4HaCUNcFgboVYbf5zwb TBNyUEUbNshsg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Nicolas Pitre , Rasmus Villemoes , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH v2 7/9] kbuild: remove trailing semicolon from cmd_* passed to if_changed_rule Date: Tue, 20 Nov 2018 10:05:28 +0900 Message-Id: <1542675930-21114-8-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1542675930-21114-1-git-send-email-yamada.masahiro@socionext.com> References: <1542675930-21114-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org With the change of rule_cc_o_c / rule_as_o_S in the last commit, each command is executed in a separate subshell. Rip off unneeded semicolons. Signed-off-by: Masahiro Yamada --- Changes in v2: - Clean up cmd_and_fixdep as well scripts/Kbuild.include | 2 +- scripts/Makefile.build | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) -- 2.7.4 diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index 978d72b..79c4875 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -263,7 +263,7 @@ if_changed_dep = $(if $(strip $(any-prereq) $(arg-check) ), \ cmd_and_fixdep = \ $(echo-cmd) $(cmd_$(1)); \ scripts/basic/fixdep $(depfile) $@ '$(make-cmd)' > $(dot-target).cmd;\ - rm -f $(depfile); + rm -f $(depfile) # 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 e445b3e..ffd2fe4 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -75,14 +75,14 @@ __build: $(if $(KBUILD_BUILTIN),$(builtin-target) $(lib-target) $(extra-y)) \ # Linus' kernel sanity checking tool ifeq ($(KBUILD_CHECKSRC),1) quiet_cmd_checksrc = CHECK $< - cmd_checksrc = $(CHECK) $(CHECKFLAGS) $(c_flags) $< ; + cmd_checksrc = $(CHECK) $(CHECKFLAGS) $(c_flags) $< else ifeq ($(KBUILD_CHECKSRC),2) quiet_cmd_force_checksrc = CHECK $< - cmd_force_checksrc = $(CHECK) $(CHECKFLAGS) $(c_flags) $< ; + cmd_force_checksrc = $(CHECK) $(CHECKFLAGS) $(c_flags) $< endif ifneq ($(KBUILD_ENABLE_EXTRA_GCC_CHECKS),) - cmd_checkdoc = $(srctree)/scripts/kernel-doc -none $< ; + cmd_checkdoc = $(srctree)/scripts/kernel-doc -none $< endif # Do section mismatch analysis for each module/built-in.a @@ -178,7 +178,7 @@ cmd_modversions_c = \ -T $(@D)/.tmp_$(@F:.o=.ver); \ mv -f $(@D)/.tmp_$(@F) $@; \ rm -f $(@D)/.tmp_$(@F:.o=.ver); \ - fi; + fi endif ifdef CONFIG_FTRACE_MCOUNT_RECORD @@ -211,7 +211,7 @@ cmd_record_mcount = \ if [ "$(findstring $(CC_FLAGS_FTRACE),$(_c_flags))" = \ "$(CC_FLAGS_FTRACE)" ]; then \ $(sub_cmd_record_mcount) \ - fi; + fi endif # CC_USING_RECORD_MCOUNT endif # CONFIG_FTRACE_MCOUNT_RECORD @@ -241,7 +241,7 @@ endif # 'OBJECT_FILES_NON_STANDARD_foo.o := 'n': override directory skip for a file cmd_objtool = $(if $(patsubst y%,, \ $(OBJECT_FILES_NON_STANDARD_$(basetarget).o)$(OBJECT_FILES_NON_STANDARD)n), \ - $(__objtool_obj) $(objtool_args) $@;) + $(__objtool_obj) $(objtool_args) $@) objtool_obj = $(if $(patsubst y%,, \ $(OBJECT_FILES_NON_STANDARD_$(basetarget).o)$(OBJECT_FILES_NON_STANDARD)n), \ $(__objtool_obj)) @@ -256,7 +256,7 @@ objtool_dep = $(objtool_obj) \ ifdef CONFIG_TRIM_UNUSED_KSYMS cmd_gen_ksymdeps = \ - $(CONFIG_SHELL) $(srctree)/scripts/gen_ksymdeps.sh $@ >> $(dot-target).cmd; + $(CONFIG_SHELL) $(srctree)/scripts/gen_ksymdeps.sh $@ >> $(dot-target).cmd endif define rule_cc_o_c @@ -372,7 +372,7 @@ cmd_modversions_S = \ -T $(@D)/.tmp_$(@F:.o=.ver); \ mv -f $(@D)/.tmp_$(@F) $@; \ rm -f $(@D)/.tmp_$(@F:.o=.ver); \ - fi; + fi endif endif