From patchwork Thu Oct 4 04:25:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 148092 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp459236lji; Wed, 3 Oct 2018 21:25:32 -0700 (PDT) X-Google-Smtp-Source: ACcGV60ndf3dOd//0L5R2NxLqagZvG/7WUrGuKXf9A8xzpPJaui1oAGDm7vmrI1s6rkqSuPW0013 X-Received: by 2002:a62:509a:: with SMTP id g26-v6mr4745657pfj.62.1538627132632; Wed, 03 Oct 2018 21:25:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538627132; cv=none; d=google.com; s=arc-20160816; b=S3lG/EbLXczCCLnc+AxOGo3F0iSzZLPqO/EJQV2GP8ZDWZt7QbwlDHPveA4Sk8ilCt cRAdb9HYfDSwfCrr+1AONGN4bRVaua1nHZFm9A/EyJxo85A4D0F98WCSyIEdOX6U5LnB Cnc9Fe7VIqhBZ7cQ4ZVBvzF8rBaCx02eEKCQQ8Q1BYv7ao/kcSSzTWr0oKU+VyeqEoR0 2dtqwbpLDAIWZzmeT8p+mpCtIVrpUJZnwHlKbpKDtji+jNIBJVNr0CU9ThE5YyAVmCWY ziQfy5yPNuKLi//Xd//gvBCOkEYYz6xd8y+fr71C0rnbCJ19c/EdNfr6APuMdKTBDxBM nlcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=Tu5EgNC+a2nzWof8zRD+kOXG3bSs+w0fmQrPdRjIFSc=; b=uQyONOIdcCOaK7Dl9otLMA1A1F6LzFtPUeubjZPkUmMctY+VUDQQpKDD6c8UKgJ3f5 z38oYWY0I5Z7NePass+xP6iyBdCnA6q1FtrvktQhVI1HWUZXRX2gXP30MHrecudGrwW1 hqPyOJqW5Lk6ySbC/i6mN+0oyPWzbV1v3uzwPDLoa3a1FO8iBPvKyeNsHIVT7Xg5AegP b2W4wiazH/mUhGp5LSNFBhyhwzas516SUFSGnv8uBOiD9nA1J2PKYH51/L1xk6mOv43a y9McBEsPQlv5ZfI/hf7vL6fRRnm1bkVR1rw5LbXvcXac2HbKw8G6MknvfFh/kmmPaTKF bBvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=2J5LnYnC; 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 15-v6si3846209pfr.242.2018.10.03.21.25.32; Wed, 03 Oct 2018 21:25:32 -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=2J5LnYnC; 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 S1727188AbeJDLQv (ORCPT + 32 others); Thu, 4 Oct 2018 07:16:51 -0400 Received: from conuserg-11.nifty.com ([210.131.2.78]:34180 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726661AbeJDLQu (ORCPT ); Thu, 4 Oct 2018 07:16:50 -0400 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 w944PPWW030457; Thu, 4 Oct 2018 13:25:25 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com w944PPWW030457 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1538627125; bh=Tu5EgNC+a2nzWof8zRD+kOXG3bSs+w0fmQrPdRjIFSc=; h=From:To:Cc:Subject:Date:From; b=2J5LnYnCNn9twb2YKBZBKOdTiyNCFuYko3MqdQGx2C2mOZG9HVcUFgHtmFZCyrdnK FuU7SCNQQMjCj0YAYCv+H6X9JIS/YZm5mLLR3pLuJVYt9aTD5y5T4TdPsuMEzsuLqW wrqoFd+ooiiUXL8jjZgfUFo443As0XECdZ1DMQXelW9zn/yMQV3vvjWynaRVNHo2mj AnIPLhUhtP0Xm19UTJ0gHuokiurfwN+uKEcYdhqlBu6Z2twFdNqRQYGuBl8er8QZFR 81URaqcrJwoHQj/6dZ6bAvKzAel4YqQ9FAbbMgeGOeltIPZycyTvPu1BUr50buIe9K /gDFIw4McozRw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH v2] kbuild: remove unneeded link_multi_deps Date: Thu, 4 Oct 2018 13:25:19 +0900 Message-Id: <1538627119-11346-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since commit c8589d1e9e01 ("kbuild: handle multi-objs dependency appropriately"), $^ really represents all the prerequisite of the composite object being built. Hence, $(filter %.o,$^) contains all the objects to link together, which is much simpler than link_multi_deps calculation. Please note $(filter-out FORCE,$^) does not work here. When a single object module is turned into a multi object module, $^ will contain header files that were previously included for building the single object, and recorded in the .*.cmd file. $(filter %.o,$^) should be used to filter out such headers. Signed-off-by: Masahiro Yamada --- Changes in v2: - Fix regression reported in linux-next. https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg1779047.html scripts/Makefile.build | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) -- 2.7.4 diff --git a/scripts/Makefile.build b/scripts/Makefile.build index cb03774..f21b48d 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -485,28 +485,12 @@ targets += $(obj)/lib-ksyms.o endif -# -# Rule to link composite objects -# -# Composite objects are specified in kbuild makefile as follows: -# -objs := -# or -# -y := -# or -# -m := -# The -m syntax only works if is a module -link_multi_deps = \ -$(filter $(addprefix $(obj)/, \ -$($(subst $(obj)/,,$(@:.o=-objs))) \ -$($(subst $(obj)/,,$(@:.o=-y))) \ -$($(subst $(obj)/,,$(@:.o=-m)))), $^) - quiet_cmd_link_multi-m = LD [M] $@ -cmd_link_multi-m = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps) $(cmd_secanalysis) +cmd_link_multi-m = $(LD) $(ld_flags) -r -o $@ $(filter %.o,$^) $(cmd_secanalysis) $(multi-used-m): FORCE $(call if_changed,link_multi-m) - @{ echo $(@:.o=.ko); echo $(link_multi_deps); \ + @{ echo $(@:.o=.ko); echo $(filter %.o,$^); \ $(cmd_undef_syms); } > $(MODVERDIR)/$(@F:.o=.mod) $(call multi_depend, $(multi-used-m), .o, -objs -y -m)