Commit 85df3b37 authored by Vinson Lee's avatar Vinson Lee Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Fix build with bison 2.3 and older. 



The %name-prefix "prefix" syntax is not available on bison 2.3 and
older. Substitute with the -p "prefix" command-line option for
compatibility with older versions of bison.

This patch fixes this build error with older versions of bison.

    CC util/sysfs.o
    BISON util/pmu-bison.c
util/pmu.y:2.14-24: syntax error, unexpected string, expecting =
make: *** [util/pmu-bison.c] Error 1

Signed-off-by: default avatarVinson Lee <vlee@twitter.com>
Tested-by: default avatarLi Zefan <lizefan@huawei.com>
Cc: stable@vger.kernel.org # 3.4+
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Li Zefan <lizefan@huawei.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Pekka Enberg <penberg@kernel.org>
Link: http://lkml.kernel.org/r/1360792138-29186-1-git-send-email-vlee@twitter.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 02320931

tools/perf/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -296,13 +296,13 @@ $(OUTPUT)util/parse-events-flex.c: util/parse-events.l $(OUTPUT)util/parse-event 
	$(QUIET_FLEX)$(FLEX) --header-file=$(OUTPUT)util/parse-events-flex.h $(PARSER_DEBUG_FLEX) -t util/parse-events.l > $(OUTPUT)util/parse-events-flex.c



$(OUTPUT)util/parse-events-bison.c: util/parse-events.y

	$(QUIET_BISON)$(BISON) -v util/parse-events.y -d $(PARSER_DEBUG_BISON) -o $(OUTPUT)util/parse-events-bison.c

	$(QUIET_BISON)$(BISON) -v util/parse-events.y -d $(PARSER_DEBUG_BISON) -o $(OUTPUT)util/parse-events-bison.c -p parse_events_



$(OUTPUT)util/pmu-flex.c: util/pmu.l $(OUTPUT)util/pmu-bison.c

	$(QUIET_FLEX)$(FLEX) --header-file=$(OUTPUT)util/pmu-flex.h -t util/pmu.l > $(OUTPUT)util/pmu-flex.c



$(OUTPUT)util/pmu-bison.c: util/pmu.y

	$(QUIET_BISON)$(BISON) -v util/pmu.y -d -o $(OUTPUT)util/pmu-bison.c

	$(QUIET_BISON)$(BISON) -v util/pmu.y -d -o $(OUTPUT)util/pmu-bison.c -p perf_pmu_



$(OUTPUT)util/parse-events.o: $(OUTPUT)util/parse-events-flex.c $(OUTPUT)util/parse-events-bison.c

$(OUTPUT)util/pmu.o: $(OUTPUT)util/pmu-flex.c $(OUTPUT)util/pmu-bison.c

tools/perf/util/parse-events.y

+0 −1
Original line number Diff line number Diff line 
%pure-parser

%name-prefix "parse_events_"

%parse-param {void *_data}

%parse-param {void *scanner}

%lex-param {void* scanner}

tools/perf/util/pmu.y

+0 −1
Original line number Diff line number Diff line 


%name-prefix "perf_pmu_"

%parse-param {struct list_head *format}

%parse-param {char *name}

CRA Git | Maintained and supported by SUSTech CRA and CCSE