From patchwork Sat Aug 10 15:52:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 171021 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp696094ily; Sat, 10 Aug 2019 08:54:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqz3C9xffUWeXtVne5LSjLXIeskWV9apKPzMb0B36ufGHUwmQCb0VNSPq4QepHvoLuy9WV4D X-Received: by 2002:a17:90a:1d8:: with SMTP id 24mr15414136pjd.70.1565452465432; Sat, 10 Aug 2019 08:54:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565452465; cv=none; d=google.com; s=arc-20160816; b=BA6LXmN6J+ef2h+bbq1K0FtP2qApehowefmjM3YgKhe3QGqGDRxEH5R8fUGSNssBmz nL8jPuzEcIkbBJcGSK56lFsK/BVChPn+BJSjWifIWn3/xGziLSO+ZFEdQJPCAe2jV9dl i4isPQx5+VXkh8E9/4XzTOFAYNNDto+1Gk5E0KhDoYHwxmS62Qg1kj3aCzvDkqKf8xlr YCZ70Il/KxA6rVgLwn7xSlX04aS8lD/XnYFst2H7WpUTfIcQ72sYNOjrMAKUXqh71YtJ HHLw9qUjpZSaJvPUAX+5iscwaSOZjJ0IQhtxz4QJRFg7SA2kiIURl0ZQiTJ9k8Y6TZw6 MLzA== 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=Gl/xBYgSeezXWNIArIxqmRVzBsQf63Pbcb4OsjGXeiQ=; b=I2dBVGpbfO/kFCmiJvD0oZ14yheO9uPxkxpK+AmewReWXXHfS+Vqp2AL9uBlSYd2MP 83dWzCUS/+xWPE6CGfu7PLtpqEBHi1Y6blRxVSO7bZnrF+h1eccW4en999IAIVAUs77V JKzLY9Ae7LKnmuWy+aoA7zq9dRX4yZSVKwBgXtLey3ur4LHZy2cjULcXOki8zAoCVrru jFbdlL9doXS/y0kOI3mT1n2VSqEwUsM8A1kM58DlmhDU2J/8t0B6a36Rt2fmoc0Kfiy+ vbchpM5AvpZ3lk82rc69TcmEAFlRtVyAeyzOfTg7mf6OyJW5K5TMoM+0lyJWEFQd1T0z e9Mg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=nwshnoz0; 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 j5si7764377pjf.60.2019.08.10.08.54.25; Sat, 10 Aug 2019 08:54:25 -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=nwshnoz0; 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 S1726321AbfHJPyX (ORCPT + 28 others); Sat, 10 Aug 2019 11:54:23 -0400 Received: from conuserg-11.nifty.com ([210.131.2.78]:34083 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726116AbfHJPyV (ORCPT ); Sat, 10 Aug 2019 11:54:21 -0400 Received: from grover.flets-west.jp (softbank126125143222.bbtec.net [126.125.143.222]) (authenticated) by conuserg-11.nifty.com with ESMTP id x7AFrG8u009713; Sun, 11 Aug 2019 00:53:18 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com x7AFrG8u009713 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1565452399; bh=Gl/xBYgSeezXWNIArIxqmRVzBsQf63Pbcb4OsjGXeiQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nwshnoz0X4Lf/tevGRCSEgQ6f5YV070QcFdc3CN1MeE4PWsepzIXzw6dKf1dvdSXp AE+VdOpPkJ/dGaj3O6+Bm3VpfWMRP6LVwPhwtF6lPLbboDGxRBLCM+B8y8XR01W9z2 bICyQF2DlJ5E416wf4akNDfnfe6RghVjcJ33oVqLLBqCAjtfCO0O0H0KxoTn6TMKk7 0LCIduFSShQa767DD9hFDfu55zvG2iYridwbY1dXQyOw4JPPS1iGWyDWsIm+aCdooC 26J/lv5HETB9TB4OvOhUorkpCSiCPSjVqK7dEkuSwjgz80GxB4IwimvHzpvp8yZKV/ mC3AEkyaNhYJA== X-Nifty-SrcIP: [126.125.143.222] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Christoph Hellwig , Sam Ravnborg , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 01/11] kbuild: move the Module.symvers check for external module build Date: Sun, 11 Aug 2019 00:52:57 +0900 Message-Id: <20190810155307.29322-2-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190810155307.29322-1-yamada.masahiro@socionext.com> References: <20190810155307.29322-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org $(objtree)/Module.symvers is not required for descending into sub-directories. It is needed for the modpost stage. Move the Module.symvers check to the right place. Signed-off-by: Masahiro Yamada --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/Makefile b/Makefile index 02aff718a11d..24c9ed272b5f 100644 --- a/Makefile +++ b/Makefile @@ -1620,10 +1620,10 @@ $(objtree)/Module.symvers: module-dirs := $(addprefix _module_,$(KBUILD_EXTMOD)) PHONY += $(module-dirs) modules -$(module-dirs): prepare $(objtree)/Module.symvers +$(module-dirs): prepare $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@) need-modorder=1 -modules: $(module-dirs) +modules: $(module-dirs) $(objtree)/Module.symvers @$(kecho) ' Building modules, stage 2.'; $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost From patchwork Sat Aug 10 15:52:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 171020 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp696084ily; Sat, 10 Aug 2019 08:54:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqzhWcfLgFuoaE8NxbmAgXaAYgu+uu6D4C/DmIhLjZxDhghKlUwG542g8NhGIVqr9tasxWHz X-Received: by 2002:a17:90a:b30e:: with SMTP id d14mr4493797pjr.26.1565452465041; Sat, 10 Aug 2019 08:54:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565452465; cv=none; d=google.com; s=arc-20160816; b=BcWMbfZiKyNvXA7szDjAM0Ny6BFlpNoCm8xE8N1LMs0PliO8x6bvbGOlywrT5UVxud 6TUWcB8AHGKpaHW9NmJepqVXC/2CWNVZgBfGkwejBLLEo9FBqc+4tbhN1zuPyF90H6Rh QlWooNmV6bwP5nIrliA9w4vHIhqK3h/dzGaCdcHI/oNvNcNS4Hm2OzETcVaoby8hZqWO k+FbSoCdfuSFb7ZrsyTqaQklw4V/HNXsSKcFE/3rHoZ2jxSU1UhbaLOKN/KB2g0J651C WS/1VW4OYjWFt2t+V/mhsiUDNpb3d4MbQFCnXVoxE+zU6pblC6RlK7ivN5nXxCwadhAc Xopg== 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=d/Z7awvrYGMGgW5gebyxG8uA/SddYL0ui4DyfJdxS5Q=; b=vdAWb/HKGvRwNi/gH+IISA3nw9kzWMtMbr1WfWDedR4UvhpuEbIwD0EvHzwkKl5kvw pRM1PSJf3unGQRDe4R4uuUm+VZb+qtVVUYGitsZQJCnMoXCXLX1oTDXAHEuUg1VmB3Uc g/JXrBBYaR5gLWV7aIHNzw4fNsyy9SZ6RZX2/7KvQUJg6/qqOtiMpYN++5tJzOoEuHUO R/cqTasdmP/BevY4kCP7DyaCOngQKbv/FHeDPidJMT6/gAiJLmN5Fja54VBShUPGyzrT LkM6NiPaeBYepwXRPgwyQxCOBuEGg2pLacGSnMesYliMBr2OyNnyRI1FOXcX6rmvraXv aPOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=IQHZVwb0; 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 j5si7764377pjf.60.2019.08.10.08.54.24; Sat, 10 Aug 2019 08:54:25 -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=IQHZVwb0; 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 S1726246AbfHJPyV (ORCPT + 28 others); Sat, 10 Aug 2019 11:54:21 -0400 Received: from conuserg-11.nifty.com ([210.131.2.78]:34077 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726066AbfHJPyV (ORCPT ); Sat, 10 Aug 2019 11:54:21 -0400 Received: from grover.flets-west.jp (softbank126125143222.bbtec.net [126.125.143.222]) (authenticated) by conuserg-11.nifty.com with ESMTP id x7AFrG8v009713; Sun, 11 Aug 2019 00:53:19 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com x7AFrG8v009713 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1565452399; bh=d/Z7awvrYGMGgW5gebyxG8uA/SddYL0ui4DyfJdxS5Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IQHZVwb0Bl/e5zBR92jGac/U7vVDzGHJ0MAp4usJPEVqFBobrgakJoA2YHNYi7T9A q+l8IWsSyck9kt7sqAGBwq7FhSN1y7Aj8EJO2KvpSfqrAhGc/bf6tMAcHkvNZ/KIX/ ay4Wk/O5fGoP78N0PatHXVWEUWLCAaibZnIsbGXBYubZgpoqEFbrgHIV56GW2GtM2b WWy8ZWOGDtzDvr4BlY7CSXu+qVsESw5LMEtF1+F/ryDorkPY9/Bh8bswIIO8SETBWy mu2zyDhXj9n6yYOQC0rkJ+Dfsc30wR0J2yWxXOev+7GZCCTR9dlXiHmU1J1wkSiUbR Mr3BPcS2/TS5Q== X-Nifty-SrcIP: [126.125.143.222] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Christoph Hellwig , Sam Ravnborg , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 02/11] kbuild: refactor part-of-module more Date: Sun, 11 Aug 2019 00:52:58 +0900 Message-Id: <20190810155307.29322-3-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190810155307.29322-1-yamada.masahiro@socionext.com> References: <20190810155307.29322-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make it even shorter. Signed-off-by: Masahiro Yamada --- scripts/Makefile.build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.17.1 diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 2f66ed388d1c..64e47a9a54c5 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -98,8 +98,7 @@ endif # --------------------------------------------------------------------------- # Default is built-in, unless we know otherwise -$(foreach x, i ll lst o s symtypes, $(patsubst %.o,%.$(x),$(real-obj-m))): \ - part-of-module := y +part-of-module = $(if $(filter $(basename $@).o, $(real-obj-m)),y) modkern_cflags = \ $(if $(part-of-module), \ From patchwork Sat Aug 10 15:52:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 171022 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp696190ily; Sat, 10 Aug 2019 08:54:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqyZhpl5K4aatuXab/FtbxlUBlWSE+UMqHVRchMLNk5+kMgWvsfp3C9l1rpXjzgIxkmfmlRd X-Received: by 2002:a17:902:be01:: with SMTP id r1mr5264000pls.229.1565452471650; Sat, 10 Aug 2019 08:54:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565452471; cv=none; d=google.com; s=arc-20160816; b=g5FVrW7hgVBQ5eJgOSIDNAl/ZG+ZfV84wGQeswRKlLcnx60tFTHmIzBoZnLBvxIAuQ JFlzzbMnBJilQ1yef/H6znEN24BTKBFLX4O9bFrIRHLZBFUIejZeKcYkJI1QChnnTCPU C3n5yiBxBjtk/rxPikIizmuHYR/LjSPttXK0W3sT73xdoa7U3SWfb3wzwdIst/kVHHK+ ADRvBmI4jg+P2WuJHzp8vo/gmXjwGBeLT1F9tx05AQd3L7Tqz5L0fO3+M9eJdD49AHTC pXyRZMunaI/bUxWvc/6b81O3pC+eiywdPK28lFRZ4els8OECKS7C8o50q9XTtym5TzPR OlpA== 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=KecbMzZwJmwYQUVDejPwmn2JvmhFXY02Xy+SlXS+v/4=; b=EgcWgAy/zbUTsklbUNGrz7KvCYaecXDKOZNdgyaTn4l2n54cugdvoolLme2VjsTP/R 6v1IMKzHv/h+LJETNS5XO7jzY/BePG5YNnliKXlM0VpHOYknta013GzfNFp/DyT/fQxS xSDeqKALzA4197UXrpZVm+gPj7zo9b1l4yCzz1DDjU0n1Sn0w7DJzhwvDd7HHAV11Utl 9IES/lzeQsqT9++eX29Gf8IxPF1qNFrJnBeHLf9MoiYnEeHVuXMOHvw/Fes6KbiyJ+RR 8ZGxxct6fKvedijQM4tXh3zQdtxC4iPSPQk4XiF+2xAPPtf0x65+mgngPUxSUQe1TTrb qUUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=axcmuWsG; 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 59si7308214plf.400.2019.08.10.08.54.31; Sat, 10 Aug 2019 08:54:31 -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=axcmuWsG; 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 S1726376AbfHJPya (ORCPT + 28 others); Sat, 10 Aug 2019 11:54:30 -0400 Received: from conuserg-11.nifty.com ([210.131.2.78]:34081 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725862AbfHJPyV (ORCPT ); Sat, 10 Aug 2019 11:54:21 -0400 Received: from grover.flets-west.jp (softbank126125143222.bbtec.net [126.125.143.222]) (authenticated) by conuserg-11.nifty.com with ESMTP id x7AFrG8w009713; Sun, 11 Aug 2019 00:53:20 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com x7AFrG8w009713 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1565452400; bh=KecbMzZwJmwYQUVDejPwmn2JvmhFXY02Xy+SlXS+v/4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=axcmuWsGYPgVRb8Z2O8uu/otKnz12VRAUP+qIP8MwftpsEOznOjLHRJ2HQ+fnUMvv Gh+F00b84fuYGb4oFuecwHrHuvx0ssiY3j6TJ6LC/Vz10ji159IOdTy/wKsfTnJYCF 1zzSkMUGEtj3P4wCFTB1JUXKAtN+9ssqmI3BvZCnfq/4YYjdVm7C4jZ86bErr+v2w9 ITu4g2nFrVKY2x/O/W0s5I7qaicAe37feejQ6y+F2cKQ9BAdS07YOlT5Rk8OzEN2/l p83A2Uum7HaHARYq6t+MP1CJXdir/jCqukRUnuuXmohE7yuK6D6OEoOTUS69K6578q 2vzSHFTDfRZnA== X-Nifty-SrcIP: [126.125.143.222] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Christoph Hellwig , Sam Ravnborg , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 03/11] kbuild: fix modkern_aflags implementation Date: Sun, 11 Aug 2019 00:52:59 +0900 Message-Id: <20190810155307.29322-4-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190810155307.29322-1-yamada.masahiro@socionext.com> References: <20190810155307.29322-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For the single target building %.symtypes from %.S, $(a_flags) is expanded into the _KERNEL flags even if the object is a part of a module. $(real-obj-m:.o=.symtypes): modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE) ... would fix the issue, but it is not nice to duplicate similar code for every suffix. Implement modkern_aflags in the same way as modkern_cflags. Signed-off-by: Masahiro Yamada --- scripts/Makefile.build | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) -- 2.17.1 diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 64e47a9a54c5..3633558f7861 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -309,10 +309,9 @@ $(obj)/%.h.s: $(src)/%.h FORCE # Compile assembler sources (.S) # --------------------------------------------------------------------------- -modkern_aflags := $(KBUILD_AFLAGS_KERNEL) $(AFLAGS_KERNEL) - -$(real-obj-m) : modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE) -$(real-obj-m:.o=.s): modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE) +modkern_aflags = $(if $(part-of-module), \ + $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE), \ + $(KBUILD_AFLAGS_KERNEL) $(AFLAGS_KERNEL)) # .S file exports must have their C prototypes defined in asm/asm-prototypes.h # or a file that it includes, in order to get versioned symbols. We build a From patchwork Sat Aug 10 15:53:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 171028 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp696585ily; Sat, 10 Aug 2019 08:55:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqzunHT8kKuZ4nitFl6MKdT5w8YlA1WY745TB9BUSv6WGn3npjXmR60ryej4YSbticeFyzGx X-Received: by 2002:a17:90a:32c7:: with SMTP id l65mr15104031pjb.1.1565452500387; Sat, 10 Aug 2019 08:55:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565452500; cv=none; d=google.com; s=arc-20160816; b=eolzyCvv5w97cmIH6W7sVd3d7259GdaC6VxHaJ5wZU2JTtxiOWMm0uOla9NjcL2Y0k 8vKFBHebfGjVXAZYUZVIMmNJg2ye+7H5WwFMqDQVra7KYLlhim28RI1hYVfhuXl8PXN0 xGkcou0wL7eAQ834Xq6UJg1gkeP3TygC5UmNPe82bU++MG2JtYa+6ZnldIAnoQI5XrCf B8Oz+zZbltlKX7y8DMpInlj+pmU5ao12e+0Wh2yhyMjwmpfGPu68EmAzXX5yKLSjC6Jq BHtOc9DAAPM5c3URw9TBzI3fo6FuvRxuJSlqOwMexy9MzMIoudkftJ14r8f18QYeyT4u YhAA== 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=l1ycP8oGkQD/aCe4zNqlB/biCW5yxV6/RDGMWKdUx8M=; b=hVCAiSy6C0KqhEHVc2b2MeGjEXqYvpXeck/8p9u34NDeXvhIF2o1iotctAj9PeRvl+ fQBFXsZrmBxzzKCpWm8Oa1Q74eOeK1yoEstVqGLJsMgY5HpAHjEISfxZ0U9wwCGq0Q6j LiyNPSufpjCwgWZq+1WBplJ0AF5otp8CL7XuZOScq4MonDLJ3Y/38Kl9bzdnPJyss/+d 9pV5U0oWPZK+b0VNwk59Wajk1h4HxbWVHkHb5xbxNRAJ+LgbEJ1BSDIk5VvL8PImoapH VUIsA1zuL9YBD57E1aqabeSgS22eTNuFbvGRGqLnM0mhDfqScwBU+DTuTgC8ib1weJn5 2/gg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=cpOqqVK4; 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 z9si7081933pju.2.2019.08.10.08.55.00; Sat, 10 Aug 2019 08:55:00 -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=cpOqqVK4; 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 S1726565AbfHJPy6 (ORCPT + 28 others); Sat, 10 Aug 2019 11:54:58 -0400 Received: from conuserg-11.nifty.com ([210.131.2.78]:34527 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726410AbfHJPyo (ORCPT ); Sat, 10 Aug 2019 11:54:44 -0400 Received: from grover.flets-west.jp (softbank126125143222.bbtec.net [126.125.143.222]) (authenticated) by conuserg-11.nifty.com with ESMTP id x7AFrG8x009713; Sun, 11 Aug 2019 00:53:20 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com x7AFrG8x009713 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1565452401; bh=l1ycP8oGkQD/aCe4zNqlB/biCW5yxV6/RDGMWKdUx8M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cpOqqVK4Hq+425fN3Q07m/br7bt9+bAgD4HL+2spwQAKxOu5IZPc4I295meOH5vky G7Ew8aK4DiJmLMw6/PPUDkNdD8NdCgQqi3vjQhZfF2qb1VwofRC7uDUYRFHPgq7T/S 0Bn1SkabQ3EaqUqDy8WusfrmaJIVNmRbU+kFM+ffpY3yztYW/n0gG35JkBAg2Q0CKR nSZNxdJ17QWmjSEs5YYbyGMhflZtmlQCItqEJ7ZrsoS5LoqEMn7uidgst9Vo94bziH ivcVJsA394d3TlNRClwQ6Mef234qwG9mWlQ98SLPIl0RQhZuRUX5+2K+5KGmh/tknk 8JdL6zSEyhRSg== X-Nifty-SrcIP: [126.125.143.222] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Christoph Hellwig , Sam Ravnborg , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 04/11] kbuild: remove 'make /' support Date: Sun, 11 Aug 2019 00:53:00 +0900 Message-Id: <20190810155307.29322-5-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190810155307.29322-1-yamada.masahiro@socionext.com> References: <20190810155307.29322-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 'make /' is just an alias for 'make ./'; this builds all objects of an external module, but skips the modpost stage. I am not a big fan of 'make /' since it looks as if it were touching the root directory of the system. I like 'make ./' better. I do not know how many people are using it, but let's show a hint if it is used. Also, move it close to the external module rules since this only makes sense for external modules. Signed-off-by: Masahiro Yamada --- Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- 2.17.1 diff --git a/Makefile b/Makefile index 24c9ed272b5f..86afce391582 100644 --- a/Makefile +++ b/Makefile @@ -1648,6 +1648,10 @@ $(clean-dirs): clean: rm-files := $(KBUILD_EXTMOD)/Module.symvers +PHONY += / +/: + @echo >&2 '"$(MAKE) /" is no longer supported. Please use "$(MAKE) ./" instead.' + PHONY += help help: @echo ' Building external modules.' @@ -1783,11 +1787,6 @@ endif $(Q)$(MAKE) $(build)=$(build-dir) $(build-target:.ko=.mod) $(Q)echo $(build-target) > $(MODORDER) $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost - -# Modules -PHONY += / -/: ./ - %/: prepare FORCE $(Q)$(MAKE) KBUILD_MODULES=1 $(build)=$(build-dir) need-modorder=1 From patchwork Sat Aug 10 15:53:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 171023 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp696378ily; Sat, 10 Aug 2019 08:54:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqz8F+YeXh+ezBOkjN99MSrO1mr+4uHyE1szaT+WqVUB+O7YWNZR8ooeJLFSmc/58GHARfNj X-Received: by 2002:a63:194f:: with SMTP id 15mr23052302pgz.382.1565452484950; Sat, 10 Aug 2019 08:54:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565452484; cv=none; d=google.com; s=arc-20160816; b=cCnSSi0mXnEgwz8KuiKYwNCBUu3iy591UzzmjC67oNcq4nmAiWiwkbG/Exb9/ZX1z3 dZVvU62sKl0cf3t9tYojCie+2vgHeqEf9PlSnUKhLnuc4WuGKH+dbJOnpE2zzhEdpVWj x/9VIc+WULX1U02r/Id3wjo02P2HcRiBgT9sne38hzdZT8Zw89WSGZGw5INikV2354Da nKu5VSKFS3L/M2fr1bhbOdPqqyeq6M1kgL+Y0w/VjKbTXhwx6Qp1K0MG2E3YAGZpTQ6s +u9mZoj5ELLqZxqIF3FYnDs7lNf/BM47DLAMLmDiyRegy/oKRnjDvRE3mn71JrGwgKBk IrsA== 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=LeZPD/qkSIcgM9EBQ+Q5XO5DtE5e/gaJJ+sdb3E32Fc=; b=f98P/tzhWvp771S9HJ64dO0L2RQ4hMmrbOpsdVk3WMQtgqXwuZEHSSE6J3fb/Y/h4V rqh/EwGowPXohmoBb/J8f17suwJ7jafj8GTopsesbf5mtioVcqa9Ft6QcVPzib9XXLSk OpyqQqDuETG0VAWSFeTcw7lrc1wFUKYdMGl8xi5HGL5QMftsyUoRrAm5Bk0AAs1WsVoC uqdGf344zDWIl2l/Hgz596ESvFkGGMsomKU6WFdbNnyj1GSrNgiyg4hi2fm6CCjqU6Za dChNpPnx6jCffraUhVmHC9VABzvGDzkR/qgYOcbyazDc+tzEMzjeOwwRuLcD6cByDmgQ 8OhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=VIcsjzNG; 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 o6si65863133pfb.230.2019.08.10.08.54.44; Sat, 10 Aug 2019 08:54:44 -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=VIcsjzNG; 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 S1726449AbfHJPyn (ORCPT + 28 others); Sat, 10 Aug 2019 11:54:43 -0400 Received: from conuserg-11.nifty.com ([210.131.2.78]:34508 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726396AbfHJPym (ORCPT ); Sat, 10 Aug 2019 11:54:42 -0400 Received: from grover.flets-west.jp (softbank126125143222.bbtec.net [126.125.143.222]) (authenticated) by conuserg-11.nifty.com with ESMTP id x7AFrG90009713; Sun, 11 Aug 2019 00:53:21 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com x7AFrG90009713 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1565452401; bh=LeZPD/qkSIcgM9EBQ+Q5XO5DtE5e/gaJJ+sdb3E32Fc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VIcsjzNGQvNkKoXve9LSdBGLAvmUVWKa2gy/JzTzwmjN+S5O4cFUebDFA+JYiv5yD Iu0MRYnIaYvF6UVZ8rmmm7I05rPeK8DswhMMXMkbuDa72/R4RsaUmRrxIqAXiClKKF vyvBoXBBDQ1/iAPpvCQB4tBb1xJN5z/yoVp4oNk8DRyhAboW8iQw5AEkEhcxGT9OQM adGwfsaif7ZKqvFQH4Pf4gVC333MObaHMe0SBbzYKFu8SdNFx/xwLs5HHwAldlmrNI yzQRE7QibXiIN91F4TYZAkiZihjcrHfPObA8uxuVtiwo8YCHsWwufCQ6qcGJ/1Jxqk j+XFtAyFHAW0Q== X-Nifty-SrcIP: [126.125.143.222] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Christoph Hellwig , Sam Ravnborg , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 05/11] kbuild: remove meaningless 'targets' in ./Kbuild Date: Sun, 11 Aug 2019 00:53:01 +0900 Message-Id: <20190810155307.29322-6-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190810155307.29322-1-yamada.masahiro@socionext.com> References: <20190810155307.29322-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org timeconst.h is generated by $(call filechk,...), missing-syscalls and old-atomics are invoked by $(call cmd,...) None of them needs to be added to 'targets'. Signed-off-by: Masahiro Yamada --- Kbuild | 4 ---- 1 file changed, 4 deletions(-) -- 2.17.1 diff --git a/Kbuild b/Kbuild index 8637fd14135f..d40366e967d7 100644 --- a/Kbuild +++ b/Kbuild @@ -18,8 +18,6 @@ $(bounds-file): kernel/bounds.s FORCE timeconst-file := include/generated/timeconst.h -targets += $(timeconst-file) - filechk_gentimeconst = echo $(CONFIG_HZ) | bc -q $< $(timeconst-file): kernel/time/timeconst.bc FORCE @@ -42,7 +40,6 @@ $(offsets-file): arch/$(SRCARCH)/kernel/asm-offsets.s FORCE # Check for missing system calls always += missing-syscalls -targets += missing-syscalls quiet_cmd_syscalls = CALL $< cmd_syscalls = $(CONFIG_SHELL) $< $(CC) $(c_flags) $(missing_syscalls_flags) @@ -54,7 +51,6 @@ missing-syscalls: scripts/checksyscalls.sh $(offsets-file) FORCE # Check atomic headers are up-to-date always += old-atomics -targets += old-atomics quiet_cmd_atomics = CALL $< cmd_atomics = $(CONFIG_SHELL) $< From patchwork Sat Aug 10 15:53:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 171025 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp696466ily; Sat, 10 Aug 2019 08:54:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqxavcvlugu671VpKMXLkFRdwV/x9AonzW0+S3ctb7kbyXjUHpAQpPbTr57qxRAcVDMJTUUu X-Received: by 2002:a17:90a:1ae1:: with SMTP id p88mr14629467pjp.26.1565452491519; Sat, 10 Aug 2019 08:54:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565452491; cv=none; d=google.com; s=arc-20160816; b=Tsheh9DmYjxdENRWBPB2fm4jklxtP36Hv5IKtSTay0T6BReWIOF7Nr4v9i8E/29lJq ZsJ8uMQ/EwfBE+wP2ZWMF2jjJcYg1/Vmd+SVc117mNlTCCLDCRWlqA3nVrLNo/P/O1hS tbFedSioeSHxGTXa9bH79XrcjA2FtTJIcjdyWt1ctEVK+RvPIaeRZtp3nlZRukWtW9FH X7ImCmDZQcXH6NnmZbr2QqLB8+rn4jkguZGLXr609Sgql7lasmM0o2OZSlwwzAnzJbW4 8t6VUYUNUYpYIq2a4wlraUOlJQ7alDkhh5yixahalz361FgDTROlTEHeAgfxK/8IRdGK qIdg== 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=onIwv+EPa0vqTk5X0M3CLvg0Iqo4Rrn5M+XnMa8Ijkk=; b=RAy+usSWG+na7i+M61NXuEE2wpqOz8kTSBGVta3Xtz4h3ZU72y0Sxgyva2gINbPQ8m mXYxL7w+oF/0zBImm08bfN1ubXBVSTzvKEEoMuempyEpDxCVUUoSBvZvjEXpVzk4Xd7I GY07aaidulAVnWuMIW3diZa3u0HtrFkGlT0w964y6znzjkyA9nLLMS4bYUBqRhgwwIzR WIndt+6ytAgrXgZUb4q/MRVhEgbyT2LvO4vazm6llm7Wvph/lPzdh+BwtA0c09n6uDWZ dpEFOkFfNrBD9z/wh2UTwM5vQL+MN9sH10SHJyB2XZoR660Xexdrm3kvnP+2yPoKeHFu YppQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=VtnhKUHG; 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 ch18si53531726plb.76.2019.08.10.08.54.51; Sat, 10 Aug 2019 08:54:51 -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=VtnhKUHG; 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 S1726496AbfHJPyu (ORCPT + 28 others); Sat, 10 Aug 2019 11:54:50 -0400 Received: from conuserg-11.nifty.com ([210.131.2.78]:34528 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726407AbfHJPyo (ORCPT ); Sat, 10 Aug 2019 11:54:44 -0400 Received: from grover.flets-west.jp (softbank126125143222.bbtec.net [126.125.143.222]) (authenticated) by conuserg-11.nifty.com with ESMTP id x7AFrG91009713; Sun, 11 Aug 2019 00:53:22 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com x7AFrG91009713 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1565452402; bh=onIwv+EPa0vqTk5X0M3CLvg0Iqo4Rrn5M+XnMa8Ijkk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VtnhKUHGBT4dINwbjKo6kNYQrELeiwUJgxX5AFtXBdxP37BTxsEekORBVFduJoqm3 woCF/1iagd3EWNMT9APsRPNF7CvcETCsBQ5LXiemYsUBYqWJy8p+H3bTzWs5FmyZEs /aAQJQWl0gdSRyOdrnjRveH6BUImYRiUp4A4qEfxFqsWEA3zUvMfp7BCG8VAQqnOuV V0jeVA2NSz0FPanqvxmAzyk/8CIN4lQRNS8muWfxMI4VwoYzoEfGwR+nkrNjfZim20 YhUFjERsgcWrVjCiR3YG9W/GaGYTytoxSB+dJc2J2uBF3D2ISVpyAHwyE5rUaDCuVP vEC+FnK3fxOZw== X-Nifty-SrcIP: [126.125.143.222] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Christoph Hellwig , Sam Ravnborg , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 06/11] kbuild: do not descend to ./Kbuild when cleaning Date: Sun, 11 Aug 2019 00:53:02 +0900 Message-Id: <20190810155307.29322-7-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190810155307.29322-1-yamada.masahiro@socionext.com> References: <20190810155307.29322-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 'make clean' descends into ./Kbuild, but does not clean anything since everything is added to no-clean-files. There is no need to descend to ./Kbuild in the first place. We can drop the no-clean-files assignment. Signed-off-by: Masahiro Yamada --- Kbuild | 3 --- Makefile | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) -- 2.17.1 diff --git a/Kbuild b/Kbuild index d40366e967d7..3109ac786e76 100644 --- a/Kbuild +++ b/Kbuild @@ -57,6 +57,3 @@ quiet_cmd_atomics = CALL $< old-atomics: scripts/atomic/check-atomics.sh FORCE $(call cmd,atomics) - -# Keep these three files during make clean -no-clean-files := $(bounds-file) $(offsets-file) $(timeconst-file) diff --git a/Makefile b/Makefile index 86afce391582..3c186f59f152 100644 --- a/Makefile +++ b/Makefile @@ -1396,7 +1396,7 @@ DISTCLEAN_FILES += tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS # clean: rm-dirs := $(CLEAN_DIRS) clean: rm-files := $(CLEAN_FILES) -clean-dirs := $(addprefix _clean_, . $(vmlinux-alldirs)) +clean-dirs := $(addprefix _clean_, $(vmlinux-alldirs)) PHONY += $(clean-dirs) clean archclean vmlinuxclean $(clean-dirs): From patchwork Sat Aug 10 15:53:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 171026 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp696508ily; Sat, 10 Aug 2019 08:54:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqxgJMGAbXM/dzZSXeC0NOUVb6BG66KXRzwOO0qBUOcCpfpM5qdQKiDGQrvv85IOWDL5IwcY X-Received: by 2002:a17:90a:d3d4:: with SMTP id d20mr15581638pjw.28.1565452494738; Sat, 10 Aug 2019 08:54:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565452494; cv=none; d=google.com; s=arc-20160816; b=w06JzsK4kMGPV7Fhitog+8Sx4UfknpeaYP2bf/8S+0f0rizBkNNgBfUQK80kRhdkeZ uZhVOHVea1rRhfUBdfO7x07Jt+eLeolcmIAKgK3+1aIVLd5reMZ47dE22xgfSvncG1RS eeDp+CVNxH2zRhtjpwvuAaeDoF2Z9DNCIgvmfRRhrkRiN1govKs77TAAY4hQUzIPsWeE Xb66dAm2BwZYFx5P6GwH3Jk7bobJ6xAVZy0DNn1mYgZ+T0XIGJkzMlfIz3hynW0VCKXN QkM/ktodc+xJjR/UcmA1feYX78DX9fktePUuFIVR4/v+h7KC59z3m1UMKXY3H/GXTaTh 11UQ== 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=q19NAFTNKp4QUU0WxVbfBhOEmqZv8BRCw+mGkwwGwmY=; b=jemEJ3bgtnzV8TNGNSRSMHSOwC34JWdsNp+YQDbgG7z6Dnw9dOOpU1te4J78UTyXCO UnuANxdIeROEphQBC3WPzy0KaZT7WqLtv1l1qEC6+Q46CnAo3H5lvD/9q942UhcvM4rW Cm62339sMVNOk0VgbE6lnqwj0qgkb1zHxqY36y+pIaXP1Ihj3hIYWC5Ld0fwseuPHQ+W LJH2DKyGUxNueAaoj2G3dcpnvloXn25c5R+tAlekzbiVE7S7Ql2+gGxdht4TGT9DqdwR q+JhE36KMJKC2tQg/QOXt1Hl+gWlwOyk/RRmbBJDB4DniRXvvqf40PYn38kSMrhX/mCU EIyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=1lk7a9TD; 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 z9si7081933pju.2.2019.08.10.08.54.54; Sat, 10 Aug 2019 08:54:54 -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=1lk7a9TD; 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 S1726515AbfHJPyw (ORCPT + 28 others); Sat, 10 Aug 2019 11:54:52 -0400 Received: from conuserg-11.nifty.com ([210.131.2.78]:34505 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726395AbfHJPyo (ORCPT ); Sat, 10 Aug 2019 11:54:44 -0400 Received: from grover.flets-west.jp (softbank126125143222.bbtec.net [126.125.143.222]) (authenticated) by conuserg-11.nifty.com with ESMTP id x7AFrG92009713; Sun, 11 Aug 2019 00:53:23 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com x7AFrG92009713 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1565452403; bh=q19NAFTNKp4QUU0WxVbfBhOEmqZv8BRCw+mGkwwGwmY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1lk7a9TDpm99vup4cPGkRt6HrYV5t9eA65THFktbMHr5VtmD/ROCPjTLa3wQ5me4c xxb2xcw/3CD5gSAVyS2QLLApvGtPTmL0TqxjDa0Zv7KSxycRZUBTzkv5aasgZ3kORJ vBIUXpDQu7jSgQDopHnWUwNfT8+kN+zTTrH3FmGrC7aLK602Wwc8FPTxTZRcQOADBa Cd41sn5YvVytLdh3NjEJr57QUq731sodUXrHU7Y2PHlB5ZzgXC2bGs7Z7wc7Rz89AY ilwJyRUt8fjV6Ug2/pTEKeOoGKe4Nn7Gz3OnZwIbUPVc7B9Wf0inuUgsDreaLRcmFu BXQ75R3hy215A== X-Nifty-SrcIP: [126.125.143.222] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Christoph Hellwig , Sam Ravnborg , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 07/11] kbuild: unset variables in top Makefile instead of setting 0 Date: Sun, 11 Aug 2019 00:53:03 +0900 Message-Id: <20190810155307.29322-8-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190810155307.29322-1-yamada.masahiro@socionext.com> References: <20190810155307.29322-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There is no need to set 0 to variables such as config-targets, mixed-targets, etc. Unset instead of setting 0 in order to use 'ifdef' to test them. I also renamed: config-targets -> config-build mixed-targets -> mixed-build dot-config -> need-config to clarify what we are doing. Signed-off-by: Masahiro Yamada --- Makefile | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) -- 2.17.1 diff --git a/Makefile b/Makefile index 3c186f59f152..706ca0d633df 100644 --- a/Makefile +++ b/Makefile @@ -272,32 +272,32 @@ no-dot-config-targets := $(clean-targets) \ no-sync-config-targets := $(no-dot-config-targets) install %install \ kernelrelease -config-targets := 0 -mixed-targets := 0 -dot-config := 1 -may-sync-config := 1 +config-build := +mixed-build := +need-config := 1 +may-sync-config := 1 ifneq ($(filter $(no-dot-config-targets), $(MAKECMDGOALS)),) ifeq ($(filter-out $(no-dot-config-targets), $(MAKECMDGOALS)),) - dot-config := 0 + need-config := endif endif ifneq ($(filter $(no-sync-config-targets), $(MAKECMDGOALS)),) ifeq ($(filter-out $(no-sync-config-targets), $(MAKECMDGOALS)),) - may-sync-config := 0 + may-sync-config := endif endif ifneq ($(KBUILD_EXTMOD),) - may-sync-config := 0 + may-sync-config := endif ifeq ($(KBUILD_EXTMOD),) ifneq ($(filter config %config,$(MAKECMDGOALS)),) - config-targets := 1 + config-build := 1 ifneq ($(words $(MAKECMDGOALS)),1) - mixed-targets := 1 + mixed-build := 1 endif endif endif @@ -305,18 +305,18 @@ endif # For "make -j clean all", "make -j mrproper defconfig all", etc. ifneq ($(filter $(clean-targets),$(MAKECMDGOALS)),) ifneq ($(filter-out $(clean-targets),$(MAKECMDGOALS)),) - mixed-targets := 1 + mixed-build := 1 endif endif # install and modules_install need also be processed one by one ifneq ($(filter install,$(MAKECMDGOALS)),) ifneq ($(filter modules_install,$(MAKECMDGOALS)),) - mixed-targets := 1 + mixed-build := 1 endif endif -ifeq ($(mixed-targets),1) +ifdef mixed-build # =========================================================================== # We're called with mixed targets (*config and build targets). # Handle them one by one. @@ -332,7 +332,7 @@ __build_one_by_one: $(MAKE) -f $(srctree)/Makefile $$i; \ done -else +else # !mixed-build include scripts/Kbuild.include @@ -544,7 +544,7 @@ endif # and from include/config/auto.conf.cmd to detect the compiler upgrade. CC_VERSION_TEXT = $(shell $(CC) --version 2>/dev/null | head -n 1) -ifeq ($(config-targets),1) +ifdef config-build # =========================================================================== # *config targets only - make sure prerequisites are updated, and descend # in scripts/kconfig to make the *config target @@ -561,7 +561,7 @@ config: scripts_basic outputmakefile FORCE %config: scripts_basic outputmakefile FORCE $(Q)$(MAKE) $(build)=scripts/kconfig $@ -else +else #!config-build # =========================================================================== # Build targets only - this includes vmlinux, arch specific targets, clean # targets and others. In general all targets except *config targets. @@ -604,7 +604,7 @@ endif export KBUILD_MODULES KBUILD_BUILTIN -ifeq ($(dot-config),1) +ifdef need-config include include/config/auto.conf endif @@ -652,8 +652,8 @@ ARCH_AFLAGS := ARCH_CFLAGS := include arch/$(SRCARCH)/Makefile -ifeq ($(dot-config),1) -ifeq ($(may-sync-config),1) +ifdef need-config +ifdef may-sync-config # Read in dependencies to all Kconfig* files, make sure to run syncconfig if # changes are detected. This should be included after arch/$(SRCARCH)/Makefile # because some architectures define CROSS_COMPILE there. @@ -676,7 +676,7 @@ $(KCONFIG_CONFIG): # The syncconfig should be executed only once to make all the targets. %/auto.conf %/auto.conf.cmd %/tristate.conf: $(KCONFIG_CONFIG) $(Q)$(MAKE) -f $(srctree)/Makefile syncconfig -else +else # !may-sync-config # External modules and some install targets need include/generated/autoconf.h # and include/config/auto.conf but do not care if they are up-to-date. # Use auto.conf to trigger the test @@ -692,7 +692,7 @@ include/config/auto.conf: /bin/false) endif # may-sync-config -endif # $(dot-config) +endif # need-config KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks,) KBUILD_CFLAGS += $(call cc-disable-warning,frame-address,) @@ -1809,9 +1809,9 @@ existing-targets := $(wildcard $(sort $(targets))) -include $(foreach f,$(existing-targets),$(dir $(f)).$(notdir $(f)).cmd) -endif # ifeq ($(config-targets),1) -endif # ifeq ($(mixed-targets),1) -endif # need-sub-make +endif # config-targets +endif # mixed-build +endif # need-sub-make PHONY += FORCE FORCE: From patchwork Sat Aug 10 15:53:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 171024 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp696437ily; Sat, 10 Aug 2019 08:54:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqyL0N+LgtVYG7Hhj/k54Qf60za1LiC7idzUb8BE6MXhcqjaIq9jrJpcgkYPKHH6/CvUHbmK X-Received: by 2002:a17:90a:cb01:: with SMTP id z1mr14964421pjt.93.1565452489410; Sat, 10 Aug 2019 08:54:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565452489; cv=none; d=google.com; s=arc-20160816; b=eraf7OBknWdzRA/yJj+YpR3phRW/fK+uYDCi6s1mfoTtu8heVv1hwNrsK4ozEWqiZj 3WdEvF465OTalytpXPDRl6aKMiOh82MenYJA6Ff1Q5fvwNCBv/J83zBiNSZU7f2rxb+O xgLrMkOPAGS5S0iM1gq0ka9PCRF66vcAc/dYF+6igwBfBWlaq2uKflM5teeLTcI47CWc ULROyIenwI64QNDA8aRewAII+HdCNJ+OujS/7GKE6Xw4/BQQEgFmI8iqWbNRlYcDxRmf R2yhWFLASTYwR3UoYssknAwjYSzLiCZDONCau7sZuq/TGWx9KKY4gKgNA6mUIWKcsbMz RWPw== 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=hGsks6/xTqefvtoV6rav816BO3YdGgcz9HfhUMQ+tCs=; b=NC8cIUr8r5010ZqGeN1fqSUHXydER/EiZ+rk89WoGAH6xKVoDUFWzxI7jdDqBUHyi2 Db6DCD2TjlJNnPNEAX2Z7oZxs1WKObxfkqDIeKOt/uLrl3wtcVxz/FA2LPPEuywOuzPe U2lCjdCiubOcXaGwciwTAvQgj0l+qiqiZmWRSHFsb65/NHHZdYv5sR7c3Y0qLchkJRFC xqld7+3s6EilS2v41n+9vWNcC9YibUo+o2bHLS08ewWL0qeM/5neEHZVQFqv+Eo6lEV2 gnJK+gZsj8J0ry/3oGZMedcFhf3PIAAEfRu1CnbBSYpp7BUzk/aDOM5GjpTGJCPE68Z9 bcAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=1rhNgl5n; 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 ch18si53531726plb.76.2019.08.10.08.54.49; Sat, 10 Aug 2019 08:54:49 -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=1rhNgl5n; 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 S1726473AbfHJPyr (ORCPT + 28 others); Sat, 10 Aug 2019 11:54:47 -0400 Received: from conuserg-11.nifty.com ([210.131.2.78]:34507 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726403AbfHJPyo (ORCPT ); Sat, 10 Aug 2019 11:54:44 -0400 Received: from grover.flets-west.jp (softbank126125143222.bbtec.net [126.125.143.222]) (authenticated) by conuserg-11.nifty.com with ESMTP id x7AFrG93009713; Sun, 11 Aug 2019 00:53:24 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com x7AFrG93009713 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1565452404; bh=hGsks6/xTqefvtoV6rav816BO3YdGgcz9HfhUMQ+tCs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1rhNgl5nfXqK6aeESp/h9w3WhtoFqScmp9Gbi6Gg4d2OpfHgasNr+c4WOr8KiSyG0 QJZSSZBxPrJ65ky6+VdLsM5LEahCr6vwYY7dhKTbL1zqASYt+2IhfKfNs7X0VhCEdZ +gmsGEQV5pkSUSi2p5maUGZnGG9gjwnKP/DjdR2pwW8/ZqzAEIRWD1nDBZ2sGVlaN7 QztjR3jW4R1VxPlWK/A20OkbmdS4REuwUw8UWRfCxjkqgn8TK9lrmQhGSd65JjR8+c 5rZ83I0/UCd6mNvP0V2Lwfa43wKBj/Fr0e2jZURlg6qXMEjy18PMVFRQ5Oncqr/nmy Cnw49yVtePhoA== X-Nifty-SrcIP: [126.125.143.222] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Christoph Hellwig , Sam Ravnborg , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 08/11] kbuild: unify vmlinux-dirs and module-dirs rules Date: Sun, 11 Aug 2019 00:53:04 +0900 Message-Id: <20190810155307.29322-9-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190810155307.29322-1-yamada.masahiro@socionext.com> References: <20190810155307.29322-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The in-kernel build and external module build have similar code for descending into sub-directories. Factor out the code into the common place. Signed-off-by: Masahiro Yamada --- Makefile | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) -- 2.17.1 diff --git a/Makefile b/Makefile index 706ca0d633df..e60c09d57b30 100644 --- a/Makefile +++ b/Makefile @@ -1016,6 +1016,8 @@ vmlinux-alldirs := $(sort $(vmlinux-dirs) Documentation \ $(patsubst %/,%,$(filter %/, $(init-) $(core-) \ $(drivers-) $(net-) $(libs-) $(virt-)))) +build-dirs := $(vmlinux-dirs) + init-y := $(patsubst %/, %/built-in.a, $(init-y)) core-y := $(patsubst %/, %/built-in.a, $(core-y)) drivers-y := $(patsubst %/, %/built-in.a, $(drivers-y)) @@ -1038,7 +1040,7 @@ vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIBS) # Recurse until adjust_autoksyms.sh is satisfied PHONY += autoksyms_recursive ifdef CONFIG_TRIM_UNUSED_KSYMS -autoksyms_recursive: $(vmlinux-deps) modules.order +autoksyms_recursive: descend modules.order $(Q)$(CONFIG_SHELL) $(srctree)/scripts/adjust_autoksyms.sh \ "$(MAKE) -f $(srctree)/Makefile vmlinux" endif @@ -1070,17 +1072,7 @@ targets := vmlinux # The actual objects are generated when descending, # make sure no implicit rule kicks in -$(sort $(vmlinux-deps)): $(vmlinux-dirs) ; - -# Handle descending into subdirectories listed in $(vmlinux-dirs) -# Preset locale variables to speed up the build process. Limit locale -# tweaks to this spot to avoid wrong language settings when running -# make menuconfig etc. -# Error messages still appears in the original language - -PHONY += $(vmlinux-dirs) -$(vmlinux-dirs): prepare - $(Q)$(MAKE) $(build)=$@ need-builtin=1 need-modorder=1 +$(sort $(vmlinux-deps)): descend ; filechk_kernel.release = \ echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))" @@ -1302,13 +1294,13 @@ modules: $(if $(KBUILD_BUILTIN),vmlinux) modules.order modules.builtin $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost $(Q)$(CONFIG_SHELL) $(srctree)/scripts/modules-check.sh -modules.order: $(vmlinux-dirs) - $(Q)$(AWK) '!x[$$0]++' $(addsuffix /$@, $(vmlinux-dirs)) > $@ +modules.order: descend + $(Q)$(AWK) '!x[$$0]++' $(addsuffix /$@, $(build-dirs)) > $@ -modbuiltin-dirs := $(addprefix _modbuiltin_, $(vmlinux-dirs)) +modbuiltin-dirs := $(addprefix _modbuiltin_, $(build-dirs)) modules.builtin: $(modbuiltin-dirs) - $(Q)$(AWK) '!x[$$0]++' $(addsuffix /$@, $(vmlinux-dirs)) > $@ + $(Q)$(AWK) '!x[$$0]++' $(addsuffix /$@, $(build-dirs)) > $@ PHONY += $(modbuiltin-dirs) # tristate.conf is not included from this Makefile. Add it as a prerequisite @@ -1618,12 +1610,9 @@ $(objtree)/Module.symvers: echo " is missing; modules will have no dependencies and modversions."; \ echo ) -module-dirs := $(addprefix _module_,$(KBUILD_EXTMOD)) -PHONY += $(module-dirs) modules -$(module-dirs): prepare - $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@) need-modorder=1 - -modules: $(module-dirs) $(objtree)/Module.symvers +build-dirs := $(KBUILD_EXTMOD) +PHONY += modules +modules: descend $(objtree)/Module.symvers @$(kecho) ' Building modules, stage 2.'; $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost @@ -1665,6 +1654,16 @@ help: PHONY += prepare endif # KBUILD_EXTMOD +# Handle descending into subdirectories listed in $(build-dirs) +# Preset locale variables to speed up the build process. Limit locale +# tweaks to this spot to avoid wrong language settings when running +# make menuconfig etc. +# Error messages still appears in the original language +PHONY += descend $(build-dirs) +descend: $(build-dirs) +$(build-dirs): prepare + $(Q)$(MAKE) $(build)=$@ need-builtin=1 need-modorder=1 + clean: $(clean-dirs) $(call cmd,rmdirs) $(call cmd,rmfiles) From patchwork Sat Aug 10 15:53:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 171029 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp696731ily; Sat, 10 Aug 2019 08:55:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqzZJRvcBKL8XC4htSQn0aLWkky/49yhgf3Tq3sYVJVqowpwWZVKlyz6qxRaFsKaLJAYW7iy X-Received: by 2002:a62:87c8:: with SMTP id i191mr27589577pfe.133.1565452509000; Sat, 10 Aug 2019 08:55:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565452508; cv=none; d=google.com; s=arc-20160816; b=lTZkUZrCv/+nzkcXh+Dxr5tjMbVCdRDjeGRw0QYF9jt3wD3tc8OVHS7suKrTJ+GZEd Bo1oFVo0vWFfNqsS7guXNJOQOQVUeb/rRs4Ri+sPxJo4WmsliLGtOwdCKB2p4UG4BIjk mGLwON5h+kFiv/o9Ing18JTIf7TtiaT6JqRxQ1cTIrOhmVSusT8vIOjtKDF6n/hc611C /GZlvq7Y17Evk1bBSumv/5pfPLcJ4HmjTEF2JT6Cv5c+9bt/4TZMlCP3nqc8RbGqfR3d d6R7o07gjBzPXwHYyfhZjWTENDhF/DAwEBnzg1Hz7uZzKeRTYhmm+EGDYQrtIDG0Zv5E UzYg== 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=3uihMbIv8Nur7ulPukTwG5sn3YtGF2A6GIOehwU06DM=; b=QrIaGMKkbecjbuwu9oxv5TiX45o/rLLxFWJ84DmgFqjGSsVhjSt3zWG4YqO8IVckXq KfmEjmIjGX47eYSAYpfwn4MxdashPJLAzFIECDLLY750B6p9hhLFT13J0HQh64jAYEoJ J0t4h2l6zLzBv+1yFLdQOjUme21yJPBuZZ/DwOU0aGwuAH/1pN5g0lQ7wH0AKXVbO/wv wvQila6GZdd+UdYZGhP3uDYfa87P3GY4L+ApK5NiwJ0/yvQnad+c5XHO3PoTD2BBE5fZ 6mOpdcgjz0exZ7VFzqSzdtU3p3Wz9roGeZSV0W4pH1w8f3gDVVizXgjkgBebU05Gcud5 awLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=g5RJmpth; 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 i8si21157224pfr.97.2019.08.10.08.55.08; Sat, 10 Aug 2019 08:55:08 -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=g5RJmpth; 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 S1726587AbfHJPzH (ORCPT + 28 others); Sat, 10 Aug 2019 11:55:07 -0400 Received: from conuserg-11.nifty.com ([210.131.2.78]:34502 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726382AbfHJPyn (ORCPT ); Sat, 10 Aug 2019 11:54:43 -0400 Received: from grover.flets-west.jp (softbank126125143222.bbtec.net [126.125.143.222]) (authenticated) by conuserg-11.nifty.com with ESMTP id x7AFrG94009713; Sun, 11 Aug 2019 00:53:24 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com x7AFrG94009713 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1565452405; bh=3uihMbIv8Nur7ulPukTwG5sn3YtGF2A6GIOehwU06DM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g5RJmpthjrYY+ky7lYOx1qHnu5iZqFYdq8HYzF1KXWIrkPurQDacurfHc4bcYuzx9 EnN7Yo/U2d0lwRIbhM43uLI/KY5WXfco3rB2D2CUng+D3Y8T79Vkewd2JmSHk1xva9 cqyND8OD1R8eFpskfxH/6buVX9BI2UAH37pIpB61O/noYv6KBg0QcDTX2NMkHfple5 P0bdFsuHqBTww/xxL7bQIG/WV9oJc66A/x8Y/PnP1bwQ+z/+ZD6eyiSODOH0Z6bE3G kNAR4jNoi/YVL9MJ2FfP33qibLLlxjNGqQG4o0N8wXLJc6gZikqYJQQeeg8+/sAbJd 5FWCl/e4gJ41A== X-Nifty-SrcIP: [126.125.143.222] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Christoph Hellwig , Sam Ravnborg , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 09/11] kbuild: unify clean-dirs rule for in-kernel and external module Date: Sun, 11 Aug 2019 00:53:05 +0900 Message-Id: <20190810155307.29322-10-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190810155307.29322-1-yamada.masahiro@socionext.com> References: <20190810155307.29322-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Factor out the duplicated code for in-kernel and external module cleaning. Signed-off-by: Masahiro Yamada --- Makefile | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) -- 2.17.1 diff --git a/Makefile b/Makefile index e60c09d57b30..871c42e241a6 100644 --- a/Makefile +++ b/Makefile @@ -1017,6 +1017,7 @@ vmlinux-alldirs := $(sort $(vmlinux-dirs) Documentation \ $(drivers-) $(net-) $(libs-) $(virt-)))) build-dirs := $(vmlinux-dirs) +clean-dirs := $(vmlinux-alldirs) init-y := $(patsubst %/, %/built-in.a, $(init-y)) core-y := $(patsubst %/, %/built-in.a, $(core-y)) @@ -1388,11 +1389,8 @@ DISTCLEAN_FILES += tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS # clean: rm-dirs := $(CLEAN_DIRS) clean: rm-files := $(CLEAN_FILES) -clean-dirs := $(addprefix _clean_, $(vmlinux-alldirs)) -PHONY += $(clean-dirs) clean archclean vmlinuxclean -$(clean-dirs): - $(Q)$(MAKE) $(clean)=$(patsubst _clean_%,%,$@) +PHONY += archclean vmlinuxclean vmlinuxclean: $(Q)$(CONFIG_SHELL) $(srctree)/scripts/link-vmlinux.sh clean @@ -1629,12 +1627,7 @@ PHONY += _emodinst_post _emodinst_post: _emodinst_ $(call cmd,depmod) -clean-dirs := $(addprefix _clean_,$(KBUILD_EXTMOD)) - -PHONY += $(clean-dirs) clean -$(clean-dirs): - $(Q)$(MAKE) $(clean)=$(patsubst _clean_%,%,$@) - +clean-dirs := $(KBUILD_EXTMOD) clean: rm-files := $(KBUILD_EXTMOD)/Module.symvers PHONY += / @@ -1664,6 +1657,11 @@ descend: $(build-dirs) $(build-dirs): prepare $(Q)$(MAKE) $(build)=$@ need-builtin=1 need-modorder=1 +clean-dirs := $(addprefix _clean_, $(clean-dirs)) +PHONY += $(clean-dirs) clean +$(clean-dirs): + $(Q)$(MAKE) $(clean)=$(patsubst _clean_%,%,$@) + clean: $(clean-dirs) $(call cmd,rmdirs) $(call cmd,rmfiles) From patchwork Sat Aug 10 15:53:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 171027 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp696536ily; Sat, 10 Aug 2019 08:54:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqz9jRbSy3vNMp8MY6z236YCe/ZXG0KVKeMTTwRDffODOYI5da53pG2IXS3UMeKFFziyBFgR X-Received: by 2002:a63:d852:: with SMTP id k18mr22777141pgj.313.1565452496872; Sat, 10 Aug 2019 08:54:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565452496; cv=none; d=google.com; s=arc-20160816; b=xbChV1Yfk9M702bQOnw5HOU1P9f69VJt6NWeWmqNpUW24Q/7qIh/arrk166DsLfaF/ kuMbcZUKIoFG0ft7lxNxFeqeRgitFm7fJhu6cLnTJuNfFHfS7NqsyQb7I6ZWhVUPLXah h8dZrLhiiWc6WJAerfL2Y3y/G6xJKo6q9uFbcq/bE7nqAb5/MmJ4FWKltHIoafzaktww yFw+4vZK50uM8AMi87IvZQcp7S/F7rPF6ZNtxqklSKq2igykUY9QKLFFnZ1N5X+rsfaB 36iXMYjyQO59DuxrBsXXkZqbr4dUgkcY6FWSqdRyQUddUG5gK9dylc8Fh6aqbvJaZ2P6 nX0A== 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=qS+P/ibLQ0sheOeZAc1s4upbPk0gu28oqYlYYjT4VJM=; b=DBwEzaby/PvU46ap141iCKLd5lHQweU3lgLEtcR4yuY4T0JKEyw/aDhVBioqSNU8IJ jVFiGluN9nahR4VBcBxmh9Q+f296UYJSdVUhdapNfF/evEaGVthKjaQ8Qd3y9ywqBH+Y bozXOEQPIHGut5puoxhQklVOd7lsDyb+7arK9Bg3cMQz1WH4LtMYLU8NlixEd0GLriID RGPURvQGeqUU9JNWVylAaZYkDuH1JhE3zVfE10VXIeEpTuLc8buQbKuos36+ig0Xz7WI Y8AVDmR5jrVXQV6ndBUTuWVPU6xY6tGXxb/qM40Zua22JjPMtic0bAvaJHv43NAeC+62 0B0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=fanYygGi; 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 z9si7081933pju.2.2019.08.10.08.54.56; Sat, 10 Aug 2019 08:54:56 -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=fanYygGi; 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 S1726541AbfHJPyz (ORCPT + 28 others); Sat, 10 Aug 2019 11:54:55 -0400 Received: from conuserg-11.nifty.com ([210.131.2.78]:34513 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726406AbfHJPyn (ORCPT ); Sat, 10 Aug 2019 11:54:43 -0400 Received: from grover.flets-west.jp (softbank126125143222.bbtec.net [126.125.143.222]) (authenticated) by conuserg-11.nifty.com with ESMTP id x7AFrG95009713; Sun, 11 Aug 2019 00:53:25 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com x7AFrG95009713 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1565452406; bh=qS+P/ibLQ0sheOeZAc1s4upbPk0gu28oqYlYYjT4VJM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fanYygGikJALb5huRJzb2Di/VMObZ6ujWfvg5b82Q443DsojCJgWXgAoGFygyQxk/ 18CfrNytekHGxenX8R9aBjyrU0hDR7BVGiEyytK+EuSU/Wp3R8KJt3Hqn+ERvGTe3h xKeDgjIqsAzAEeww/Ze1BrC6g8oIhVri1e6fyOf57Sel2juWwG1vL6lutZTOzQsWP7 fi/iXiTG4fxYvMJBZIeEaEEUeBF0hTSsh79iwaIbYJoM2giChcmvZUThmPoWndzFZ5 PqNvBNOp53uZ9f9JcPGsAZYSbS4ybOsID82/KAoZ7SZ0W72Umn9jfmvLv6sJYzk79d Te9vc+4nPcnkQ== X-Nifty-SrcIP: [126.125.143.222] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Christoph Hellwig , Sam Ravnborg , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 10/11] kbuild: make single targets work more correctly Date: Sun, 11 Aug 2019 00:53:06 +0900 Message-Id: <20190810155307.29322-11-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190810155307.29322-1-yamada.masahiro@socionext.com> References: <20190810155307.29322-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, the single target build directly descends into the directory of the target. For example, $ make foo/bar/baz.o ... directly descends into foo/bar/. On the other hand, the normal build usually descends one directory at a time, i.e. descends into foo/, and then foo/bar/. This difference causes some problems. [1] miss subdir-asflags-y, subdir-ccflags-y in upper Makefiles The options in subdir-{as,cc}flags-y take effect in the current and its sub-directories. In other words, they are inherited downward. In the example above, the single target will miss subdir-{as,cc}flags-y if they are defined in foo/Makefile. [2] could be built in a different directory As Documentation/kbuild/modules.rst section 4.3 says, Kbuild can handle files that are spread over several sub-directories. The build rule of foo/bar/baz.o may not necessarily be specified in foo/bar/Makefile. It might be specifies in foo/Makefile as follows: [foo/Makefile] obj-y := bar/baz.o This often happens when a module is so big that its source files are divided into sub-directories. In this case, there is no Makefile in the foo/bar/ level, yet the single target descends into foo/bar/, then fails due to the missing Makefile. You can still do 'make foo/bar/' for partial building, but cannot do 'make foo/bar/baz.s'. I beleive the single target '%.s' is a useful feature for inspecting the compiler output. Some modules work around this issue by putting an empty Makefile in every sub-directory. This commit fixes those issues by letting the single target build descend in the same way as the normal build does. Another change is the single target build now will observe the CONFIG options. Previously, it allowed users to build the foo.o even when the corresponding CONFIG_FOO is disabled: obj-$(CONFIG_FOO) += foo.o In the new behavior, the single target build will just fail and show "No rule to make target ..." (or "Nothing to be done for ..." if the stale object already exists, but cannot be updated). The disadvantage of this commit is the build speed. Now that the single target build visits every directory and parses lots of Makefiles, it is slower than before. (But, I hope it will not be too slow.) Signed-off-by: Masahiro Yamada --- Makefile | 83 +++++++++++++++++++++++++++--------------- scripts/Makefile.build | 45 ++++++++++++++++++++--- 2 files changed, 92 insertions(+), 36 deletions(-) -- 2.17.1 diff --git a/Makefile b/Makefile index 871c42e241a6..a93d6f6b996a 100644 --- a/Makefile +++ b/Makefile @@ -271,11 +271,16 @@ no-dot-config-targets := $(clean-targets) \ %asm-generic kernelversion %src-pkg no-sync-config-targets := $(no-dot-config-targets) install %install \ kernelrelease +single-targets := %.a %.i %.ko %.lds %.lst %.mod %o %.s %.symtypes %/ +ifdef CONFIG_CC_IS_CLANG +single-targets += %.ll +endif config-build := mixed-build := need-config := 1 may-sync-config := 1 +single-build := ifneq ($(filter $(no-dot-config-targets), $(MAKECMDGOALS)),) ifeq ($(filter-out $(no-dot-config-targets), $(MAKECMDGOALS)),) @@ -302,6 +307,14 @@ ifeq ($(KBUILD_EXTMOD),) endif endif +# We cannot build single targets and the others at the same time +ifneq ($(filter $(single-targets), $(MAKECMDGOALS)),) + single-build := 1 + ifneq ($(filter-out $(single-targets), $(MAKECMDGOALS)),) + mixed-build := 1 + endif +endif + # For "make -j clean all", "make -j mrproper defconfig all", etc. ifneq ($(filter $(clean-targets),$(MAKECMDGOALS)),) ifneq ($(filter-out $(clean-targets),$(MAKECMDGOALS)),) @@ -1655,7 +1668,7 @@ endif # KBUILD_EXTMOD PHONY += descend $(build-dirs) descend: $(build-dirs) $(build-dirs): prepare - $(Q)$(MAKE) $(build)=$@ need-builtin=1 need-modorder=1 + $(Q)$(MAKE) $(build)=$@ single-build=$(single-build) need-builtin=1 need-modorder=1 clean-dirs := $(addprefix _clean_, $(clean-dirs)) PHONY += $(clean-dirs) clean @@ -1752,40 +1765,50 @@ tools/%: FORCE # Single targets # --------------------------------------------------------------------------- -# Single targets are compatible with: -# - build with mixed source and output -# - build with separate output dir 'make O=...' -# - external modules +# To build individual files in subdirectories, you can do like this: +# +# make foo/bar/baz.s # -# target-dir => where to store outputfile -# build-dir => directory in kernel source tree to use - -build-target = $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD)/)$@ -build-dir = $(patsubst %/,%,$(dir $(build-target))) - -%.i: prepare FORCE - $(Q)$(MAKE) $(build)=$(build-dir) $(build-target) -%.ll: prepare FORCE - $(Q)$(MAKE) $(build)=$(build-dir) $(build-target) -%.lst: prepare FORCE - $(Q)$(MAKE) $(build)=$(build-dir) $(build-target) -%.o: prepare FORCE - $(Q)$(MAKE) $(build)=$(build-dir) $(build-target) -%.s: prepare FORCE - $(Q)$(MAKE) $(build)=$(build-dir) $(build-target) -%.symtypes: prepare FORCE - $(Q)$(MAKE) $(build)=$(build-dir) $(build-target) +# The supported suffixes for single-target are listed in 'single-targets' +# +# To build only under specific subdirectories, you can do like this: +# +# make foo/bar/baz/ + +ifdef single-build + +single-all := $(filter $(single-targets), $(MAKECMDGOALS)) + ifeq ($(KBUILD_EXTMOD),) -# For the single build of an in-tree module, use a temporary file to avoid +# For the single build of in-tree modules, use a temporary file to avoid # the situation of modules_install installing an invalid modules.order. -%.ko: MODORDER := .modules.tmp +MODORDER := .modules.tmp +else +single-all := $(addprefix $(KBUILD_EXTMOD)/, $(single-all))) endif -%.ko: prepare FORCE - $(Q)$(MAKE) $(build)=$(build-dir) $(build-target:.ko=.mod) - $(Q)echo $(build-target) > $(MODORDER) + +# .ko is special because modpost is needed +single-ko := $(sort $(filter %.ko, $(single-all))) +single-non-ko := $(sort $(patsubst %.ko,%.mod, $(single-all))) + +$(single-ko): single_modpost + @: + +PHONY += single_modpost +single_modpost: $(single-non-ko) + $(Q){ $(foreach m, $(single-ko), echo $m;) } > $(MODORDER) $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost -%/: prepare FORCE - $(Q)$(MAKE) KBUILD_MODULES=1 $(build)=$(build-dir) need-modorder=1 + +KBUILD_MODULES := 1 + +$(single-non-ko): descend + @: + +export KBUILD_SINGLE_TARGETS := $(single-non-ko) + +single-build = $(if $(filter-out $@/, $(single-non-ko)),1) + +endif # FIXME Should go into a make.lib or something # =========================================================================== diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 3633558f7861..5e58db1d01b2 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -52,7 +52,7 @@ ifndef obj $(warning kbuild: Makefile.build is included improperly) endif -ifeq ($(MAKECMDGOALS)$(need-modorder),) +ifeq ($(need-modorder),) ifneq ($(obj-m),) $(warning $(patsubst %.o,'%.ko',$(obj-m)) will not be built even though obj-m is specified.) $(warning You cannot use subdir-y/m to visit a module Makefile. Use obj-y/m instead.) @@ -76,11 +76,6 @@ endif mod-targets := $(patsubst %.o, %.mod, $(obj-m)) -__build: $(if $(KBUILD_BUILTIN),$(builtin-target) $(lib-target) $(extra-y)) \ - $(if $(KBUILD_MODULES),$(obj-m) $(mod-targets) $(modorder-target)) \ - $(subdir-ym) $(always) - @: - # Linus' kernel sanity checking tool ifeq ($(KBUILD_CHECKSRC),1) quiet_cmd_checksrc = CHECK $< @@ -487,12 +482,50 @@ targets += $(call intermediate_targets, .asn1.o, .asn1.c .asn1.h) \ $(call intermediate_targets, .lex.o, .lex.c) \ $(call intermediate_targets, .tab.o, .tab.c .tab.h) +# Build +# --------------------------------------------------------------------------- + +ifdef single-build + +curdir-single := $(sort $(foreach x, $(KBUILD_SINGLE_TARGETS), \ + $(if $(filter $(x) $(basename $(x)).o, $(targets)), $(x)))) + +# Handle single targets without any rule: show "Nothing to be done for ..." or +# "No rule to make target ..." depending on whether the target exists. +unknown-single := $(filter-out $(addsuffix /%, $(subdir-ym)), \ + $(filter $(obj)/%, \ + $(filter-out $(curdir-single), \ + $(KBUILD_SINGLE_TARGETS)))) + +__build: $(curdir-single) $(subdir-ym) +ifneq ($(unknown-single),) + $(Q)$(MAKE) -f /dev/null $(unknown-single) +endif + @: + +ifeq ($(curdir-single),) +# Nothing to do in this directory. Do not include any .*.cmd file for speed-up +targets := +else +targets += $(curdir-single) +endif + +else + +__build: $(if $(KBUILD_BUILTIN),$(builtin-target) $(lib-target) $(extra-y)) \ + $(if $(KBUILD_MODULES),$(obj-m) $(mod-targets) $(modorder-target)) \ + $(subdir-ym) $(always) + @: + +endif + # Descending # --------------------------------------------------------------------------- PHONY += $(subdir-ym) $(subdir-ym): $(Q)$(MAKE) $(build)=$@ \ + $(if $(filter $@/, $(KBUILD_SINGLE_TARGETS)),single-build=) \ need-builtin=$(if $(filter $@/built-in.a, $(subdir-obj-y)),1) \ need-modorder=$(if $(need-modorder),$(if $(filter $@/modules.order, $(modorder)),1)) From patchwork Sat Aug 10 15:53:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 171031 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp697503ily; Sat, 10 Aug 2019 08:55:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqwcKgUydLDa2E+mS60essQ4umrTmS9zXKpbG6GhI719cp8yFHhrhYqFgz/Kydvdys5jp8m1 X-Received: by 2002:a17:90a:d3d4:: with SMTP id d20mr15585057pjw.28.1565452556073; Sat, 10 Aug 2019 08:55:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565452556; cv=none; d=google.com; s=arc-20160816; b=Jt26eTm3yvpTz7uNcVYEa8JcS8Ij1OU+uNC/5Bo9Ikg7hXjb24G4D62G9zS4FI3bQ0 SwWq8o2BKuGbiofSYGF0wZFRQ0lbzaeLbasI3j6+1bJkYLR/zq7cGZDCdOfKdwmWj+6x 1ectdP8JyYhCIyjIIHZrThyaD/nz5Wo87L/BSHnzWu61qpI0zERVL0Zu0NNagcoLWIVv tNTvlpS6VjS5jQJzyvJ+GNbzv9gu8UYvRpggcUHWqMgfy7LcAj3avN5OySLzofYpdp5Y SwNeD4/ahUpnzIT+Y2H1KevZMqzaRZ3w5TvheJ2MxZPXcuAXPcawsl3aAiHpzoxx7xjn H18w== 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=jmtnAlp5r/W1VjpdNwYulBR6vPbBBKflh9Un7xceSbI=; b=e6y5IKrY3nFCvPZg7AmJlrMJqOsAay0k3dR90XSeJCwApFS3JltnWqd7E0sy3RW1UK IT/7SL85UIbWtQyIMwgr3PM+o9xQ6yCoNjsLezQnfindEw1m25dwH85hjIRCyOXFf+bD 7jt+TePOR6K3PAlU3fNrk//UKT3Z2A/MqiPNvhZNBT/eDXkukEkmeMYhp7cdwnOk96bk b6jYGxYKOV4NFhrUVvgsEhbuv7uXl1I/W0rRq57d4mR7ZEXebcBwVNgHTP5FiPZBEoKP swvR+HB2esEIlwBcFNRYqJLbmByQPspDFlBkUsvG4JeSVg1yhcf+pv08nrJJTrEVuYm+ RCew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b="Jzfo/uJj"; 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 f9si15972708pgm.59.2019.08.10.08.55.55; Sat, 10 Aug 2019 08:55:56 -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="Jzfo/uJj"; 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 S1726622AbfHJPzy (ORCPT + 28 others); Sat, 10 Aug 2019 11:55:54 -0400 Received: from conuserg-11.nifty.com ([210.131.2.78]:35857 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726210AbfHJPzx (ORCPT ); Sat, 10 Aug 2019 11:55:53 -0400 Received: from grover.flets-west.jp (softbank126125143222.bbtec.net [126.125.143.222]) (authenticated) by conuserg-11.nifty.com with ESMTP id x7AFrG96009713; Sun, 11 Aug 2019 00:53:26 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com x7AFrG96009713 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1565452407; bh=jmtnAlp5r/W1VjpdNwYulBR6vPbBBKflh9Un7xceSbI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jzfo/uJj4NDRwhMy9Cn70CvntcZFbN6G6bFTZlu8kAYtHICAFeeYFz4NS04n8DNNu rJ+kowmP2XYeu+aeeYvcbvpoU93G2NaNNmIQdsgic1q3dyblTr6LYyDVM8JOS8aexK OXtIvT8XwRBsdpf3REmEBZLVzPtzIiUN62DPDzyt1hE6pDblo9pcPtgiUs9dt4uK20 ksK7dunb1OxclzbzrtP5gfNdMkNRoM6b2X0FU+5wybzF5Ah/xX55Iu0F5q9xojCLq6 wwHzoWU6Im4BsdX2MgcOgp/ik9Nl5yt/qWvcv4tUfk2by7i59R90blvFjyqWOJCxST /kpvVLZUdCcPg== X-Nifty-SrcIP: [126.125.143.222] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Christoph Hellwig , Sam Ravnborg , Masahiro Yamada , Alexei Starovoitov , Boris Pismenny , Daniel Borkmann , "David S. Miller" , Igor Russkikh , Jakub Kicinski , Leon Romanovsky , Martin KaFai Lau , Saeed Mahameed , Song Liu , Yonghong Song , bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, netdev@vger.kernel.org, oss-drivers@netronome.com Subject: [PATCH 11/11] treewide: remove dummy Makefiles for single targets Date: Sun, 11 Aug 2019 00:53:07 +0900 Message-Id: <20190810155307.29322-12-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190810155307.29322-1-yamada.masahiro@socionext.com> References: <20190810155307.29322-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that the single target build descends into sub-directories in the same ways as the normal build, these dummy Makefiles are not needed any more. Signed-off-by: Masahiro Yamada --- drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile | 2 -- drivers/net/ethernet/mellanox/mlx5/core/accel/Makefile | 2 -- drivers/net/ethernet/mellanox/mlx5/core/diag/Makefile | 2 -- drivers/net/ethernet/mellanox/mlx5/core/en/Makefile | 2 -- drivers/net/ethernet/mellanox/mlx5/core/en/xsk/Makefile | 1 - drivers/net/ethernet/mellanox/mlx5/core/en_accel/Makefile | 2 -- drivers/net/ethernet/mellanox/mlx5/core/fpga/Makefile | 2 -- drivers/net/ethernet/mellanox/mlx5/core/ipoib/Makefile | 2 -- drivers/net/ethernet/mellanox/mlx5/core/lib/Makefile | 2 -- drivers/net/ethernet/netronome/nfp/bpf/Makefile | 2 -- drivers/net/ethernet/netronome/nfp/flower/Makefile | 2 -- drivers/net/ethernet/netronome/nfp/nfpcore/Makefile | 2 -- drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/Makefile | 2 -- drivers/net/ethernet/netronome/nfp/nic/Makefile | 2 -- 14 files changed, 27 deletions(-) delete mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/Makefile delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/diag/Makefile delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/Makefile delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/xsk/Makefile delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/Makefile delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/Makefile delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/ipoib/Makefile delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/Makefile delete mode 100644 drivers/net/ethernet/netronome/nfp/bpf/Makefile delete mode 100644 drivers/net/ethernet/netronome/nfp/flower/Makefile delete mode 100644 drivers/net/ethernet/netronome/nfp/nfpcore/Makefile delete mode 100644 drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/Makefile delete mode 100644 drivers/net/ethernet/netronome/nfp/nic/Makefile -- 2.17.1 diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile b/drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile deleted file mode 100644 index 805fa28f391a..000000000000 --- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# kbuild requires Makefile in a directory to build individual objects diff --git a/drivers/net/ethernet/mellanox/mlx5/core/accel/Makefile b/drivers/net/ethernet/mellanox/mlx5/core/accel/Makefile deleted file mode 100644 index c78512eed8d7..000000000000 --- a/drivers/net/ethernet/mellanox/mlx5/core/accel/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -subdir-ccflags-y += -I$(src)/.. diff --git a/drivers/net/ethernet/mellanox/mlx5/core/diag/Makefile b/drivers/net/ethernet/mellanox/mlx5/core/diag/Makefile deleted file mode 100644 index c78512eed8d7..000000000000 --- a/drivers/net/ethernet/mellanox/mlx5/core/diag/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -subdir-ccflags-y += -I$(src)/.. diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/Makefile b/drivers/net/ethernet/mellanox/mlx5/core/en/Makefile deleted file mode 100644 index c78512eed8d7..000000000000 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -subdir-ccflags-y += -I$(src)/.. diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/Makefile b/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/Makefile deleted file mode 100644 index 5ee42991900a..000000000000 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/Makefile +++ /dev/null @@ -1 +0,0 @@ -subdir-ccflags-y += -I$(src)/../.. diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/Makefile b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/Makefile deleted file mode 100644 index c78512eed8d7..000000000000 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -subdir-ccflags-y += -I$(src)/.. diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fpga/Makefile b/drivers/net/ethernet/mellanox/mlx5/core/fpga/Makefile deleted file mode 100644 index c78512eed8d7..000000000000 --- a/drivers/net/ethernet/mellanox/mlx5/core/fpga/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -subdir-ccflags-y += -I$(src)/.. diff --git a/drivers/net/ethernet/mellanox/mlx5/core/ipoib/Makefile b/drivers/net/ethernet/mellanox/mlx5/core/ipoib/Makefile deleted file mode 100644 index c78512eed8d7..000000000000 --- a/drivers/net/ethernet/mellanox/mlx5/core/ipoib/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -subdir-ccflags-y += -I$(src)/.. diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/Makefile b/drivers/net/ethernet/mellanox/mlx5/core/lib/Makefile deleted file mode 100644 index c78512eed8d7..000000000000 --- a/drivers/net/ethernet/mellanox/mlx5/core/lib/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -subdir-ccflags-y += -I$(src)/.. diff --git a/drivers/net/ethernet/netronome/nfp/bpf/Makefile b/drivers/net/ethernet/netronome/nfp/bpf/Makefile deleted file mode 100644 index 805fa28f391a..000000000000 --- a/drivers/net/ethernet/netronome/nfp/bpf/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# kbuild requires Makefile in a directory to build individual objects diff --git a/drivers/net/ethernet/netronome/nfp/flower/Makefile b/drivers/net/ethernet/netronome/nfp/flower/Makefile deleted file mode 100644 index 805fa28f391a..000000000000 --- a/drivers/net/ethernet/netronome/nfp/flower/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# kbuild requires Makefile in a directory to build individual objects diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/Makefile b/drivers/net/ethernet/netronome/nfp/nfpcore/Makefile deleted file mode 100644 index 805fa28f391a..000000000000 --- a/drivers/net/ethernet/netronome/nfp/nfpcore/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# kbuild requires Makefile in a directory to build individual objects diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/Makefile b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/Makefile deleted file mode 100644 index 805fa28f391a..000000000000 --- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# kbuild requires Makefile in a directory to build individual objects diff --git a/drivers/net/ethernet/netronome/nfp/nic/Makefile b/drivers/net/ethernet/netronome/nfp/nic/Makefile deleted file mode 100644 index 805fa28f391a..000000000000 --- a/drivers/net/ethernet/netronome/nfp/nic/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# kbuild requires Makefile in a directory to build individual objects