From patchwork Mon Mar 19 11:26:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 132036 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp2607726ljb; Mon, 19 Mar 2018 04:28:31 -0700 (PDT) X-Google-Smtp-Source: AG47ELuh+byYw2mpudBhShKqCMVT818+XRW6GgtSKqDRxRwo1e06p/Qr+Tr7Na160RRhfm6wl/mF X-Received: by 10.99.109.136 with SMTP id i130mr8966604pgc.380.1521458911399; Mon, 19 Mar 2018 04:28:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521458911; cv=none; d=google.com; s=arc-20160816; b=vuhyfq+1sKc+DaX3sEuiqzf+Xg4msbTss8SmfJWHAkPgWpvLRC2XMcs3qmu2FvplVg ceqvZkttPeLodyKZEbbaeMmFEeEYB+m8fdrP5YnOsNRMXr6Pm5MqGuTejmZ09pr6T6aQ 6H5tvbp2bx/5tNDqFyBNwIA+WDRk6KGTf22o6PBGeGBqzkuGay1bMZg7WhMb5Ow2Oh92 65S9pU81ZAU5r6FkyVrBNMj9dLtaksFs3wvdhgAXjXM7mHGGeCeZ49fmu5PrQrLC4Gwy doUIhEbz8fT9s/KRjtEY5+2dFN0AJgHxNoOo3C+BM7GcC2HpSn1M1QJFuyQfrZQiD/8R vTmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter:arc-authentication-results; bh=25ebyO6H7UfHWWqN5SM/epinK+3qTDUs8moCCuhEAGA=; b=KFpTMO13QEXLIBQItgicqGcy51gZGflHlur9ACS6FSdgV+rS4tVFXkYaknicivtLQN ZbPaihTHhIxR21JzaI/nSDKUZNdZEYS+4M9+5Dk5CcTxdFhFzlYpqijhAHvJDY3rWLRv nZljdMso1gIUr1bkm7NfraFDqItokAt7UXS7K6I+oTax1VM/LXbPFilqFMYB8ypwRNiJ 3EuzR7jgDUKy5O49JvtTevphMmOZAeUJG6wFSBkX0ISz2qKT9jHNIRJJBmx9u7Xk/1RM p5g5mDZ4scCDnUZQxLpJfFmr06Bq1IPA59Z4ToaaYjG5hj+AeK8GTftzKWaDjc5a/wvl r52g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=eQlIu2MP; 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 t9-v6si11841216plr.558.2018.03.19.04.28.31; Mon, 19 Mar 2018 04:28:31 -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=eQlIu2MP; 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 S933364AbeCSL22 (ORCPT + 28 others); Mon, 19 Mar 2018 07:28:28 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:30215 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755400AbeCSL1R (ORCPT ); Mon, 19 Mar 2018 07:27:17 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id w2JBQHQp023258; Mon, 19 Mar 2018 20:26:17 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com w2JBQHQp023258 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1521458778; bh=25ebyO6H7UfHWWqN5SM/epinK+3qTDUs8moCCuhEAGA=; h=From:To:Cc:Subject:Date:From; b=eQlIu2MPbWl3Z/O6BfPPtpesV3mfUxqnhZMIAgB9u7up2mCr9Q921lfrqF51cqmk3 BuN5crET/XjO54NmqhjI3VZ7k+WGrwaPWmK4igsfLC0zdyMxdnAaU12TjzFXQACLaa kIcKqCow9/TpA8wrHbL/daS3Gq0E65gtixHxur5/eLv1Izi5YJwEVBSMNuQNlGG28M 77Tt19iGwHzLeKhumIfKREDCJ6T1/Vyct6S8CMMCqLcD7iS9MOlHK58OpMScF9lqqF q/bokU9tGlqQoDvAjTL3+0wumdyq3hrWupG2V9jl5wiA9QIyfhneegIOWjJa8N8s0E VAlupFj1YwB1A== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Michal Marek , linux-kernel@vger.kernel.org, Nicholas Piggin , Masahiro Yamada Subject: [PATCH 1/7] kbuild: rename real-objs-y/m to real-obj-y/m Date: Mon, 19 Mar 2018 20:26:07 +0900 Message-Id: <1521458773-14224-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When I was refactoring Makefiles, I stupidly mistook 'real-obj-y' for 'real-objs-y' over and over again. Finally, I decide to rename it to 'real-obj-y'. This is consistent with 'obj-y', 'subdir-obj-y'. Signed-off-by: Masahiro Yamada --- scripts/Makefile.build | 24 ++++++++++++------------ scripts/Makefile.lib | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) -- 2.7.4 diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 93d05e3..8c1287f 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -119,17 +119,17 @@ modkern_cflags = \ $(KBUILD_CFLAGS_KERNEL) $(CFLAGS_KERNEL)) quiet_modtag := $(empty) $(empty) -$(real-objs-m) : part-of-module := y -$(real-objs-m:.o=.i) : part-of-module := y -$(real-objs-m:.o=.s) : part-of-module := y -$(real-objs-m:.o=.lst): part-of-module := y +$(real-obj-m) : part-of-module := y +$(real-obj-m:.o=.i) : part-of-module := y +$(real-obj-m:.o=.s) : part-of-module := y +$(real-obj-m:.o=.lst): part-of-module := y -$(real-objs-m) : quiet_modtag := [M] -$(real-objs-m:.o=.i) : quiet_modtag := [M] -$(real-objs-m:.o=.s) : quiet_modtag := [M] -$(real-objs-m:.o=.lst): quiet_modtag := [M] +$(real-obj-m) : quiet_modtag := [M] +$(real-obj-m:.o=.i) : quiet_modtag := [M] +$(real-obj-m:.o=.s) : quiet_modtag := [M] +$(real-obj-m:.o=.lst): quiet_modtag := [M] -$(obj-m) : quiet_modtag := [M] +$(obj-m) : quiet_modtag := [M] quiet_cmd_cc_s_c = CC $(quiet_modtag) $@ cmd_cc_s_c = $(CC) $(c_flags) $(DISABLE_LTO) -fverbose-asm -S -o $@ $< @@ -333,8 +333,8 @@ $(obj)/%.lst: $(src)/%.c FORCE modkern_aflags := $(KBUILD_AFLAGS_KERNEL) $(AFLAGS_KERNEL) -$(real-objs-m) : modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE) -$(real-objs-m:.o=.s): modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE) +$(real-obj-m) : modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE) +$(real-obj-m:.o=.s): modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE) # .S file exports must have their C prototypes defined in asm/asm-prototypes.h # or a file that it includes, in order to get versioned symbols. We build a @@ -412,7 +412,7 @@ endif $(obj)/%.o: $(src)/%.S $(objtool_dep) FORCE $(call if_changed_rule,as_o_S) -targets += $(real-objs-y) $(real-objs-m) $(lib-y) +targets += $(real-obj-y) $(real-obj-m) $(lib-y) targets += $(extra-y) $(MAKECMDGOALS) $(always) # Linker scripts preprocessor (.lds.S -> .lds) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 33af8d4..6dd68cb 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -52,8 +52,8 @@ single-used-m := $(sort $(filter-out $(multi-used-m),$(obj-m))) subdir-obj-y := $(filter %/built-in.a, $(obj-y)) # Replace multi-part objects by their individual parts, look at local dir only -real-objs-y := $(foreach m, $(filter-out $(subdir-obj-y), $(obj-y)), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))),$($(m:.o=-objs)) $($(m:.o=-y)),$(m))) -real-objs-m := $(foreach m, $(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m))),$($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m)),$(m))) +real-obj-y := $(foreach m, $(filter-out $(subdir-obj-y), $(obj-y)), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))),$($(m:.o=-objs)) $($(m:.o=-y)),$(m))) +real-obj-m := $(foreach m, $(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m))),$($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m)),$(m))) # DTB # If CONFIG_OF_ALL_DTBS is enabled, all DT blobs are built @@ -70,8 +70,8 @@ obj-y := $(addprefix $(obj)/,$(obj-y)) obj-m := $(addprefix $(obj)/,$(obj-m)) lib-y := $(addprefix $(obj)/,$(lib-y)) subdir-obj-y := $(addprefix $(obj)/,$(subdir-obj-y)) -real-objs-y := $(addprefix $(obj)/,$(real-objs-y)) -real-objs-m := $(addprefix $(obj)/,$(real-objs-m)) +real-obj-y := $(addprefix $(obj)/,$(real-obj-y)) +real-obj-m := $(addprefix $(obj)/,$(real-obj-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)) From patchwork Mon Mar 19 11:26:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 132035 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp2607410ljb; Mon, 19 Mar 2018 04:28:13 -0700 (PDT) X-Google-Smtp-Source: AG47ELswETbA4qqar9ewMixLENl8VFhVKmFt2AfYwYP2iVyHQH637viivV2qYAFkj1GqSyePSVcB X-Received: by 10.98.93.26 with SMTP id r26mr9899155pfb.159.1521458892892; Mon, 19 Mar 2018 04:28:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521458892; cv=none; d=google.com; s=arc-20160816; b=jincYIAZL3yrjHg2PGGie7UBmXpVFvcOPY15xbOM88bCicKvaBBtdP0RKlRLfgOBQ+ vxxeuDXJl7rrj/k1Dgt4JyhZ3kjRz0klGTgGRyhnBWBuo4NVB7Mvu2vEa1PFJKi6uFQS v3zjZgHCthRtt7wkGAJRCGPqgmqzOIU4BQ/Vqwd03l18Fj+OYDfZf2FoeuLzqlGJ2rpH hScyg3Eu0C4RRXHQ/qGC/PSMKISbCf0CH5Ozo3jNr6+on9mWGdTRgT3tjrgz8gYJ61n+ 0qBgM9Sea+3xrNSAW023Sr3CIcsEp1n7rIj8MpLOraFr1S+YHoU3vI+Y0jYn/5w1fPvL 3DIg== 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=OZLcyv9ekuVdIUGgMrW57hsQEWPnCincSssUQ0J0BNA=; b=JP1OLK/plvztz2Gu+idh3zuCdX5VLFxAzxAy1dZou7W8vh+dRqu0hBrUvhfMBMhv6b IS6nIWY4B7FSEqaKbGathJU/RCJxlnh6Hm8GK/VThfCHTjspsiCBGdDioOV1sLeOA+/Z sdrB9ePDE675fvlfeJFBKNk6oj9rYFYiugaJD1JO893A+JuXJWecyXlSTaMLRIKQc/A+ La9a/7IbStx8J8rRoe0YLK3o1+oXxczVsLpS0NEOLXwWPrx9dVrZ8gvWce8ailf3Ey/L qz6ANO/jsCnWrr8v9iiuvti1MpgyQhTiL6N2tPLT0A/OKlQccLDUv0uDgg3X/M1XUu2+ Bt+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=QEzHStIG; 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 l15si3494669pgn.826.2018.03.19.04.28.12; Mon, 19 Mar 2018 04:28:12 -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=QEzHStIG; 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 S933349AbeCSL2K (ORCPT + 28 others); Mon, 19 Mar 2018 07:28:10 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:30416 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933067AbeCSL1Y (ORCPT ); Mon, 19 Mar 2018 07:27:24 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id w2JBQHQq023258; Mon, 19 Mar 2018 20:26:18 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com w2JBQHQq023258 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1521458779; bh=OZLcyv9ekuVdIUGgMrW57hsQEWPnCincSssUQ0J0BNA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QEzHStIGzfDvcuBso8ysYqcfE86mf1QBiNN06BMS0freBO5AvkoU+yJhymNssfWza s2X2eTPJCJ9kH/FzOEH0GP+QtTrZJqA0XiP8l0n0ZGt5WIj0aCG3G7T9+JsVzpGVQF ilZWv+Vh82m+F9918Z5sVKTXZ80G201as0W3vb7z5AVeUP2Jm6gHg6zq9tRswUu5mo apy7iqvnmKDz/98k4prQHhLN6DeIjtSIXdzfZuWSlz8PrFSsFcNliWClVk1qCmG0de bFZxHr8tUndYlt8aAz+NNccIe9PDxGl8IOWEGK5sT7aqIqkr2nvCuLuKq1b4Hz5g8l aMFpmaFtTgoPA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Michal Marek , linux-kernel@vger.kernel.org, Nicholas Piggin , Masahiro Yamada Subject: [PATCH 2/7] kbuild: link $(real-obj-y) instead of $(obj-y) into built-in.a Date: Mon, 19 Mar 2018 20:26:08 +0900 Message-Id: <1521458773-14224-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521458773-14224-1-git-send-email-yamada.masahiro@socionext.com> References: <1521458773-14224-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 Kbuild, Makefiles can add the same object to obj-y multiple times. So, obj-y += foo.o obj-y += foo.o is fine. However, this is not true when the same object is added multiple times via composite objects. For example, obj-y += foo.o bar.o foo-objs := foo-bar-common.o foo-only.o bar-objs := foo-bar-common.o bar-only.o causes build error because two instances of foo-bar-common.o are linked into the vmlinux. Makefiles tend to invent ugly work-around, for example - lib/zstd/Makefile - drivers/net/ethernet/cavium/liquidio/Makefile The technique used in Kbuild to avoid the multiple definition error is to use $(filter $(obj-y), $^). Here, $^ lists the names of all the prerequisites with duplicated names removed. By replacing it with $(filter $(real-obj-y), $^) we can do likewise for composite objects. For built-in objects, we do not need to keep the composite object structure. We can simply expand them, and link $(real-obj-y) to built-in.a. Signed-off-by: Masahiro Yamada --- scripts/Makefile.build | 21 +++++++-------------- scripts/Makefile.lib | 7 +++---- 2 files changed, 10 insertions(+), 18 deletions(-) -- 2.7.4 diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 8c1287f..316cb95 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -73,10 +73,10 @@ endif ifneq ($(strip $(lib-y) $(lib-m) $(lib-)),) lib-target := $(obj)/lib.a -obj-y += $(obj)/lib-ksyms.o +real-obj-y += $(obj)/lib-ksyms.o endif -ifneq ($(strip $(obj-y) $(need-builtin)),) +ifneq ($(strip $(real-obj-y) $(need-builtin)),) builtin-target := $(obj)/built-in.a endif @@ -412,7 +412,7 @@ endif $(obj)/%.o: $(src)/%.S $(objtool_dep) FORCE $(call if_changed_rule,as_o_S) -targets += $(real-obj-y) $(real-obj-m) $(lib-y) +targets += $(filter-out $(subdir-obj-y), $(real-obj-y)) $(real-obj-m) $(lib-y) targets += $(extra-y) $(MAKECMDGOALS) $(always) # Linker scripts preprocessor (.lds.S -> .lds) @@ -455,12 +455,12 @@ cmd_make_empty_builtin = rm -f $@; $(AR) rcSTP$(KBUILD_ARFLAGS) quiet_cmd_link_o_target = AR $@ # If the list of objects to link is empty, just create an empty built-in.a -cmd_link_o_target = $(if $(strip $(obj-y)),\ - $(cmd_make_builtin) $@ $(filter $(obj-y), $^) \ +cmd_link_o_target = $(if $(strip $(real-obj-y)),\ + $(cmd_make_builtin) $@ $(filter $(real-obj-y), $^) \ $(cmd_secanalysis),\ $(cmd_make_empty_builtin) $@) -$(builtin-target): $(obj-y) FORCE +$(builtin-target): $(real-obj-y) FORCE $(call if_changed,link_o_target) targets += $(builtin-target) @@ -534,23 +534,16 @@ $($(subst $(obj)/,,$(@:.o=-m)))), $^) cmd_link_multi-link = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps) $(cmd_secanalysis) -quiet_cmd_link_multi-y = AR $@ -cmd_link_multi-y = rm -f $@; $(AR) rcSTP$(KBUILD_ARFLAGS) $@ $(link_multi_deps) - quiet_cmd_link_multi-m = LD [M] $@ cmd_link_multi-m = $(cmd_link_multi-link) -$(multi-used-y): FORCE - $(call if_changed,link_multi-y) -$(call multi_depend, $(multi-used-y), .o, -objs -y) - $(multi-used-m): FORCE $(call if_changed,link_multi-m) @{ echo $(@:.o=.ko); echo $(link_multi_deps); \ $(cmd_undef_syms); } > $(MODVERDIR)/$(@F:.o=.mod) $(call multi_depend, $(multi-used-m), .o, -objs -y -m) -targets += $(multi-used-y) $(multi-used-m) +targets += $(multi-used-m) targets := $(filter-out $(PHONY), $(targets)) # Descending diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 6dd68cb..99cd592 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -51,8 +51,9 @@ single-used-m := $(sort $(filter-out $(multi-used-m),$(obj-m))) # tell kbuild to descend subdir-obj-y := $(filter %/built-in.a, $(obj-y)) -# Replace multi-part objects by their individual parts, look at local dir only -real-obj-y := $(foreach m, $(filter-out $(subdir-obj-y), $(obj-y)), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))),$($(m:.o=-objs)) $($(m:.o=-y)),$(m))) +# Replace multi-part objects by their individual parts, +# including built-in.a from subdirectories +real-obj-y := $(foreach m, $(obj-y), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))),$($(m:.o=-objs)) $($(m:.o=-y)),$(m))) real-obj-m := $(foreach m, $(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m))),$($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m)),$(m))) # DTB @@ -66,14 +67,12 @@ extra-y := $(addprefix $(obj)/,$(extra-y)) always := $(addprefix $(obj)/,$(always)) targets := $(addprefix $(obj)/,$(targets)) modorder := $(addprefix $(obj)/,$(modorder)) -obj-y := $(addprefix $(obj)/,$(obj-y)) obj-m := $(addprefix $(obj)/,$(obj-m)) lib-y := $(addprefix $(obj)/,$(lib-y)) subdir-obj-y := $(addprefix $(obj)/,$(subdir-obj-y)) real-obj-y := $(addprefix $(obj)/,$(real-obj-y)) real-obj-m := $(addprefix $(obj)/,$(real-obj-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)) subdir-ym := $(addprefix $(obj)/,$(subdir-ym)) From patchwork Mon Mar 19 11:26:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 132030 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp2606654ljb; Mon, 19 Mar 2018 04:27:19 -0700 (PDT) X-Google-Smtp-Source: AG47ELuWOLp4ewq7lJMRnUzLGpkv0RzcZp0BLN+qV1vEbBDwEzq3QMnz9mZ92A15E5dKHD+j9qUj X-Received: by 10.101.86.70 with SMTP id m6mr9071773pgs.349.1521458838987; Mon, 19 Mar 2018 04:27:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521458838; cv=none; d=google.com; s=arc-20160816; b=z8LwuDL7asVdazYGEN+uo0qI3JXL2n5FKSWEvT1EOTP0XhTmWhZjGrTiGCSh2qFwgs i3cRoJRCC1nRjw0k1HakD21y5D2SXeXJUVbj1v4yGy499ege1mgqjZNK9zyIr4xSAo7P WXHyrLAXfXj/C0l8s3+7H9gSHCu6bDTH4c6yamur5FphuAkjMdHm/6TtLMtTn7J5sjRo ytTvEyB8iLAhmMWdPjqn6jgHh9KdxXepvkxhWD+jRm/Eq12BxpcH+hWvnrl7o7c0T0tm neK/aHD3Z1oU5S4sFrmmzg5Lqe/7Oj5VEkVRoL9dD8FwLg2i5AgxBMzUD75wKItaTNHh bJEQ== 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=06vDShcrACkzJtOVE8zghhP/LdwYoXm4E9qdls0K/wg=; b=XGEysb4v6jMYe8hZUWFph3jBpO3Hf+Xt+ksdG68P046IhPW2GnUX+hex05W372PiSs Gf6GgPXpteplCg3u6+gchCLtOiBhASj2mjeugUSJDvYYtnMpGDrXnGN2v+RRA17LoSp+ InPF+bZPBiUoxlV/K0zy3HGcBTh6skpxW60mGXOPNgjdbvG5GitlrxJn4r4U4KXmdAxc Ci96q5sHzVHEHX5DiCWKML4fZznHk3FmJFiLGaubMwQu/Nc7IHTnyoJTo5Yx3qgsWQiI 6p/vCZjuggqrvnQIK8ceRnk+DmKADC9pi4TeauLs7TXyM1ulcS6JUanpOqxqRiTLWCUQ 9WqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=CFAx4J7w; 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 1-v6si12228580plj.510.2018.03.19.04.27.18; Mon, 19 Mar 2018 04:27:18 -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=CFAx4J7w; 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 S932915AbeCSL1P (ORCPT + 28 others); Mon, 19 Mar 2018 07:27:15 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:30060 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755299AbeCSL1M (ORCPT ); Mon, 19 Mar 2018 07:27:12 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id w2JBQHQr023258; Mon, 19 Mar 2018 20:26:19 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com w2JBQHQr023258 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1521458780; bh=06vDShcrACkzJtOVE8zghhP/LdwYoXm4E9qdls0K/wg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CFAx4J7woNIpGAFZKH9H4iT8bL2eRPYZKMeqDkuz/mSeO+EH3YyamKEGviQJG6IHX uYF22wklty2gf96NgnSgMmNIW8yayuykvMnQD0SdU1LvtPnJ70e1FjKqA2dE1u+CJt MOFekKI6ivuSU7GUqXj1DvRSdLqGNjue97nEqvIjoZc3BY82Z1FfvTwKvfv82J5i7l K9l1yxejGxLKMuG8/cwOSrbKfh/9xMHhGN4ICM/1ePY5TvFphAKoeSf7hSytsVQQOS fEp4NSWMKcZVLpAQYX2CXyPs37bE/DlEzv0pHXrxW9wEkeYhDoAEz4rSIZd7+N93VT CcMhVmU1/wQ9Q== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Michal Marek , linux-kernel@vger.kernel.org, Nicholas Piggin , Masahiro Yamada Subject: [PATCH 3/7] lib: zstd: clean up Makefile for simpler composite object handling Date: Mon, 19 Mar 2018 20:26:09 +0900 Message-Id: <1521458773-14224-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521458773-14224-1-git-send-email-yamada.masahiro@socionext.com> References: <1521458773-14224-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 Now, Kbuild nicely handles composite objects to avoid multiple definition. Makefiles can simply add the same objects multiple times across composite objects. Signed-off-by: Masahiro Yamada --- The is clean-up from build system point of view. I will apply this for the Kbuild tree. lib/zstd/Makefile | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) -- 2.7.4 diff --git a/lib/zstd/Makefile b/lib/zstd/Makefile index dd0a359..a1a64cf 100644 --- a/lib/zstd/Makefile +++ b/lib/zstd/Makefile @@ -4,15 +4,7 @@ obj-$(CONFIG_ZSTD_DECOMPRESS) += zstd_decompress.o ccflags-y += -O3 # Object files unique to zstd_compress and zstd_decompress -zstd_compress-y := fse_compress.o huf_compress.o compress.o -zstd_decompress-y := huf_decompress.o decompress.o - -# These object files are shared between the modules. -# Always add them to zstd_compress. -# Unless both zstd_compress and zstd_decompress are built in -# then also add them to zstd_decompress. -zstd_compress-y += entropy_common.o fse_decompress.o zstd_common.o - -ifneq ($(CONFIG_ZSTD_COMPRESS)$(CONFIG_ZSTD_DECOMPRESS),yy) - zstd_decompress-y += entropy_common.o fse_decompress.o zstd_common.o -endif +zstd_compress-y := fse_compress.o huf_compress.o compress.o \ + entropy_common.o fse_decompress.o zstd_common.o +zstd_decompress-y := huf_decompress.o decompress.o \ + entropy_common.o fse_decompress.o zstd_common.o From patchwork Mon Mar 19 11:26:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 132031 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp2606809ljb; Mon, 19 Mar 2018 04:27:29 -0700 (PDT) X-Google-Smtp-Source: AG47ELva9FRiJnmjRK/KaIOZsCq1VtGRb1qSmNHKn+mcAq+oOzNHETgZh8kNEdGcB2weVoUSFzk5 X-Received: by 2002:a17:902:b43:: with SMTP id 61-v6mr12002058plq.270.1521458849803; Mon, 19 Mar 2018 04:27:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521458849; cv=none; d=google.com; s=arc-20160816; b=dDu+60uMqTx7X8Dupy9Mv5jeLkbF5eGjwnQHzfjOohrmX1sT6+rUcz6mFBqX5y+iUp wgI9fw1qC23h01X4BU9jbojrOLyZgN/v0ZcQv2dqSQNSkEqqci0eeiYJyZJrnBV25aNV epulWnGvaXHWb8ygn5c8+nOy/rIxq4WNp5scDiFXOA+Jz155D2fnK7Y2MUPhL2rRwo1z +zGzjrdhTZyoZtL8nZnNFUwfcthZ6cVvUfauRe7LINoIonFltN6bDJMNzLcOw7tBCDUb bHEy47wfMnQRaPamvnXt5snzQNIMSebs5vHBdcAwRJrJPDsJJ+bI/kmZKNJXH5vsIRCl UZGw== 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=YQW8ekSTsqWvwWt5z9R6wXhlqJsVcRF3FWGa4fpNixY=; b=BwOEnYhQYV4et3d4CAbcSs4QuMEQbxXLbPm+GqcqO5Sfxp1OKrFQGH29RA/p7EtY04 lxI8RlTe3re0/9CXdjS0xul6hWrEUFstLMfeGy6dSMcNqWDNqaaFqvouZIpzujGLlEJl TKSfjMCmUq+1MbWkZNuxGdJyknXH60w0zPLdlH4Yt/+iIgnzx7Yp2axVPfdfSwMD0I8I VD5fOPNi4ld6FApy6SWDhHs8LWDUYxhzACJ3Me7sZ/oFGg6ygadq9ghV/xRdax0IU65g 8OcWtHN0uhzeBI9ln7eAegtFVjXV9v7rGpS65oFN1po2OYgqVE+0TskV5CcXqf7oSGBG cXrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=UXyKK47U; 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 q9-v6si4916908pli.448.2018.03.19.04.27.29; Mon, 19 Mar 2018 04:27:29 -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=UXyKK47U; 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 S933259AbeCSL10 (ORCPT + 28 others); Mon, 19 Mar 2018 07:27:26 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:30214 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755299AbeCSL1Q (ORCPT ); Mon, 19 Mar 2018 07:27:16 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id w2JBQHQs023258; Mon, 19 Mar 2018 20:26:20 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com w2JBQHQs023258 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1521458781; bh=YQW8ekSTsqWvwWt5z9R6wXhlqJsVcRF3FWGa4fpNixY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UXyKK47UWH/7gYOg77Z5SsfzpEifNQmFm7CT/P2XtJWBwA/h7U2pIJUZr1Yx81q8a ciheiD9MR2QRBBtoHbbFqmEpp24rx3+rnjBAhSeXUwUuqAFwTFl8D25Jqj04O4GypF Lcpe0zkgN5pJcNXLqujnhJ7T7kkzrF1I463yRysOJzFM/6jsDUFAXhz7chP+1UTsdz gMd2CuMzbNhN72Vi3zkMk/CFRKE+YzNZRcRTiD6uEXSnV+/yeK2S4ReiXIbdYuo1s2 qrOJzC7fi8RDpQAtRhy3osWVM0HH5iZLhbeBQJmpvytlu0XeCOE3uS/Z7p8Zv3q2VV FajHjzuwqECYw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Michal Marek , linux-kernel@vger.kernel.org, Nicholas Piggin , Masahiro Yamada Subject: [PATCH 4/7] net: liquidio: clean up Makefile for simpler composite object handling Date: Mon, 19 Mar 2018 20:26:10 +0900 Message-Id: <1521458773-14224-4-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521458773-14224-1-git-send-email-yamada.masahiro@socionext.com> References: <1521458773-14224-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 Now, Kbuild nicely handles composite objects to avoid multiple definition. Makefiles can simply add the same objects multiple times across composite objects. Signed-off-by: Masahiro Yamada --- The is clean-up from build system point of view. I will apply this for the Kbuild tree. drivers/net/ethernet/cavium/liquidio/Makefile | 51 +++++++++------------------ 1 file changed, 16 insertions(+), 35 deletions(-) -- 2.7.4 diff --git a/drivers/net/ethernet/cavium/liquidio/Makefile b/drivers/net/ethernet/cavium/liquidio/Makefile index e3fc464..bc99375 100644 --- a/drivers/net/ethernet/cavium/liquidio/Makefile +++ b/drivers/net/ethernet/cavium/liquidio/Makefile @@ -2,42 +2,23 @@ # # Cavium Liquidio ethernet device driver # -obj-$(CONFIG_LIQUIDIO) += liquidio.o -liquidio-$(CONFIG_LIQUIDIO) += lio_ethtool.o \ - lio_core.o \ - request_manager.o \ - response_manager.o \ - octeon_device.o \ - cn66xx_device.o \ - cn68xx_device.o \ - cn23xx_pf_device.o \ - cn23xx_vf_device.o \ - octeon_mailbox.o \ - octeon_mem_ops.o \ - octeon_droq.o \ - octeon_nic.o +common-objs := lio_ethtool.o \ + lio_core.o \ + request_manager.o \ + response_manager.o \ + octeon_device.o \ + cn66xx_device.o \ + cn68xx_device.o \ + cn23xx_pf_device.o \ + cn23xx_vf_device.o \ + octeon_mailbox.o \ + octeon_mem_ops.o \ + octeon_droq.o \ + octeon_nic.o -liquidio-objs := lio_main.o octeon_console.o lio_vf_rep.o $(liquidio-y) +obj-$(CONFIG_LIQUIDIO) += liquidio.o +liquidio-y := lio_main.o octeon_console.o lio_vf_rep.o $(common-objs) obj-$(CONFIG_LIQUIDIO_VF) += liquidio_vf.o - -ifeq ($(CONFIG_LIQUIDIO)$(CONFIG_LIQUIDIO_VF), yy) - liquidio_vf-objs := lio_vf_main.o -else -liquidio_vf-$(CONFIG_LIQUIDIO_VF) += lio_ethtool.o \ - lio_core.o \ - request_manager.o \ - response_manager.o \ - octeon_device.o \ - cn66xx_device.o \ - cn68xx_device.o \ - cn23xx_pf_device.o \ - cn23xx_vf_device.o \ - octeon_mailbox.o \ - octeon_mem_ops.o \ - octeon_droq.o \ - octeon_nic.o - -liquidio_vf-objs := lio_vf_main.o $(liquidio_vf-y) -endif +liquidio_vf-y := lio_vf_main.o $(common-objs) From patchwork Mon Mar 19 11:26:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 132034 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp2607340ljb; Mon, 19 Mar 2018 04:28:08 -0700 (PDT) X-Google-Smtp-Source: AG47ELtAZj3/3cPJ+OqcjmNt5Xx5FQVDTmMUakCi9KVgTIo5F4RyMfTzWdi31Dsi1TNqcJkSYGrc X-Received: by 10.99.4.202 with SMTP id 193mr6816828pge.409.1521458888564; Mon, 19 Mar 2018 04:28:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521458888; cv=none; d=google.com; s=arc-20160816; b=hXWV0khonIfffptf4a7UJhkPf5J9VYstQI3cF+lgWX3o75K/JGWYd04uTzuheumdcG BqR2i9gW80VztOj21GkbVKCqFggqJISpR0NzrxnQ+wnKpIF/y1y32917M8jDqrgcXvtW S4uDVBNwoJ7dEQWQFhRgOTWMPlqJUvnpZZBWg801jQnJH1Hy5sfjXEKLpnTJYCuWPN3y X2aeXhajlgv1PyVruSC6mqFta92dbc1NiXnLNlzfFijPipUP4hC4wP69jvMQ1QqvMZkw 5D2xnI/Mb86jE3k2RM/cnNrLl4AN4XQ06F9qpshs7BOI68c3Ks/XW7hUEvRldGbWFs59 bHVg== 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=AmY3feTX0KccPgLpjhutntuw5y6WBHrulX7j3+F9OT0=; b=NH7IOZJOMPLlPibPdNXNOFfekySuYm/4JsiVgvN7Eg+We/JqY2cxow7XdSjepCQUlD d3lJDxLMMM3+tmtyX0FVz+NuCUYHEjTM8XKPu2rTFciBQYiME6c4mexPd1GtM+dv1xU9 ntTf5aCePA1peVqXv3VBRWnM/rDRhnCnLXwx0hX57kJYFPBHtpj9sM4fWa6G9p15Txlc QehFCOXifhhS7293PF1f9gn3qeo5HMENgF9baEWZ/qoKv8++DgItIDBI86OyqzN1LSgA OI7NMoYYp145debYeYCkGfa1kpNELCkFLliPLacGknfYp03EFzfN8fuxWod6rHcku3vu SoYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=j9LjUHMg; 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 l15si3494669pgn.826.2018.03.19.04.28.08; Mon, 19 Mar 2018 04:28:08 -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=j9LjUHMg; 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 S933135AbeCSL1Z (ORCPT + 28 others); Mon, 19 Mar 2018 07:27:25 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:30213 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755372AbeCSL1R (ORCPT ); Mon, 19 Mar 2018 07:27:17 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id w2JBQHQt023258; Mon, 19 Mar 2018 20:26:21 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com w2JBQHQt023258 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1521458782; bh=AmY3feTX0KccPgLpjhutntuw5y6WBHrulX7j3+F9OT0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j9LjUHMgCYBuS+sL0zrrjf/ta7ItRig91crI1ySGfij5BAhNT/MPt41Ma/0GA8TYb 77PMffC0kYrJUuk+bPcNZvQSmx13I+7xF5nkKeTSUVvriB6faIyxEGwioN/uk5PhsS jnpGiMv0dDrIQGZubIUdPQqdHVi96+mVXvNtHs+C6yl5FpeoToV/hZAsnCbGjnnBc/ clT86RSnRUyiZLRg45kDW8IeBN/nbHBxM51x6VvgJSeqwXjuNNFgBOS3GOE9Kb741g kGKHMuyD7bfEJTqlZEqQabGPtb4/YKH7GfCdC6H8XH2GdLHtp8VWh7hKdvWrVdM2ef WHXagKFK5c7Rg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Michal Marek , linux-kernel@vger.kernel.org, Nicholas Piggin , Masahiro Yamada Subject: [PATCH 5/7] kbuild: remove partial section mismatch detection for built-in.a Date: Mon, 19 Mar 2018 20:26:11 +0900 Message-Id: <1521458773-14224-5-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521458773-14224-1-git-send-email-yamada.masahiro@socionext.com> References: <1521458773-14224-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 When built-in.o was incrementally linked with 'ld -r', the section mismatch analysis for the individual built-in.o was possible when CONFIG_DEBUG_SECTION_MISMATCH was enabled. With the migration to the thin archive, built-in.a (former, built-in.o) is no longer an ELF file. So, the modpost does nothing useful. scripts/mod/modpost.c just checks the header to bail out, as follows: /* Is this a valid ELF file? */ if ((hdr->e_ident[EI_MAG0] != ELFMAG0) || (hdr->e_ident[EI_MAG1] != ELFMAG1) || (hdr->e_ident[EI_MAG2] != ELFMAG2) || (hdr->e_ident[EI_MAG3] != ELFMAG3)) { /* Not an ELF file - silently ignore it */ return 0; } We have the full analysis in the final link stage anyway, so we would not miss the section mismatching. I do not see a good reason to require extra linking only for the purpose of the per-directory analysis. Just get rid of this part. Signed-off-by: Masahiro Yamada --- scripts/Makefile.build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.7.4 diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 316cb95..66461e9 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -456,8 +456,7 @@ quiet_cmd_link_o_target = AR $@ # If the list of objects to link is empty, just create an empty built-in.a cmd_link_o_target = $(if $(strip $(real-obj-y)),\ - $(cmd_make_builtin) $@ $(filter $(real-obj-y), $^) \ - $(cmd_secanalysis),\ + $(cmd_make_builtin) $@ $(filter $(real-obj-y), $^), \ $(cmd_make_empty_builtin) $@) $(builtin-target): $(real-obj-y) FORCE From patchwork Mon Mar 19 11:26:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 132033 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp2606956ljb; Mon, 19 Mar 2018 04:27:39 -0700 (PDT) X-Google-Smtp-Source: AG47ELuzMNgPl4pmdN3Vpw6Tzqy/EK+Z2ySoC1NvcNg0vElMkZdvLiN6AdYHwFYns9kwPi9HLllT X-Received: by 2002:a17:902:788b:: with SMTP id q11-v6mr11987754pll.234.1521458859736; Mon, 19 Mar 2018 04:27:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521458859; cv=none; d=google.com; s=arc-20160816; b=ujIKksy2WsgTON1XZPXzMbpBphVo1n2dVc1lKPmzJqv8ctsCSN0g//3mN0P3N5stE2 BaMXfQQDd9qvMqRdF0ZQ/UIpFPl/4Q13YLfbortHWsytoVRf33wZanqg7vXivZ9IYmih ikEwcJQhVUFgwLfShktr7RcI2B5ueiRwQZn9eQV0TWcJLH4VwbZyB7NYL/kOP6qE6fMw C3T+8WW6dfE+UUJXEbLwt1+ZQ2cBG0j7uVt9f/juWdXCyLZQCA/wkWFUdPfBAM++Ug+j xJIGoyxyfzTQyaD/KKzmBeJQCh8OvyNb0eF4c71Cz9kteoXuV8YAfbpWnU6zAJ2LF6uQ jb8A== 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=Qx2wACSyaqiiLhWWdRhmP/YsGsLVXhLVRLm9AJngc7E=; b=Ii9nrlRwpxv0lkdbUtsjBmNtx1KQFlIiqmV8bHD8AhYh0GqVq4LESxZRsQoBEPLbdx YHHjDgg12astEIPp3gqXaVv7IAx72UYEP4JDAvjPRVJYcbG1e8IRtJH3/oZyBZQZALsv Fg7HG+f0QynzXFBquLdWPGY/2LTX6YRS0Ulbp6TdmSBHBQLu041j0zODdhdWnkiQkDO8 ysuoCjGOG5NgjCell1wQHpRQ2xtY7MnP03/YICUdD/V003RcuvBad1xEM3ozy6tlZjbd GUd2yxr+nrr8rlnpolkBiKx5//E1Nk8rX6bIdpUpbRhKYRUEZbLOmqWd/EvGZv6BrcJ5 Kt9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=1yTf3knl; 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 s14si7252494pgf.780.2018.03.19.04.27.39; Mon, 19 Mar 2018 04:27:39 -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=1yTf3knl; 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 S933334AbeCSL1g (ORCPT + 28 others); Mon, 19 Mar 2018 07:27:36 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:30317 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932945AbeCSL1V (ORCPT ); Mon, 19 Mar 2018 07:27:21 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id w2JBQHQu023258; Mon, 19 Mar 2018 20:26:23 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com w2JBQHQu023258 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1521458783; bh=Qx2wACSyaqiiLhWWdRhmP/YsGsLVXhLVRLm9AJngc7E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1yTf3knlFSidkBNnd1rLxdXjLbfqcrMGF7vY/uQoUV+a5vph83pMkBzDKc9kAgVPm 4aS0nGtrPkfvH3wtWjy9KG+paA+YBf4wWY5RSrJdiNN2Ru6psWw9GVnF4Secu0Kf8j SLGG5ne7OHbXHZ0wuLWWVeV5qbJQzzlUC+Bemj/joSbUOb2eKcbnENvtf2meHbPkHb fNy3G5F52DhcIAeyf3VI9yDahcbR2gnaAeuJOr8vwqsXKOi4/aWmfOABVhSLD6Xyjt 05Hu82JzZh7EMqCfK92fjtyoRqVIl3M7n12kgtDCJE5T7xm/UllntdP9opwzTgYHW/ Abo4MNe+Gh4NA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Michal Marek , linux-kernel@vger.kernel.org, Nicholas Piggin , Masahiro Yamada Subject: [PATCH 6/7] kbuild: clean up built-in.a archive rule Date: Mon, 19 Mar 2018 20:26:12 +0900 Message-Id: <1521458773-14224-6-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521458773-14224-1-git-send-email-yamada.masahiro@socionext.com> References: <1521458773-14224-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 With the incremental linking entirely dropped, we can simplify the Makefile. While I am here, I renamed cmd_link_o_target to cmd_ar_builtin. Signed-off-by: Masahiro Yamada --- scripts/Makefile.build | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) -- 2.7.4 diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 66461e9..e5c1aa3 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -450,17 +450,12 @@ ifdef builtin-target # makes them small and fast, but unable to be used by the linker. # scripts/link-vmlinux.sh builds an aggregate built-in.a with a symbol # table and index. -cmd_make_builtin = rm -f $@; $(AR) rcSTP$(KBUILD_ARFLAGS) -cmd_make_empty_builtin = rm -f $@; $(AR) rcSTP$(KBUILD_ARFLAGS) -quiet_cmd_link_o_target = AR $@ - -# If the list of objects to link is empty, just create an empty built-in.a -cmd_link_o_target = $(if $(strip $(real-obj-y)),\ - $(cmd_make_builtin) $@ $(filter $(real-obj-y), $^), \ - $(cmd_make_empty_builtin) $@) +quiet_cmd_ar_builtin = AR $@ + cmd_ar_builtin = rm -f $@; \ + $(AR) rcSTP$(KBUILD_ARFLAGS) $@ $(filter $(real-obj-y), $^) $(builtin-target): $(real-obj-y) FORCE - $(call if_changed,link_o_target) + $(call if_changed,ar_builtin) targets += $(builtin-target) endif # builtin-target From patchwork Mon Mar 19 11:26:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 132032 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp2606896ljb; Mon, 19 Mar 2018 04:27:35 -0700 (PDT) X-Google-Smtp-Source: AG47ELv3FNck0pUR91sk/vfUXdevY9BDLMsoKa6Y7vIFX8FfNIl9sVmLB93kNYkjkdevsCjCUpEn X-Received: by 2002:a17:902:758a:: with SMTP id j10-v6mr3193844pll.271.1521458855745; Mon, 19 Mar 2018 04:27:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521458855; cv=none; d=google.com; s=arc-20160816; b=g7Wzk6ZVoEXTU23l8+REjTLzyf6qzS+cKJHctOtzWxe1AEGLU8F0UhdNCustFTUtp0 Im6EE4qn2Eo8TAoB6YDwu5EAOxzMlp+iuFmqmusUGIebzRzl/qbk69zSILZavyvXV2hk nu1/Ac5zy3DCrLWujfbnFA+bljZ8RjdJwQ3vCTzQf9hqWgZVBGdlTuCIbTFrnRdDAEQ/ Wqar20sciHyUtul6qHgWbAAHHnVpP4H8X227eLn8P4VhqDKcFeJSN8mnSJTepxzZXiFY 3Nb4+8w4hTn5KqTj1xcxcyhYZeV6h5hNvt8vpxae+Vb5SvVyN8DkA3/2mAS9VOYfnjDh 9P7g== 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=B4TnX0GMPFIaLwE8+Yy9avHyyEygbKqSH3rzQdo64ro=; b=JihG7Xe/cZQ314XvmMxCif+DxVvwTwP6UCYZhSlyHIXsnxejdxz3frJ5sAr79khgu7 Tw7lLDKqni+WbPdkF2UkeJl+Vaw8e1SXzWoyzG5Eu7zkjvrhprdGjcXLsDOj8t4MlZmo L2MXOKOvZV0gTxTgtCIQVPH1vzDnmSB6HlHY0ir0V0bx7hIG69P6QLUwFjOAmStJea0C ebEm/V8uIByAqeltpC9Y5r1kvDB9MvnzesJvLOyjH0TCezD4D0VlXwL+XL3ETG86JO6x FC9Ma7jwCegj+IhKUbmOecGGRtMiSpzupIhKJ+pcLhTN3exRcRVoCR3p/szYVg5I4nB7 9Vlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=BGabv3Tv; 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 s14si7252494pgf.780.2018.03.19.04.27.35; Mon, 19 Mar 2018 04:27:35 -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=BGabv3Tv; 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 S933314AbeCSL1c (ORCPT + 28 others); Mon, 19 Mar 2018 07:27:32 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:30277 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932939AbeCSL1T (ORCPT ); Mon, 19 Mar 2018 07:27:19 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id w2JBQHQv023258; Mon, 19 Mar 2018 20:26:24 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com w2JBQHQv023258 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1521458784; bh=B4TnX0GMPFIaLwE8+Yy9avHyyEygbKqSH3rzQdo64ro=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BGabv3TveRmqIthDRD61kr+g9pYUTo3zs/O/Ohk4lvMkDSfWC1/KYfzNQJ+w0RjsH nWQdtMSh4LQJGoJ5gx8uaivRgXgzmNo+tMioaN7UNA/FbIwq0K6dHtcPStqOtD2Y5N b/3aWWekZL8VUSxKicMtBXcKTkaghsgCIbe0Dz+U+MqSAb4e7qh0/kUzckQYJtHJ0H 70ls0ViHPpfa3ZC4anKWqA1rAaIPiehzQre0Ntd9MR91Y1a8lpGhyQKTqeZGhtio3r uwuj+OqPjH9iNadgz2uEcKVL5YWLCF31ESlnXn2YP0zo27BxHwZ7ywi45SXN0qaV37 RxlwcantTNsqA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Michal Marek , linux-kernel@vger.kernel.org, Nicholas Piggin , Masahiro Yamada Subject: [PATCH 7/7] kbuild: clean up multi-used module link rule Date: Mon, 19 Mar 2018 20:26:13 +0900 Message-Id: <1521458773-14224-7-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521458773-14224-1-git-send-email-yamada.masahiro@socionext.com> References: <1521458773-14224-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 cmd_link_multi-link is used only for cmd_link_multi-m. Signed-off-by: Masahiro Yamada --- scripts/Makefile.build | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.7.4 diff --git a/scripts/Makefile.build b/scripts/Makefile.build index e5c1aa3..77cce68 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -526,10 +526,8 @@ $($(subst $(obj)/,,$(@:.o=-objs))) \ $($(subst $(obj)/,,$(@:.o=-y))) \ $($(subst $(obj)/,,$(@:.o=-m)))), $^) -cmd_link_multi-link = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps) $(cmd_secanalysis) - quiet_cmd_link_multi-m = LD [M] $@ -cmd_link_multi-m = $(cmd_link_multi-link) +cmd_link_multi-m = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps) $(cmd_secanalysis) $(multi-used-m): FORCE $(call if_changed,link_multi-m)