| From vlee@twitter.com Fri Mar 1 11:21:19 2013 |
| From: Vinson Lee <vlee@twitter.com> |
| Date: Tue, 26 Feb 2013 18:30:30 -0800 |
| Subject: perf tools: Fix build with bison 2.3 and older. |
| To: stable@vger.kernel.org |
| Cc: Vinson Lee <vlee@twitter.com>, Ingo Molnar <mingo@redhat.com>, Jiri Olsa <jolsa@redhat.com>, Li Zefan <lizefan@huawei.com>, Namhyung Kim <namhyung@gmail.com>, Paul Mackerras <paulus@samba.org>, Pekka Enberg <penberg@kernel.org>, Arnaldo Carvalho de Melo <acme@redhat.com> |
| Message-ID: <1361932230-11746-1-git-send-email-vlee@twitter.com> |
| |
| From: Vinson Lee <vlee@twitter.com> |
| |
| commit 85df3b3769222894e9692b383c7af124b7721086 upstream. |
| |
| 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: Vinson Lee <vlee@twitter.com> |
| Tested-by: Li Zefan <lizefan@huawei.com> |
| 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: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| tools/perf/Makefile | 4 ++-- |
| tools/perf/util/parse-events.y | 1 - |
| tools/perf/util/pmu.y | 1 - |
| 3 files changed, 2 insertions(+), 4 deletions(-) |
| |
| --- a/tools/perf/Makefile |
| +++ b/tools/perf/Makefile |
| @@ -241,13 +241,13 @@ $(OUTPUT)util/parse-events-flex.c: util/ |
| $(QUIET_FLEX)$(FLEX) --header-file=$(OUTPUT)util/parse-events-flex.h -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 -o $(OUTPUT)util/parse-events-bison.c |
| + $(QUIET_BISON)$(BISON) -v util/parse-events.y -d -o $(OUTPUT)util/parse-events-bison.c -p parse_events_ |
| |
| $(OUTPUT)util/pmu-flex.c: util/pmu.l |
| $(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 |
| --- a/tools/perf/util/parse-events.y |
| +++ b/tools/perf/util/parse-events.y |
| @@ -1,5 +1,4 @@ |
| |
| -%name-prefix "parse_events_" |
| %parse-param {struct list_head *list_all} |
| %parse-param {struct list_head *list_event} |
| %parse-param {int *idx} |
| --- a/tools/perf/util/pmu.y |
| +++ b/tools/perf/util/pmu.y |
| @@ -1,5 +1,4 @@ |
| |
| -%name-prefix "perf_pmu_" |
| %parse-param {struct list_head *format} |
| %parse-param {char *name} |
| |