From: tip-bot for Jiri Olsa <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: wangnan0@huawei.com, mingo@kernel.org, jolsa@kernel.org,
linux-kernel@vger.kernel.org, tglx@linutronix.de, hpa@zytor.com,
jolsa@redhat.com, pefoley2@pefoley.com, acme@redhat.com
Subject: [tip:perf/core] tools build: Make fixdep parsing wait for last target
Date: Tue, 6 Dec 2016 00:20:05 -0800 [thread overview]
Message-ID: <tip-1cd6472e3f8d3fdee0fd19f7088807b284d3080f@git.kernel.org> (raw)
In-Reply-To: <20161201130025.GA16430@krava>
Commit-ID: 1cd6472e3f8d3fdee0fd19f7088807b284d3080f
Gitweb: http://git.kernel.org/tip/1cd6472e3f8d3fdee0fd19f7088807b284d3080f
Author: Jiri Olsa <jolsa@redhat.com>
AuthorDate: Thu, 1 Dec 2016 14:00:25 +0100
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 5 Dec 2016 15:51:42 -0300
tools build: Make fixdep parsing wait for last target
The fixdep tool, among other things, replaces the target of the object
in the gcc generated dependency output file.
The parsing code assumes there's only single target in the rule but this
is not always the case as described in here:
https://gcc.gnu.org/ml/gcc-help/2016-11/msg00099.html
Make the fixdep code smart enough to skip all the possible targets.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: Peter Foley <pefoley2@pefoley.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/20161201130025.GA16430@krava
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/build/fixdep.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tools/build/fixdep.c b/tools/build/fixdep.c
index 1521d36..734d154 100644
--- a/tools/build/fixdep.c
+++ b/tools/build/fixdep.c
@@ -49,7 +49,7 @@ static void parse_dep_file(void *map, size_t len)
char *end = m + len;
char *p;
char s[PATH_MAX];
- int is_target;
+ int is_target, has_target = 0;
int saw_any_target = 0;
int is_first_dep = 0;
@@ -67,7 +67,8 @@ static void parse_dep_file(void *map, size_t len)
if (is_target) {
/* The /next/ file is the first dependency */
is_first_dep = 1;
- } else {
+ has_target = 1;
+ } else if (has_target) {
/* Save this token/filename */
memcpy(s, m, p-m);
s[p - m] = 0;
next prev parent reply other threads:[~2016-12-06 8:20 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-26 22:20 [PATCH] Fix objtool with clang Peter Foley
2016-11-27 16:14 ` Jiri Olsa
2016-11-28 2:43 ` [PATCH v2] " Peter Foley
2016-11-28 11:39 ` Jiri Olsa
2016-11-28 15:00 ` Arnaldo Carvalho de Melo
2016-11-28 15:25 ` Peter Foley
2016-11-28 16:58 ` Jiri Olsa
2016-11-28 19:40 ` Arnaldo Carvalho de Melo
2016-11-28 20:08 ` Jiri Olsa
2016-11-29 9:32 ` Jiri Olsa
2016-11-29 9:58 ` Jiri Olsa
2016-11-29 14:28 ` Jiri Olsa
2016-11-29 14:33 ` Arnaldo Carvalho de Melo
2016-11-29 14:39 ` Jiri Olsa
2016-11-29 14:49 ` Arnaldo Carvalho de Melo
2016-11-29 15:24 ` Jiri Olsa
2016-12-01 13:00 ` [PATCHv3] tools build: Make fixdep parsing wait for last target Jiri Olsa
2016-12-01 17:48 ` Peter Foley
2016-12-01 18:53 ` Arnaldo Carvalho de Melo
2016-12-02 8:49 ` Jiri Olsa
2016-12-02 9:15 ` Jiri Olsa
2016-12-02 15:10 ` Arnaldo Carvalho de Melo
2016-12-06 8:20 ` tip-bot for Jiri Olsa [this message]
2016-11-28 19:35 ` [PATCH v2] Fix objtool with clang Arnaldo Carvalho de Melo
2016-12-06 8:20 ` [tip:perf/core] tools build: Fix objtool build " tip-bot for Peter Foley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-1cd6472e3f8d3fdee0fd19f7088807b284d3080f@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=pefoley2@pefoley.com \
--cc=tglx@linutronix.de \
--cc=wangnan0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).