From patchwork Tue Jul 9 04:24:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 168706 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8019453ilk; Mon, 8 Jul 2019 21:26:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqw5SOWO8IWvjJwI89axr2YXwRlph91ognky6yhufl8utlo6XjYUfz5WYG6HeXCGD/AlJanf X-Received: by 2002:a17:902:925:: with SMTP id 34mr29037106plm.334.1562646378462; Mon, 08 Jul 2019 21:26:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562646378; cv=none; d=google.com; s=arc-20160816; b=OVm4Hocg4CzhoM18P8iEZBm0rARd7BPJBXDfvK/wVgB1a76HrJTYr9dXZRQynpiC+5 bfB8ywXZ/dE2pWI7gbFbfbVt1IBsbfKljgTKDpxSyfrslnYZvBqj4r+dFdcaGV6BBdyw AtCQGmOU4UlWdrWfljg5R0td5eDWacyQozQTpHVpcuraYJJ1MbyFwtPGT5UrGyb5UUwh PknXgu+lcURAMM/lCnrztvDxFih2HE9BFmkUYeZCrM7C4sdPBnuOQWTY1y00YDxlvpEy 68IXw5JGUhFe0j+QAl+N8VNUq/8dg/idPtM2vpBAiP6VxsmfxVXNkMI8ZLXtnK2S6D9s Xv9w== 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=m+NQODuw2GuTBAmV1RxTAD4JOmrs8n7px1scpZ29taI=; b=RMy/3olig8h8xdyZBmv3ZyBMO5FA5xPyCySP8SsyaQO7p3s1Phkt5IOVand1oi536+ 7X74N+66VkctBYGmNL1JxVwxM6C9O9FjLdH+4Zk+bdOH3nxCfjK9XOUps1lIV8f3AtSF ZUL1BFoyy24zNjnvSjwlRuRTRtR0EYKoXIQbHaePa5779LRjPi4s3byZJbDNMxHlMbz6 5/M8sz/Guf5dBjoBckv4iDLhD5WslVfnIkaBm0A7ccD+r3qjqGRVzasqfUeiQz2EJXrC 8c/5ZfmTZlImtpeKyBmhcdAT1ydIATFzr232OYA8VAvUcGPlZpRi+G7Y7l+ipuaPreZp I39w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=dh+GnIu1; 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 h8si1494041pjs.13.2019.07.08.21.26.18; Mon, 08 Jul 2019 21:26: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=dh+GnIu1; 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 S1727605AbfGIE0P (ORCPT + 30 others); Tue, 9 Jul 2019 00:26:15 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:42176 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727077AbfGIEZm (ORCPT ); Tue, 9 Jul 2019 00:25:42 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id x694OqVs009969; Tue, 9 Jul 2019 13:25:00 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com x694OqVs009969 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1562646300; bh=m+NQODuw2GuTBAmV1RxTAD4JOmrs8n7px1scpZ29taI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dh+GnIu1b/TBiCwMYEhgrklCBP52Q9+Ap9CPN5Jyy50CjdDRM7/Jjqfyxp7FUzYS9 N/8kh6iArciwy3i65Rz9EjJvOrZte6JolvXo2wDMMHyaD/sDZvwsSqBdTtWb3b3ZjC n1wdjjmlTuQBLdX0LENZgAdJY0kX5jcN/u/U3au6vQp3mXcXr40E/ayF8lB+w8LRKP X3V3idUo80N+u/0lVAJd15CTyz7IUuveau7jPrcpZr9yXFfpqiihGjMlcoxXUPBOca oh77A6aZ4lBOoau8+ePQOdSFzn/e/9G1xldNU/wVUcNBz5TqKWKi9tkzyzn/1PfWd/ 2W8IWkjphMvCw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Nicolas Pitre , Sam Ravnborg , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 09/11] kbuild: remove the first line of *.mod files Date: Tue, 9 Jul 2019 13:24:13 +0900 Message-Id: <20190709042416.27554-10-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190709042416.27554-1-yamada.masahiro@socionext.com> References: <20190709042416.27554-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_UNSED_SYMBOLS=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. Cut the first line. Signed-off-by: Masahiro Yamada --- scripts/Makefile.build | 4 ++-- scripts/adjust_autoksyms.sh | 2 +- scripts/mod/sumversion.c | 9 ++------- 3 files changed, 5 insertions(+), 10 deletions(-) -- 2.17.1 diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 1d01324455d1..f34f941c3b9b 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -281,7 +281,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 $@ @@ -463,7 +463,7 @@ cmd_link_multi-m = $(LD) $(ld_flags) -r -o $@ $(filter %.o,$^) $(cmd_secanalysis $(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 d3561ff4089c..147de8908797 100755 --- a/scripts/adjust_autoksyms.sh +++ b/scripts/adjust_autoksyms.sh @@ -48,7 +48,7 @@ cat > "$new_ksyms_file" << EOT EOT sed 's/ko$/mod/' modules.order | -xargs -r -n1 sed -n -e '3{s/ /\n/g;/^$/!p;}' | +xargs -r -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);