From patchwork Wed Jul 17 06:17:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 169093 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp529894ilk; Tue, 16 Jul 2019 23:18:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqw5VMLyh3/YD44e5Io+3YQ/yt1ycAdS6yxipm0WLuEfyIn5I2Mvm5E4fq5ZAKpveh8DYfJj X-Received: by 2002:a17:902:9a95:: with SMTP id w21mr40733828plp.126.1563344317992; Tue, 16 Jul 2019 23:18:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563344317; cv=none; d=google.com; s=arc-20160816; b=xQABCGtZOtNC0VUM3qK8Vs608cIsdyuOlwnaAFEdOqxp9ZLdjAvRAsMxjYSlCMjAvw 80e2gDpKdnIKqxYuxczgpN8Z1l1sgZCbMQscvr38dkxiMhE2WLMGuuOpjGV0yb9BP6aS eF5yMT1Q9r38eTNuKZyT9/VFoOUVmXokyqzVbJNr2YfRv9b0cyqgzY1oICnhEkNwLKPa LBjmePhICej7gnHqtbFGjNqw2rjJHh2lAbniiZSlMwdMMaG3ad4b0wJUKXn62S7pCOs7 NAjHBTQgDYCuvicacO2BGpQB8xcj78sPx6da1ou8PCgnq8NbTvx9lZlYHsuqQiB9ecRV orRQ== 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; bh=B9SttnFocZkaw85nY/WsYdTlcQPEuOC6fxc7lk7URcI=; b=Z7QCYlF11gv7XbDb0HjVoDQZUYbOyMCLbseCX7vq2PcnkdDQ+SbYHEkn5sGBCq0ja0 4saHwb+tLrVCuEr7q9+/OoFGlhqyTQFFohRNqGdolas9CFZP6GEHlwpYbNL0qyQrYzQJ f9OzBMwpHvyknBdYlySE/o6TGossXPPIF4ouqJpzfZCjA5FMP43o29PSrBfFumbDzNIk cnLBZw1g8gPJJP2GY5AZSHPrJ04nXzgxTAAJLHpJWS2kMJgCe05a6YAOz7+2ouZfipAJ xg8TzzTonZVLlSTGZf05Uo3lfw85ZEjcqmEDS7BZK8FnwiMou3cpDV4uRMZAfDzlGTHh EpeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=iDak+bFR; 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 d9si16559388pgv.577.2019.07.16.23.18.37; Tue, 16 Jul 2019 23:18:37 -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=iDak+bFR; 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 S1727109AbfGQGSc (ORCPT + 29 others); Wed, 17 Jul 2019 02:18:32 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:62965 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725856AbfGQGS0 (ORCPT ); Wed, 17 Jul 2019 02:18:26 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id x6H6I5Om009435; Wed, 17 Jul 2019 15:18:13 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com x6H6I5Om009435 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1563344293; bh=B9SttnFocZkaw85nY/WsYdTlcQPEuOC6fxc7lk7URcI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iDak+bFRPZmHuYZvEyyq/s/hPKNCDZedK7pJo9U8iUjoysVU9yiTm4HIVB9aZjg5g 6fAC+dm0kH79vQLtcROucgJCIHL4OxLTZk+J4YwadfCJ0j+jSN0GPC+31Fo53IeMZF M2wVHGBEsDUnpvdj89gfrAB8NLvAku+copGimnfe0AnbST5ebrf1Z3mjUfRuvZmn/m vtb8I/MIobOMwhbcg/K7DodmX3jOMIpxr/qaPeS6KRl1OBWyUyKIPYm+EC0qUQF5ez lyheVWA/O8qLXfycNNI/JFiq/3Ba00j6WvyFc0PHmBAkPlSPk139PKwycdVmRA9EO8 x95UeKoBzPSuA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Joe Lawrence , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH v3 10/12] kbuild: remove the first line of *.mod files Date: Wed, 17 Jul 2019 15:17:58 +0900 Message-Id: <20190717061800.10018-11-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190717061800.10018-1-yamada.masahiro@socionext.com> References: <20190717061800.10018-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The current format of *.mod is like this: line 1: directory path to the .ko file line 2: a list of objects linked into this module line 3: unresolved symbols (only when CONFIG_TRIM_UNUSED_KSYMS=y) Now that *.mod and *.ko are created in the same directory, the line 1 provides no valuable information. It can be derived by replacing the extension .mod with .ko. In fact, nobody uses the first line any more. Cut down the first line. Signed-off-by: Masahiro Yamada --- Changes in v3: None Changes in v2: None scripts/Makefile.build | 4 ++-- scripts/adjust_autoksyms.sh | 4 ++-- scripts/mod/sumversion.c | 9 ++------- 3 files changed, 6 insertions(+), 11 deletions(-) -- 2.17.1 diff --git a/scripts/Makefile.build b/scripts/Makefile.build index c6dfcc028f56..9f37f203882f 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -274,7 +274,7 @@ $(obj)/%.o: $(src)/%.c $(recordmcount_source) $(objtool_dep) FORCE $(single-used-m): $(obj)/%.o: $(src)/%.c $(recordmcount_source) $(objtool_dep) FORCE $(call cmd,force_checksrc) $(call if_changed_rule,cc_o_c) - @{ echo $(@:.o=.ko); echo $@; \ + @{ echo $@; \ $(cmd_undef_syms); } > $(patsubst %.o,%.mod,$@) quiet_cmd_cc_lst_c = MKLST $@ @@ -456,7 +456,7 @@ quiet_cmd_link_multi-m = LD [M] $@ $(multi-used-m): FORCE $(call if_changed,link_multi-m) - @{ echo $(@:.o=.ko); echo $(filter %.o,$^); \ + @{ echo $(filter %.o,$^); \ $(cmd_undef_syms); } > $(patsubst %.o,%.mod,$@) $(call multi_depend, $(multi-used-m), .o, -objs -y -m) diff --git a/scripts/adjust_autoksyms.sh b/scripts/adjust_autoksyms.sh index 2e4a7320bfb4..a904bf1f5e67 100755 --- a/scripts/adjust_autoksyms.sh +++ b/scripts/adjust_autoksyms.sh @@ -8,7 +8,7 @@ # # Create/update the include/generated/autoksyms.h file from the list -# of all module's needed symbols as recorded on the third line of *.mod files. +# of all module's needed symbols as recorded on the second line of *.mod files. # # For each symbol being added or removed, the corresponding dependency # file's timestamp is updated to force a rebuild of the affected source @@ -47,7 +47,7 @@ cat > "$new_ksyms_file" << EOT EOT sed 's/ko$/mod/' modules.order | -xargs -n1 sed -n -e '3{s/ /\n/g;/^$/!p;}' -- | +xargs -n1 sed -n -e '2{s/ /\n/g;/^$/!p;}' -- | sort -u | sed -e 's/\(.*\)/#define __KSYM_\1 1/' >> "$new_ksyms_file" diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c index 166f3fa247a9..63062024ce0e 100644 --- a/scripts/mod/sumversion.c +++ b/scripts/mod/sumversion.c @@ -398,7 +398,7 @@ void get_src_version(const char *modname, char sum[], unsigned sumlen) char *sources, *end, *fname; char filelist[PATH_MAX + 1]; - /* objects for a module are listed in the second line of *.mod file. */ + /* objects for a module are listed in the first line of *.mod file. */ snprintf(filelist, sizeof(filelist), "%.*smod", (int)strlen(modname) - 1, modname); @@ -407,13 +407,8 @@ void get_src_version(const char *modname, char sum[], unsigned sumlen) /* not a module or .mod file missing - ignore */ return; - sources = strchr(file, '\n'); - if (!sources) { - warn("malformed versions file for %s\n", modname); - goto release; - } + sources = file; - sources++; end = strchr(sources, '\n'); if (!end) { warn("bad ending versions file for %s\n", modname);