diff options
| author | Jiri Olsa <jolsa@redhat.com> | 2016-12-01 14:00:25 +0100 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2016-12-05 15:51:42 -0300 |
| commit | 1cd6472e3f8d3fdee0fd19f7088807b284d3080f (patch) | |
| tree | 76e51c1e28d624cb0aabe449fca22837ea03220c | |
| parent | e7af7b15121ca08c31a0ab9df71a41b4c53365b4 (diff) | |
| download | linux-starfive-1cd6472e3f8d3fdee0fd19f7088807b284d3080f.tar.gz linux-starfive-1cd6472e3f8d3fdee0fd19f7088807b284d3080f.tar.bz2 linux-starfive-1cd6472e3f8d3fdee0fd19f7088807b284d3080f.zip | |
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>
| -rw-r--r-- | tools/build/fixdep.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/build/fixdep.c b/tools/build/fixdep.c index 1521d36cef0d..734d1547cbae 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; |