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 <[email protected]>
Tested-by: Arnaldo Carvalho de Melo <[email protected]>
Acked-by: Peter Foley <[email protected]>
Cc: Wang Nan <[email protected]>
Link: http://lkml.kernel.org/r/20161201130025.GA16430@krava
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>

diff --git a/tools/build/fixdep.c b/tools/build/fixdep.c
index 1521d36cef0dff64f5d11f56044430badc8b92d3..734d1547cbaed61820a2b4563680d21a04aa527a 100644 (file)
--- 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;