From patchwork Thu Mar 8 01:05:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 130926 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp5854603lja; Wed, 7 Mar 2018 17:06:06 -0800 (PST) X-Google-Smtp-Source: AG47ELsJh0NM/stjXKE91SF22gmM8P3kCan+TxzKDckl9xW1waDfGMKz+4HyWFUGHtEMzq7hhr5o X-Received: by 10.99.127.7 with SMTP id a7mr19735390pgd.52.1520471166771; Wed, 07 Mar 2018 17:06:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520471166; cv=none; d=google.com; s=arc-20160816; b=H4qyMLK39Y5nYtT0vk7DkkxsNacTCbtw82OYO/6N9UXYH2zT9r4oQv94nx6Pdsh/04 Ur9dIKLB9gdSeXrOwLJX8kd0vs52HoqEdfClY9OfceLx2/Zx1M+1aWM1M+W7N/4ckxCV 2cnkE0VpgseHxyyukvxsP4O285RJO00r01qNsMJtXcYKv8JZLPx55TpwgpdO2ZGNJsBA C+fhswGUOjx6BFMkUo8z6+V+Y/lEbrg8INp6lHoDRgAxO0k+sapvTH9dLAZhs/0t/Uhf 3T+bRYK7NCfc5sOcKO1vVQbRjo7lB9YmFvzok87vPzC1OXDpO5PH/Ns3ZDrxpZbcOfQS 03dQ== 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=1ItLNCZ3ARXbpR/5wiSfCQRkwXP5+qyB19iRhxdZH7w=; b=r7o+F5yuTEz43/esh5xA6aVgRVAy7f6EPLXf4VG3t1ngzKeiWR6S45P64TheqGdVNS KxCOUjadWa5xDlsY3GiJFiEh1bzZpS/Lin0pR1468l2d4mzSsN94u4UuwVc1gq/W+2Vr 9K0w1gRZvCWOhawmczctoG23qZSG3IM0ccX8Pxog4CdwoIxildaacquLpPx3NhmapCp9 sBR4temPInHdYiYthZmUGVfof8Os2ZfQECudm2JOAvhxzX26W1l+WjXlflQM99stMbsq 9Jbn8MEvBEAomEPv4KNK3vrcoazkpAlubKY/6iJo0W9jgoa6v0g0HVykgptvejm5xsJb oM0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=JKUi8lYo; 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 k185si12161282pgd.533.2018.03.07.17.06.06; Wed, 07 Mar 2018 17:06:06 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=JKUi8lYo; 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 S1755122AbeCHBGB (ORCPT + 28 others); Wed, 7 Mar 2018 20:06:01 -0500 Received: from conuserg-10.nifty.com ([210.131.2.77]:60401 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755041AbeCHBF4 (ORCPT ); Wed, 7 Mar 2018 20:05:56 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id w28156G8018694; Thu, 8 Mar 2018 10:05:09 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w28156G8018694 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1520471109; bh=1ItLNCZ3ARXbpR/5wiSfCQRkwXP5+qyB19iRhxdZH7w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JKUi8lYooAwfq3ArXmvAPBMR/68pagsvOApw8mTJX3zMYB5ZD1UK4e1TrlLJ04l2f 4G1YhI9aRKek6saG5neAIDdctfCLzGcTdLEScGNh5B1xe58p+r7A2yETxy1zgJf/wD 0RIXG259n8sM5Nc+kXCvddI4kbPch44x62oPuTceBaDKlqS2L+eDWiEwOohpLRp9Nl GG0NedPl7Hk+pNQ2lm3QcjQ9et4TpnfVgFpa81mN+HP1q4vwTZgxAgIBASmqJEpLAt W/4MHS6dbkWGpRvdDM8oCHX1cv03yPkRC4Q8R8kmdFON5RT5PIB+lSkViRcf/fAJUK e/Xtl27rus+ew== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Michal Marek , Cao jin , Govind Singh , Kalle Valo , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 3/5] kbuild: fix modname for composite modules Date: Thu, 8 Mar 2018 10:05:01 +0900 Message-Id: <1520471103-10089-4-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520471103-10089-1-git-send-email-yamada.masahiro@socionext.com> References: <1520471103-10089-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 From: Cao jin Commit cf4f21938e13 ("kbuild: Allow to specify composite modules with modname-m") added modname-m support, but missed to update the corresponding multi-objs-m & modname-multi definition. Signed-off-by: Cao jin Signed-off-by: Masahiro Yamada --- I rebased the previous version: https://patchwork.kernel.org/patch/10055583/ scripts/Makefile.lib | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index a1fbd6a..9217d40 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -50,7 +50,7 @@ single-used-m := $(sort $(filter-out $(multi-used-m),$(obj-m))) # Build list of the parts of our composite objects, our composite # objects depend on those (obviously) multi-objs-y := $(foreach m, $(multi-used-y), $($(m:.o=-objs)) $($(m:.o=-y))) -multi-objs-m := $(foreach m, $(multi-used-m), $($(m:.o=-objs)) $($(m:.o=-y))) +multi-objs-m := $(foreach m, $(multi-used-m), $($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m))) # $(subdir-obj-y) is the list of objects in $(obj-y) which uses dir/ to # tell kbuild to descend @@ -176,7 +176,7 @@ dtc_cpp_flags = -Wp,-MD,$(depfile).pre.tmp -nostdinc \ # If the object belongs to two or more multi-part objects, all of them are # concatenated with a colon separator. modname-multi = $(subst $(space),:,$(sort $(foreach m,$(multi-used),\ - $(if $(filter $*.o, $($(m:.o=-objs)) $($(m:.o=-y))),$(m:.o=))))) + $(if $(filter $*.o, $($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m))),$(m:.o=))))) # Useful for describing the dependency of composite objects # Usage: