Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752262AbcLFIUa (ORCPT ); Tue, 6 Dec 2016 03:20:30 -0500 Received: from terminus.zytor.com ([198.137.202.10]:41914 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751609AbcLFIU0 (ORCPT ); Tue, 6 Dec 2016 03:20:26 -0500 Date: Tue, 6 Dec 2016 00:20:05 -0800 From: tip-bot for Jiri Olsa Message-ID: 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 Reply-To: tglx@linutronix.de, linux-kernel@vger.kernel.org, pefoley2@pefoley.com, acme@redhat.com, hpa@zytor.com, jolsa@redhat.com, mingo@kernel.org, wangnan0@huawei.com, jolsa@kernel.org In-Reply-To: <20161201130025.GA16430@krava> References: <20161201130025.GA16430@krava> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools build: Make fixdep parsing wait for last target Git-Commit-ID: 1cd6472e3f8d3fdee0fd19f7088807b284d3080f X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1775 Lines: 52 Commit-ID: 1cd6472e3f8d3fdee0fd19f7088807b284d3080f Gitweb: http://git.kernel.org/tip/1cd6472e3f8d3fdee0fd19f7088807b284d3080f Author: Jiri Olsa AuthorDate: Thu, 1 Dec 2016 14:00:25 +0100 Committer: Arnaldo Carvalho de Melo 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 Tested-by: Arnaldo Carvalho de Melo Acked-by: Peter Foley Cc: Wang Nan Link: http://lkml.kernel.org/r/20161201130025.GA16430@krava Signed-off-by: Arnaldo Carvalho de Melo --- 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;