From patchwork Mon Mar 19 09:01:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 10291877 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A7237602C2 for ; Mon, 19 Mar 2018 09:02:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8B3B9291CC for ; Mon, 19 Mar 2018 09:02:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 801FE291D3; Mon, 19 Mar 2018 09:02:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A94C4291CC for ; Mon, 19 Mar 2018 09:02:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932426AbeCSJCM (ORCPT ); Mon, 19 Mar 2018 05:02:12 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:49938 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932387AbeCSJCL (ORCPT ); Mon, 19 Mar 2018 05:02:11 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id w2J91Vk7014340; Mon, 19 Mar 2018 18:01:32 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com w2J91Vk7014340 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1521450093; bh=TfBOFH2Z253AvMeYNTDvsYN/I0Ick7ZfDD/TjrKUatc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Epgd0fnQXCly+oAkqg+8UyMpvyPMhb8I7Oxuddh83fXAxI9dRuwZ5WuhehZw0cH4H MPrZxGS9N4OQgbUb8iFqQeci2ZYznG/Uvm0ATTu9YhmIjSkax/8EYgo8ZoZbV1E6q1 EyDO6TFRPfa3KiJaOq2Tebij0ascNC1my/lbYdvcfDwNhZ/lzgJ8COxDZQ5wNznsyG +4vHzIcEqfOlLW9G9h/NpwLGHSesyuE4O0IFlHmAlHirLxRFvKm49axu4EW1rkB/Jl mkuOs3fW6Zd5i+O9ZPe6IYz/CbZsf5b+hrhBoCKETS5M4MPolkoeWfWT8dFKxnMkVX gH21ht6ZFIwAw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Cao jin , linux-kernel@vger.kernel.org, Masahiro Yamada , Michal Marek Subject: [PATCH v2 3/5] kbuild: fix modname for composite modules Date: Mon, 19 Mar 2018 18:01:25 +0900 Message-Id: <1521450087-27291-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521450087-27291-1-git-send-email-yamada.masahiro@socionext.com> References: <1521450087-27291-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- Changes in v2: None scripts/Makefile.lib | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 7feb960..35c868f 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 @@ -173,7 +173,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: