From patchwork Wed Jul 25 05:16:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 142841 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp377914ljj; Tue, 24 Jul 2018 22:18:20 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfNBD5j7dTEucEIfXHMYifQQifMYN6LpVozaLno4ICXVF2S8kIFqCy+qxTAZKjKYc8A+EN+ X-Received: by 2002:a63:1f4d:: with SMTP id q13-v6mr19179086pgm.241.1532495900326; Tue, 24 Jul 2018 22:18:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532495900; cv=none; d=google.com; s=arc-20160816; b=xfBYsScYjvyEDHDjdPPMepmFXGUgBGo9XQC2XtCJDq10WWOO39lYCokJPwGpnOKEE7 bzhu5mbZa0OE+d2rxbjUGWr16mxaUc7PfVt6027uqqzLVPbn3sw5AfCLIP5JDFyDXlH0 IAf3qthm0jKAD6fHjthos5SInP7ynjtCmI7b+/iAWFlaHO0xNt7VvJxKWVR8omJwGhAo 8UBL2EPXYxiVyobaj6MpgQi004BTAv43nvQZzDGZ3r7C2VI1WeyEyXbawgbb9Lru2JaP jmbcz+7NQvLsUinf8cDtDtS9FY2trhsDsI6XCZ0YvR4hGz+56xAocMXcgQh03PzxFoZC lhkg== 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 :arc-authentication-results; bh=s8GyG+1gOk1oIIEW6Ve60Hw/YCvJwi+om/gh+CBcOWc=; b=oCfQGy6nSlEgQJsANCl2yxJQ3Cy1sF9WlvAne5YMoXrtayJJO0PyfdvoI1gqc8g9aH iyWE+irI2zPsIakMh7mnrguo15cCLwZBI1cBKEbYRyVuY/EQqk4UPlPWs1wnMJcfitgI gFWlEfAKL3ENxoCvTKIpYvPfuqGD72ty2K2IzrqFIw3Jgv2jU0083sBnIUmxC39gM5oa 8SjSjR6vHQYSXEkOLDfX+9W8YyFKiZD6hawZt16Sub+JEUO0xynZPni4uEvBa/jteopq zuN+Xa5rnNDpDM10UoIc2A2qnC/olWQZs21cFDH74ChnKcWyqCh+Qo2WKqwRGLWXGjvB 69TQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=zF8CJD0o; 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 i18-v6si13197557pgn.433.2018.07.24.22.18.20; Tue, 24 Jul 2018 22:18:20 -0700 (PDT) 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=zF8CJD0o; 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 S1728268AbeGYG2M (ORCPT + 31 others); Wed, 25 Jul 2018 02:28:12 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:28719 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727753AbeGYG2M (ORCPT ); Wed, 25 Jul 2018 02:28:12 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id w6P5Gs8I018750; Wed, 25 Jul 2018 14:16:55 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com w6P5Gs8I018750 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1532495816; bh=s8GyG+1gOk1oIIEW6Ve60Hw/YCvJwi+om/gh+CBcOWc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zF8CJD0o5DRHJoSUgoL6FnAUaW5sBhK8lEnXpEVCCkmX5fabkJ/qJr9l6gCiZx9q6 u0htOgo1C91rWuICrSZd3uUlo55C80CpfZD+2paRZMW41rREjjHFlvGElX1tcbhBY+ 9RbDszAX2AVKTiT+Enep6tNga0SYhdgLh1p6SIt5tYhDi4dCplHhZZxJs4wmWMeUsj if4wETihFKNexwy5TdcAM+V9YmzVglt5ZrFPBBmppsMOSeSG36Enx/JyXMpFealmgl 4iJr54BOCu68l9jBpjOb+VnB9zbahWh3scdLEe5op2X2m5Cz/iZ/qMPjWmMGqX/xHy +HelxWXRk/wWw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Masahiro Yamada , linux-s390@vger.kernel.org, Heiko Carstens , linux-um@lists.infradead.org, linux-kernel@vger.kernel.org, Michal Marek , Richard Weinberger , Martin Schwidefsky , Jeff Dike , Hendrik Brueckner Subject: [PATCH 2/2] kbuild: do not redirect the first prerequisite for filechk Date: Wed, 25 Jul 2018 14:16:11 +0900 Message-Id: <1532495771-10255-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1532495771-10255-1-git-send-email-yamada.masahiro@socionext.com> References: <1532495771-10255-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 Currently, filechk unconditionally opens the first prerequisite and redirects it as the stdin of a filechk_* rule. Hence, every target using $(call filechk,...) must list something as the first prerequisite even if it is unneeded. '< $<' is actually unneeded in most cases. Each rule can explicitly adds it if necessary. Signed-off-by: Masahiro Yamada --- Makefile | 2 +- arch/s390/kernel/syscalls/Makefile | 6 +++--- arch/um/Makefile | 2 +- scripts/Kbuild.include | 2 +- scripts/Makefile.lib | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) -- 2.7.4 diff --git a/Makefile b/Makefile index 67d9d20..af863f1 100644 --- a/Makefile +++ b/Makefile @@ -1116,7 +1116,7 @@ define filechk_version.h echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';) endef -$(version_h): $(srctree)/Makefile FORCE +$(version_h): FORCE $(call filechk,version.h) $(Q)rm -f $(old_version_h) diff --git a/arch/s390/kernel/syscalls/Makefile b/arch/s390/kernel/syscalls/Makefile index 8ff96c0..4d929ed 100644 --- a/arch/s390/kernel/syscalls/Makefile +++ b/arch/s390/kernel/syscalls/Makefile @@ -25,15 +25,15 @@ _dummy := $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)') \ $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)') define filechk_syshdr - $(CONFIG_SHELL) '$(systbl)' -H -a $(syshdr_abi_$(basetarget)) -f "$2" + $(CONFIG_SHELL) '$(systbl)' -H -a $(syshdr_abi_$(basetarget)) -f "$2" < $< endef define filechk_sysnr - $(CONFIG_SHELL) '$(systbl)' -N -a $(sysnr_abi_$(basetarget)) + $(CONFIG_SHELL) '$(systbl)' -N -a $(sysnr_abi_$(basetarget)) < $< endef define filechk_syscalls - $(CONFIG_SHELL) '$(systbl)' -S + $(CONFIG_SHELL) '$(systbl)' -S < $< endef syshdr_abi_unistd_32 := common,32 diff --git a/arch/um/Makefile b/arch/um/Makefile index e54dda8..8c35261 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -169,7 +169,7 @@ define filechk_gen-asm-offsets echo " *"; \ echo " */"; \ echo ""; \ - sed -ne "/^->/{s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; s:->::; p;}"; \ + sed -ne "/^->/{s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; s:->::; p;}" < $<; \ echo ""; ) endef diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index 86321f0..0bee89c 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -56,7 +56,7 @@ kecho := $($(quiet)kecho) define filechk $(Q)set -e; \ mkdir -p $(dir $@); \ - $(filechk_$(1)) < $< > $@.tmp; \ + $(filechk_$(1)) > $@.tmp; \ if [ -r $@ ] && cmp -s $@ $@.tmp; then \ rm -f $@.tmp; \ else \ diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 1bb594f..4b2f89f 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -416,7 +416,7 @@ define filechk_offsets echo " * This file was generated by Kbuild"; \ echo " */"; \ echo ""; \ - sed -ne $(sed-offsets); \ + sed -ne $(sed-offsets) < $<; \ echo ""; \ echo "#endif" ) endef