From patchwork Thu Mar 8 01:04:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 130931 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp5855826lja; Wed, 7 Mar 2018 17:07:33 -0800 (PST) X-Google-Smtp-Source: AG47ELvgHNo32eSh8w0XyQzo/izbd4q8lLzQyPiwROzQBA4Q2GB+r7iaD/jDhUK/BJLK2DhIJz7d X-Received: by 10.99.126.14 with SMTP id z14mr20086222pgc.429.1520471253411; Wed, 07 Mar 2018 17:07:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520471253; cv=none; d=google.com; s=arc-20160816; b=vtDH5YHPu+0WLaTwbKV2mulPXK6MOUew5jyZCOQOu1DwnJ9KsEx48UK5VgZfVNypYH NDvy53vo7s0XCViuRSR8zGUVeOAZ2VUPQLk7tbGlWxl9tGmVQq/riz8eSGenpKEI37wb 9vBmUeED/vhJSLbqCphxDTCgsejvRhA4Z84nj/amuQBtpWHeV5YdyU6/trocg9UWwqF2 mtwDLiyNGfsqkN67Hy7wlvo5RK00/0HyUAG67FT5kQZlX0alwR0QaN6JHIP5nJy+14Eb UinEcCu6YvFX055uwvTBph90dYWm7paM01t8fLgZy2XvCTSWo9OcVemr30nSC94xhZ1Z mMRg== 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=b9Rgw1e2FUke82OybP8lef9ykXhCKyGguofV/SsdRmw=; b=dqCAxii5B0KyD+TE5NpxNwm5VW3fKemscqJ6HRK62Uj86a/ohgIGoW59Tu58ca5eqP uL8RbjQUJDNlqokBY8lCVtBjtFLR/Ne/JGm47VKlJ6MvpVplIT6dt/y878w1G9ID7gS8 l1KKLr2xflAceLnCWnz1MwwdzV5+DvyvesCiIPVWubYLs1/zkdZPdBCQ/kCpPxsznpDH uB2i4AuJ2YNVg4d0X2uo2Ch7pfYwNWtBVrdcaRhH8AlqieTu/R+Q240ub8OsBtA8YFth H4iMhz0Tp1jCZ4d6c3BxIGOO13jdaFZieo9J7JASDh//OdzZQe1pNOoIiuMK+HQHrXTi rlDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=K+j5HzRv; 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 x23si12163206pge.2.2018.03.07.17.07.33; Wed, 07 Mar 2018 17:07:33 -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=K+j5HzRv; 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 S1755266AbeCHBH3 (ORCPT + 28 others); Wed, 7 Mar 2018 20:07:29 -0500 Received: from conuserg-10.nifty.com ([210.131.2.77]:60402 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755044AbeCHBF4 (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 w28156G6018694; Thu, 8 Mar 2018 10:05:07 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w28156G6018694 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1520471108; bh=b9Rgw1e2FUke82OybP8lef9ykXhCKyGguofV/SsdRmw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K+j5HzRvpsP6D0k4C5VEf4UOpVPHAlNFj/CU8NUh8g3t5XJuJtXIf7GC2HlKPy+Qz DPSIexuibkBae+xeXQRKwai4Vx4zh7FDWh+GCfv9BA0S/TsxSU4P+LnCjsOdK7LUjO cXqgDOZE+bfcDCUXf5yvXACC+Me1Q/qzAi42EgrfKrBEQ/1ODM2WXQfN/dgZ4ZPVFZ deoEUgFgKVpbPS1bL25R4x3zqh9SyTMAdFMirB/So6UBjmP4VwfZ637ez3ZXv48B1H 5WG265avL8ufSl8B9SiiL6Hz93kfQ7HjhAfI9zrWCudDGBJM7PdjD5dAWXAlgGcl2n x2OrqCKHfm/VA== 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 1/5] kbuild: remove unnecessary $(subst $(obj)/, , ...) in modname-multi Date: Thu, 8 Mar 2018 10:04:59 +0900 Message-Id: <1520471103-10089-2-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 In the context ... $(obj)/%.s: $(src)/%.c FORCE $(call if_changed_dep,cc_s_c) $(obj)/%.i: $(src)/%.c FORCE $(call if_changed_dep,cpp_i_c) $(obj)/%.o: $(src)/%.c $(recordmcount_source) $(objtool_dep) FORCE $(call cmd,force_checksrc) $(call if_changed_rule,cc_o_c) $(obj)/%.lst: $(src)/%.c FORCE $(call if_changed_dep,cc_lst_c) '$*' returns the stem of the target (the part of '%'), so $(obj)/ has already been ripped off. $(subst $(obj)/,,$*.o) is the same as $(*.o) Signed-off-by: Masahiro Yamada --- scripts/Makefile.lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 Reviewed-by: Cao jin diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 5589bae..a7e315f 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -175,7 +175,7 @@ dtc_cpp_flags = -Wp,-MD,$(depfile).pre.tmp -nostdinc \ # Finds the multi-part object the current object will be linked into modname-multi = $(sort $(foreach m,$(multi-used),\ - $(if $(filter $(subst $(obj)/,,$*.o), $($(m:.o=-objs)) $($(m:.o=-y))),$(m:.o=)))) + $(if $(filter $*.o, $($(m:.o=-objs)) $($(m:.o=-y))),$(m:.o=)))) # Useful for describing the dependency of composite objects # Usage: From patchwork Thu Mar 8 01:05:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 130929 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp5855113lja; Wed, 7 Mar 2018 17:06:44 -0800 (PST) X-Google-Smtp-Source: AG47ELsHATYxF+lHBu7XWiYEI2fg+oo2v6rpz/guSgqfKOjrbErmnZHeFYjEHoZld65GuUGKScva X-Received: by 10.99.96.18 with SMTP id u18mr20194417pgb.124.1520471204150; Wed, 07 Mar 2018 17:06:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520471204; cv=none; d=google.com; s=arc-20160816; b=JOEtx7hQ8Q64ynJJxWoHPkPPdoS1NNFNjTg/eQHk7GkHHlgbXYJHjlJb4slfLVpSKZ ItBr/iJ5CstCCVN5eUR/ho2//anTJdjy5b4feT+OifLVhyADKoDmAZIk1nyOlchcoRbS 7j0znnWKZF87hAypLxpbFCDX4ejtaeqIhUPNJe12nJOxJSYLNQVJAlKu7ePl6OuI0bWm IGuwT8njZ6rvp/REM6VB96lNosOHmma3L6KQtejx0JjpHazLTD5ZmAZvuJrzSy0yiYsV QTGHuhwsMsqds+QW/eNGTurcgbVZ6HjaUtPgsiQh7aHDcnU955UQo+K8IefbzDsioDeQ tFLg== 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=Jsb1NMYl/ZZ8jZ+KDutdlTHhYY1QzUJyUSaJT6thqJw=; b=g+GOQIslZL2JYcRmSU4s5wSie0N31WaBS+yNuwkUesZEmdAmyD0y50VdA1pt0zO1ah FvHYF7YAvfXUb+XmksetXU55f8pE9GbzM1pFNAAqbrtKqigJpY2M7uUVRTzOV8EYdL7l u1oCb+1fgyZua/Is1eHyxtPg3eJOWDbxM1GYVOo60/7954a/Z+BG/zRvliCyVAkNhDvy EqCmOc5cMMwe4l8CTEX3DQSX59NnjvvDDIbMvFFw3CjZH18pK9VJ40bK2WnqxWTxXKHH oghiqmCSaMY6O2K32aBOAO1NK2WQkqXiRe/6XZvq45hzMFSPryaimEslDQDDygecQ8yJ 4baw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=hN5r3QPM; 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 k11-v6si13624305pls.58.2018.03.07.17.06.43; Wed, 07 Mar 2018 17:06:44 -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=hN5r3QPM; 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 S1755234AbeCHBGi (ORCPT + 28 others); Wed, 7 Mar 2018 20:06:38 -0500 Received: from conuserg-10.nifty.com ([210.131.2.77]:60400 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755042AbeCHBF4 (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 w28156G7018694; Thu, 8 Mar 2018 10:05:08 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w28156G7018694 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1520471109; bh=Jsb1NMYl/ZZ8jZ+KDutdlTHhYY1QzUJyUSaJT6thqJw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hN5r3QPM2zRt/JTrp6PhPrdz6b+YPOypq2Vf/0fMjWmC1RC802ERXX2IRySvy0zVp 7R0Lo9TA/y5A3PeKVtCJPuJoS6x3KgtlBsSgQRNiJoSB2xi2mjUxSp6JzgjSJ2Cx6P WF8n2xN+/l6AD+s5cGMOGw9X6iJgPye69BE1lGAhjTFrjxxrFqxP70s/TsBQJ1U2JV HTzgw5oRL3BBs5MMM3DyN1I69z4qoS8PcxFb6r1cjiGsbBH+TqJB8UwsoQYU6faaRK 4OFMfFX+4bFhamHHthnYAuIQ2Mi7g0AKl+zYAv+xaY6wIKziOE3UD07uNteafED6Kt RV/SXI/+r5/rw== 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 2/5] kbuild: define KBUILD_MODNAME even if multiple modules share objects Date: Thu, 8 Mar 2018 10:05:00 +0900 Message-Id: <1520471103-10089-3-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 Currently, KBUILD_MODNAME is defined only when $(modname) contains just one word. If an object is shared among multiple modules, undefined KBUILD_MODNAME could cause a build error. For example, if CONFIG_DYNAMIC_DEBUG is enabled, any call of printk() populates .modname, then fails to build due to undefined KBUILD_MODNAME. Take the following code as an example: obj-m += foo.o obj-m += bar.o foo-objs := foo-bar-common.o foo-main.o bar-objs := foo-bar-common.o bar-main.o In this case, there is room for argument what to define for KBUILD_MODNAME when foo-bar-common.o is being compiled. "foo", "bar", or what else? One idea is to define colon-separated modules that share the object, in this case, "bar:foo" (modules are sorted alphabetically by $(sort ...). Signed-off-by: Masahiro Yamada --- scripts/Makefile.lib | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -- 2.7.4 diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index a7e315f..a1fbd6a 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -92,8 +92,7 @@ subdir-ym := $(addprefix $(obj)/,$(subdir-ym)) # differ in different configs. name-fix = $(squote)$(quote)$(subst $(comma),_,$(subst -,_,$1))$(quote)$(squote) basename_flags = -DKBUILD_BASENAME=$(call name-fix,$(basetarget)) -modname_flags = $(if $(filter 1,$(words $(modname))),\ - -DKBUILD_MODNAME=$(call name-fix,$(modname))) +modname_flags = -DKBUILD_MODNAME=$(call name-fix,$(modname)) orig_c_flags = $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) \ $(ccflags-y) $(CFLAGS_$(basetarget).o) @@ -174,8 +173,10 @@ dtc_cpp_flags = -Wp,-MD,$(depfile).pre.tmp -nostdinc \ -undef -D__DTS__ # Finds the multi-part object the current object will be linked into -modname-multi = $(sort $(foreach m,$(multi-used),\ - $(if $(filter $*.o, $($(m:.o=-objs)) $($(m:.o=-y))),$(m:.o=)))) +# 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=))))) # Useful for describing the dependency of composite objects # Usage: 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: From patchwork Thu Mar 8 01:05:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 130927 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp5854714lja; Wed, 7 Mar 2018 17:06:14 -0800 (PST) X-Google-Smtp-Source: AG47ELsTE8O2uSsY+GDWt0jGlaMzt/9NkX+zOVtU2kGqr89pSLWiKprsj26Na3kg+zDrWbcIQe/p X-Received: by 2002:a17:902:6c47:: with SMTP id h7-v6mr12516636pln.445.1520471174338; Wed, 07 Mar 2018 17:06:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520471174; cv=none; d=google.com; s=arc-20160816; b=Uj5ZvLHcnetMh+0m3HPh5GI19tE9yMYF2XbFzxslREuHQBoqSf/OU+iDhqAvW7rHwX XMxZZ49lqV5TndsLZBscsCN2lKQzA8nnJl0Ff9nkRJEv2FveCXfqudsLynP4vwCdgT+/ OlNt3Ues41qDF0zULE+bIGaUg5WZNuGO+J5pMTDjHSYJLpvRPz5TSia3z9fbJUjP+8+Y kIkszupCrFqmiS5Cg69ZVD406vDr0Da/LHrDKuFsvPORP1TmZL53lvE9KMShRhyJ2bWB qJA7Qo2SBF13KSKMGmOF2kE4WHa9+X9xFYHUJ3jGjG+f53h15xspapZRBig9DMcJD+zi e6Kg== 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=kPbx/GkwrVXPj2Zt+vFWBog7PgLKKWZn1LiMH0RqacQ=; b=l94uRPCAMvASOa7JE7IhM29qzrztqYtm5F1wRwl3NQi5ivtqW10wN7ilIwhzeX5lGU xrRJY9hTh7t+FAnc8BDkTowZn72d04BcCJeOcTbI9kG3DwO80/j0ZedeVMykk9lyvmMq d43Mk8iASBkLPRpz4CqsHJTz4Y7JKvhtRcp+KJkhhz1Br102unVI1Jg6qpak2Ig9cCYs Y0+nB5qOdbhnpRX4/7NCqkIbK0StEM+UfpWShaH8QYieJFEqjErUl4C2GXXE4aC+RcA2 EYykWrTUskjXn6nv2ehHhvV/EDZD5U2rWnwqjNC8IqK/bNDEoXyG5Dq+4zct4c8AIPQo D+fQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=UuRlkpGg; 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.14; Wed, 07 Mar 2018 17:06:14 -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=UuRlkpGg; 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 S1755100AbeCHBF7 (ORCPT + 28 others); Wed, 7 Mar 2018 20:05:59 -0500 Received: from conuserg-10.nifty.com ([210.131.2.77]:60403 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754875AbeCHBF4 (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 w28156G9018694; Thu, 8 Mar 2018 10:05:10 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w28156G9018694 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1520471110; bh=kPbx/GkwrVXPj2Zt+vFWBog7PgLKKWZn1LiMH0RqacQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UuRlkpGgWwJRjg9HYIPg6KpPAL4qm9vaQZEHeWqOxIkxe6jJ1XE6tkoa1GW8SvPeK n+hh1GeBWJQYjDPdMsjKc6rYAzR+kRJzjEp37NmiOCFlAzyFNw3d12YNbUVdkBS/+T 67ceyQSX9UTgkSwrqc0ENL+UUx7YvVM9P27cKNQ8MIhb0awRY7P3lgLoi4Q3+eLzdd MRM3ifq/b59GxPPjznwoLobwBqmR6SyJFRTKwMwAbJRhDQ5F4LmZTQmFIolXS7gR8j axlHWzEhjuvDkAhbdAQqL0Nohm6Y3hgpieDLL5u9r1CbMOFh/cgYwtvNgt8ZFm5mYW HMkHtoqXCzbGA== 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 4/5] kbuild: simplify modname calculation Date: Thu, 8 Mar 2018 10:05:02 +0900 Message-Id: <1520471103-10089-5-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 modname can be calculated much more simply. If modname-multi is empty, it is a single-used object. So, modname = $(basetarget). Otherwise, modname = $(modname-multi). Signed-off-by: Masahiro Yamada --- scripts/Makefile.build | 12 +----------- scripts/Makefile.lib | 7 ------- 2 files changed, 1 insertion(+), 18 deletions(-) -- 2.7.4 Reviewed-by: Cao jin diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 4f2b25d..b8aecb7 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -131,17 +131,7 @@ $(real-objs-m:.o=.lst): quiet_modtag := [M] $(obj-m) : quiet_modtag := [M] -# Default for not multi-part modules -modname = $(basetarget) - -$(multi-objs-m) : modname = $(modname-multi) -$(multi-objs-m:.o=.i) : modname = $(modname-multi) -$(multi-objs-m:.o=.s) : modname = $(modname-multi) -$(multi-objs-m:.o=.lst) : modname = $(modname-multi) -$(multi-objs-y) : modname = $(modname-multi) -$(multi-objs-y:.o=.i) : modname = $(modname-multi) -$(multi-objs-y:.o=.s) : modname = $(modname-multi) -$(multi-objs-y:.o=.lst) : modname = $(modname-multi) +modname = $(if $(modname-multi),$(modname-multi),$(basetarget)) quiet_cmd_cc_s_c = CC $(quiet_modtag) $@ cmd_cc_s_c = $(CC) $(c_flags) $(DISABLE_LTO) -fverbose-asm -S -o $@ $< diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 9217d40..e4e8e1b 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -47,11 +47,6 @@ multi-used-m := $(sort $(foreach m,$(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m multi-used := $(multi-used-y) $(multi-used-m) 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)) $($(m:.o=-m))) - # $(subdir-obj-y) is the list of objects in $(obj-y) which uses dir/ to # tell kbuild to descend subdir-obj-y := $(filter %/built-in.o, $(obj-y)) @@ -80,8 +75,6 @@ real-objs-m := $(addprefix $(obj)/,$(real-objs-m)) single-used-m := $(addprefix $(obj)/,$(single-used-m)) multi-used-y := $(addprefix $(obj)/,$(multi-used-y)) multi-used-m := $(addprefix $(obj)/,$(multi-used-m)) -multi-objs-y := $(addprefix $(obj)/,$(multi-objs-y)) -multi-objs-m := $(addprefix $(obj)/,$(multi-objs-m)) subdir-ym := $(addprefix $(obj)/,$(subdir-ym)) # These flags are needed for modversions and compiling, so we define them here From patchwork Thu Mar 8 01:05:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 130930 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp5855662lja; Wed, 7 Mar 2018 17:07:22 -0800 (PST) X-Google-Smtp-Source: AG47ELt8vjpljs+8fRthuqT5GekSC6aiTp/drgYEutdZO4MC/MV16XXMjB9yMrFxqwMZqsef9gW9 X-Received: by 2002:a17:902:b20f:: with SMTP id t15-v6mr22727217plr.349.1520471242226; Wed, 07 Mar 2018 17:07:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520471242; cv=none; d=google.com; s=arc-20160816; b=eRUNP9bL5fpeuiy0DOCbB9V/SvxF/QBvkqvL2HdIDTTfWbDKlCXk/r4YDPwJv98AC1 FenmdHV2TdjBwAdOpyc0kF/JlyK51/4cyKoehUt34iYvcMge8CVyuQVCmyBKyK8wFR7y cbXZbEBTDQLylnzCTXLoSQAM/F+d2rkqVA2cUm9MFzkCFuPEggDRYW9tjvNy6+z3ksGQ wWxKZm73Si/r7gOcKyxsMGUWKBOobYPZvfAKTyiTFzQPH0URuEbfUNM+cWxwwDQ8PCDs keOEA6B/c6Sb0M4japhYVm39QImKE2Y2JdqyYIVgIo+DGX0uu0Y7RNZMtbjw+CTw+lld Wqag== 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=4lomp+gC9NVfrDilIoUeb1MJJxF/93EiIzW2eRiO8aQ=; b=lbD/qfo/P9aIgKWV8JlErWtHxq/KO3xeAZgBf5X+XbS3HN/cvKkb/+b1SZ5zcJYJEu k04zhMlzHZQjNKsZmV5xRpvQzyILusp3IHjr1yUgIZYxxH/nmL0lZp2AA1yjvxVfJnsi cbek9IZTnlajD4/UYeBE4CRmBwx+R0ujLykesLyM5TG+7WHlvQQe44wp3rhCXzZJDmPV AFWMFVZKqKUcUNyEJzYwR4LKYQADsH3oTlxbvLTcTYb6jXrINuUshflNXeUZWY8T8Z0M OQGZo3PB02aIiGYXum80WePq7foEB5E1eYnlyAPfKC4ND3ngrM+9lsSK+snrE2+1tzoM T+sQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=LeCgv5EG; 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 h10-v6si13879476plk.706.2018.03.07.17.07.21; Wed, 07 Mar 2018 17:07:22 -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=LeCgv5EG; 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 S1755197AbeCHBGf (ORCPT + 28 others); Wed, 7 Mar 2018 20:06:35 -0500 Received: from conuserg-10.nifty.com ([210.131.2.77]:60436 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755046AbeCHBF5 (ORCPT ); Wed, 7 Mar 2018 20:05:57 -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 w28156GA018694; Thu, 8 Mar 2018 10:05:10 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w28156GA018694 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1520471111; bh=4lomp+gC9NVfrDilIoUeb1MJJxF/93EiIzW2eRiO8aQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LeCgv5EGzbyQVbiSUrOp8C2BrwguQj0qZc6r+1AyDQtniwzPcJfC7mNHIioHrdQWL Z5OsKfoRTyjWcf6/SzEzBPE+90Ql7LXdvWKS63vKP4vFo4+d3gxvbDOwZadBX2FzE5 rmMG7v6/7s5ZR9bYFdFU8EkOyPZ+TDxldHihh3H5uJlfLrKpqSaqDUkZ6ily1T9m23 EYdpDnOpOHy91DARdM5lJFnpEaLR0gQO7JSY3uVDrJaGga3iXzHmfGgQYtuNI9A2gO yR9UpxXmX/+6WaBX0b/oT3d1NAUlBg6nyz6PDEFgVekHTjUG/k8Aqjdvxmn+vX2hO7 jX0cqUENDeg1Q== 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 5/5] kbuild: move modname and modname-multi close to modname_flags Date: Thu, 8 Mar 2018 10:05:03 +0900 Message-Id: <1520471103-10089-6-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 Just a cosmetic change to put related code close together. Signed-off-by: Masahiro Yamada --- scripts/Makefile.build | 2 -- scripts/Makefile.lib | 14 ++++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) -- 2.7.4 Reviewed-by: Cao jin diff --git a/scripts/Makefile.build b/scripts/Makefile.build index b8aecb7..2d8f90e 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -131,8 +131,6 @@ $(real-objs-m:.o=.lst): quiet_modtag := [M] $(obj-m) : quiet_modtag := [M] -modname = $(if $(modname-multi),$(modname-multi),$(basetarget)) - quiet_cmd_cc_s_c = CC $(quiet_modtag) $@ cmd_cc_s_c = $(CC) $(c_flags) $(DISABLE_LTO) -fverbose-asm -S -o $@ $< diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index e4e8e1b..b17f4cd 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -77,6 +77,14 @@ multi-used-y := $(addprefix $(obj)/,$(multi-used-y)) multi-used-m := $(addprefix $(obj)/,$(multi-used-m)) subdir-ym := $(addprefix $(obj)/,$(subdir-ym)) +# Finds the multi-part object the current object will be linked into. +# 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=-m))),$(m:.o=))))) + +modname = $(if $(modname-multi),$(modname-multi),$(basetarget)) + # These flags are needed for modversions and compiling, so we define them here # $(modname_flags) defines KBUILD_MODNAME as the name of the module it will # end up in (or would, if it gets compiled in) @@ -165,12 +173,6 @@ dtc_cpp_flags = -Wp,-MD,$(depfile).pre.tmp -nostdinc \ $(addprefix -I,$(DTC_INCLUDE)) \ -undef -D__DTS__ -# Finds the multi-part object the current object will be linked into -# 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=-m))),$(m:.o=))))) - # Useful for describing the dependency of composite objects # Usage: # $(call multi_depend, multi_used_targets, suffix_to_remove, suffix_to_add)