From patchwork Mon Mar 19 09:01:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 132028 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp2476294ljb; Mon, 19 Mar 2018 02:03:07 -0700 (PDT) X-Google-Smtp-Source: AG47ELt4fnxHLinyF9xBl3fHQovVLh3Nywf4GoKXMG0Jeee+66DIWJ9tFiwAZPTcQ/8wtyKPMVXB X-Received: by 10.98.233.3 with SMTP id j3mr9670933pfh.38.1521450186868; Mon, 19 Mar 2018 02:03:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521450186; cv=none; d=google.com; s=arc-20160816; b=aDf/MTE/lX05+nCPBzzHV9z7zJZt3MMlbjPy9YcjQ30At928kCYIdwT5FMVs+sV6Z4 AbsUiNdPrz8EQF4VhYls89K6D/zZmwpmf4cIA1mn4xKO7eiyJbyJ1iR3O2qOGoqLznQP YeJ68RHfxeN7QhzyIGtWylD+R2JQvz6g9sVbj71jYZYeb5YxZS1WjBTNniZBDJdUfTWK LKGxjWZ64ZYLIR3U15vWPVImmKWqq5TJuQBekfJb52kNa8MXQwQbt9SX/9oEdRkxi5Fr Fm7nTYPw7iQVibOxAKNlcen2GVezCa1T8K8K7+CG+f8nWivV9gNsENT8hdK0hkAMSypa nlVw== 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=D+jVwI2EBdHqWOrvY1VMQhEfGs0vHMiXqtnNe/x2ZEI=; b=uvv4yMNIXR9YaXNkEr/gOciAbxcjN+r/RBg9200dLPpiLf8ZDjxQ7udChzq9F32zB1 KwZm5krAOF9OWZsEL3xij5XtjzDGDTB3loKYEtuLS1OflVKLAB38OHGIowj3IipLv8y+ zgScOHiGmWYkii8YtOU0O3PJINvY51azd0b5lfjNl/CEZSzAdbxrHNH+1NLAZCwoP6/W CCR2rLpqDq6LMsxfQuN6IrsJBa7Yktdxb4g5iuijftaUUbOZGMt7IarSoD4omVZbx7Ms EbVzFBVve7C3FyA6aiaHF7XguLmMkfb/Bb+jUAZdv6rwvFtJo9JxfDmuflFkDjjFSGBE fbdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=RqCkVZEv; 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 b63si5932800pgc.72.2018.03.19.02.03.06; Mon, 19 Mar 2018 02:03:06 -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=RqCkVZEv; 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 S932923AbeCSJDD (ORCPT + 28 others); Mon, 19 Mar 2018 05:03:03 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:51364 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932274AbeCSJC6 (ORCPT ); Mon, 19 Mar 2018 05:02:58 -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 w2J91Vk9014340; Mon, 19 Mar 2018 18:01:34 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com w2J91Vk9014340 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1521450095; bh=D+jVwI2EBdHqWOrvY1VMQhEfGs0vHMiXqtnNe/x2ZEI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RqCkVZEvgrOm/obCAj0aF5ezFIWdziS9gerHcFGGmQFJeCgKwtw5bfPB32I1iSq// XEUGy/PF1lmenOP+AuI7GNSJc/ApYP242K9fFanMxiC/UbEUxe7cbu/bD9tBTW5Gan H7N826hC1KBGjbM8QItIfuzCJf+KIcMxvrjKEMKOnTyYYqs5mZ/cpbT7lwQcZ7MCcO 1EruV2hMcIHU3QzlgqKVXTK+/qKRIldYcU+/YNXV8i9wafHJdW2IVS/90cgo/55oJ3 7iaNdlROOSGdjqOBW0ZiAVTfcsTW7TIkksJG/NLCMV5kOLtUymptw07O4dz2bE3GBc 80d0mda1TPQRw== 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 5/5] kbuild: move modname and modname-multi close to modname_flags Date: Mon, 19 Mar 2018 18:01:27 +0900 Message-Id: <1521450087-27291-5-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-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 Reviewed-by: Cao jin --- Changes in v2: None scripts/Makefile.build | 2 -- scripts/Makefile.lib | 14 ++++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) -- 2.7.4 diff --git a/scripts/Makefile.build b/scripts/Makefile.build index f5858f6..93d05e3 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 537629f..33af8d4 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) @@ -162,12 +170,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)