From patchwork Mon Mar 19 09:01:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 132026 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp2475985ljb; Mon, 19 Mar 2018 02:02:44 -0700 (PDT) X-Google-Smtp-Source: AG47ELuLORIe0r4pItsU9m38JWEEpgFuMfhsptvPlX+j6a+VwWd4fts/OiZPEF0zFsiONDI9O+2M X-Received: by 10.101.69.133 with SMTP id o5mr8533592pgq.156.1521450164002; Mon, 19 Mar 2018 02:02:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521450163; cv=none; d=google.com; s=arc-20160816; b=ohrZ5iHi+PrAs1EjaV2Hrw0lQ5gZd0ifj3N2EV4/WNlu5HxIOxFW0+BiVDVrswtDVW SGTIxt6NK08WS0N8McgzeyUQLVqGWzyFJmgn8cBy8yCXhMnBmPP1KjTkcInr9kXzUtyO zNvq+0Fyi9YHMS0Du27EHeYcepFG1w8Kr/BSYbconXoCuS0MfpMfMbLAFm42he6PAWqw 8G6eDHmbAEYLQs52bhTrlW7a+SMFF0WvnWKfdeZB/xXfbdRNdSCJYHkQ/Ai0zk+HvYKp BrG5lyNsmr8ueY6BBV79QAhe9PTVOO0bLjsgeNdLdw1GkVMF6H4Z16IYnrfRpSyHJ8zR ikLQ== 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=CE8U11DENlrWCBJOcsn9uX0nAsdREoZzuG70ZAOVF90=; b=LSO7MpOYz6487nXxHK7FcHHB6AHLBnyjYe76V0A9f0CXUxazLcdLeF4PIlKRGkgdPp GKbZpkXzbLTyMJI+GN4jwXO7Wd1x22LsuGqgQLR7LeKbDOVhvHU4KwGHIntau+aCNMyN kOVP8i+Sw2e53sfUowIprkQ094nzt8GmGm6z/coC5cWGGACGnGWx3MyhU+ZY5zcnFrwh dE70Q1sgYSgM5x/IhgdOUgH8mXtMdQpOqxw/xpw2eGhi2cf8cjSbOuC+lx+ZPayyHRnG m770ZmBW5kt9SUE/AvJm+KU9Weew2zS+CsUZ15DNiI4WUDqcgNYf3qXfdxBzRL9BTQxA treg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=1uTU+yEQ; 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 p3si10075416pfh.84.2018.03.19.02.02.43; Mon, 19 Mar 2018 02:02:43 -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=1uTU+yEQ; 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 S932881AbeCSJCi (ORCPT + 28 others); Mon, 19 Mar 2018 05:02:38 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:50352 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932808AbeCSJCZ (ORCPT ); Mon, 19 Mar 2018 05:02:25 -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 w2J91Vk8014340; Mon, 19 Mar 2018 18:01:33 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com w2J91Vk8014340 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1521450094; bh=CE8U11DENlrWCBJOcsn9uX0nAsdREoZzuG70ZAOVF90=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1uTU+yEQcIYoBAHCh1Gmkyh8GWYMP++t+0z3+HJXFtNyuAO4kANGMN9w0i3INQhQG O1iSuoT9vr1ae2RmkNXZzb3S/IRmxuTeteWrq3WzAalOnha2JFHCXed4qiTR5B9WO0 HBdOGnxGQjlm+aLAs/526EuB+JmDRgjNQLvxXKe1Di4dkBhTSzwCpYfbQUeP1+qxLS wxezZOHCB7mJKWEkFJ5zltdJM7ewJ0PCYKua6iBblSUv6xa2VKDzx9hHn704/cdVX8 8RmynxpA8gzs1ZUosg3VgCBN70tSHspzu/ISa47lyk0jCYskSjtRXZRZsIJQl9bmjU z7bEclyeMHSVw== 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 4/5] kbuild: simplify modname calculation Date: Mon, 19 Mar 2018 18:01:26 +0900 Message-Id: <1521450087-27291-4-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 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 Reviewed-by: Cao jin --- Changes in v2: None scripts/Makefile.build | 12 +----------- scripts/Makefile.lib | 7 ------- 2 files changed, 1 insertion(+), 18 deletions(-) -- 2.7.4 diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 7cd2f4a..f5858f6 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 35c868f..537629f 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.a, $(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