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))