From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753365AbdKIIRz (ORCPT ); Thu, 9 Nov 2017 03:17:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50422 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753123AbdKIIRy (ORCPT ); Thu, 9 Nov 2017 03:17:54 -0500 Date: Thu, 9 Nov 2017 09:17:49 +0100 From: Jiri Olsa To: Markus Trippelsdorf Cc: Ingo Molnar , Linus Torvalds , linux-kernel@vger.kernel.org, Peter Zijlstra , Arnaldo Carvalho de Melo , Thomas Gleixner , Andrew Morton , Jiri Olsa , Andi Kleen Subject: [PATCH] perf tools: Add reject option for parse-events.l Message-ID: <20171109081749.GA21513@krava> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit User-Agent: Mutt/1.9.1 (2017-09-22) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 09 Nov 2017 08:17:54 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Reply-To: In-Reply-To: <20171109081319.GB236@x4> On Thu, Nov 09, 2017 at 09:13:19AM +0100, Markus Trippelsdorf wrote: > On 2017.11.05 at 15:40 +0100, Ingo Molnar wrote: > > Linus, > > > > Please pull the latest perf-urgent-for-linus git tree from: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-for-linus > > > > Jiri Olsa (1): > > perf tools: Unwind properly location after REJECT > > The patch above breaks the build for me: > > util/parse-events.l: In function ‘parse_events_lex’: > util/parse-events-flex.c:4722:16: error: ‘reject_used_but_not_detected’ undeclared (first use in this function) > */ > ^ > util/parse-events.l:159:2: note: in expansion of macro ‘REJECT’ > REJECT > ^~~~~~ > util/parse-events.l:343:26: note: in expansion of macro ‘USER_REJECT’ > {bpf_source} { if (!isbpf(yyscanner)) USER_REJECT; return str(yyscanner, PE_BPF_SOURCE); } > ^~~~~~~~~~~ > util/parse-events-flex.c:4722:16: note: each undeclared identifier is reported only once for each function it appears in > */ > ^ > util/parse-events.l:159:2: note: in expansion of macro ‘REJECT’ > REJECT > ^~~~~~ > util/parse-events.l:343:26: note: in expansion of macro ‘USER_REJECT’ > {bpf_source} { if (!isbpf(yyscanner)) USER_REJECT; return str(yyscanner, PE_BPF_SOURCE); } > ^~~~~~~~~~~ > mv: cannot stat 'util/.parse-events-flex.o.tmp': No such file or directory sry, we have a fix in queue already jitka --- Arnaldo reported broken build under some distros due to flex no spotting the REJECT macro: CC /tmp/build/perf/util/parse-events-flex.o util/parse-events.l: In function 'parse_events_lex': /tmp/build/perf/util/parse-events-flex.c:4734:16: error: \ 'reject_used_but_not_detected' undeclared (first use in this function) It's happening because we put the REJECT under another USER_REJECT macro in following commit: 9445464bb831 perf tools: Unwind properly location after REJECT Fortunately flex provides option for force it to use REJECT, adding it to parse-events.l. Reported-by: Arnaldo Carvalho de Melo Reviewed-by: Andi Kleen Link: http://lkml.kernel.org/n/tip-7kdont984mw12ijk7rji6b8p@git.kernel.org Signed-off-by: Jiri Olsa --- tools/perf/util/parse-events.l | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/perf/util/parse-events.l b/tools/perf/util/parse-events.l index bd3bba9a2e81..42d697423a3e 100644 --- a/tools/perf/util/parse-events.l +++ b/tools/perf/util/parse-events.l @@ -5,6 +5,7 @@ %option stack %option bison-locations %option yylineno +%option reject %{ #include -- 2.13.6