Messages in this thread Patch in this message | | | Date | Thu, 4 May 2017 10:50:21 -0700 | From | tip-bot for Kim Phillips <> | Subject | [tip:perf/urgent] perf annotate: Fix AArch64 comment char |
| |
Commit-ID: d1f7b0234ec7743899321aaaba379b2f5f9d0500 Gitweb: http://git.kernel.org/tip/d1f7b0234ec7743899321aaaba379b2f5f9d0500 Author: Kim Phillips <kim.phillips@arm.com> AuthorDate: Wed, 3 May 2017 13:13:56 +0100 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitDate: Thu, 4 May 2017 10:03:00 -0300
perf annotate: Fix AArch64 comment char
The commit 0fcb1da4aba "perf annotate: AArch64 support" blindly copied the comment character from the original:
https://lkml.org/lkml/2016/5/19/461
whereas that same commit shows objdump output utilizing the C++ style "//" as the comment delimeter. Since '/' doesn't occur elsewhere in objdump output, we retain the single character check, but fix it to be '/'.
Signed-off-by: Kim Phillips <kim.phillips@arm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Chris Riyder <chris.ryder@arm.com> Cc: Peter Zijlstra <peterz@infradead.org> Fixes: 0fcb1da4aba6 ("perf annotate: AArch64 support") Link: http://lkml.kernel.org/r/20170503131356.be88f977094fb3fa0f49b99d@arm.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/perf/arch/arm64/annotate/instructions.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/arch/arm64/annotate/instructions.c b/tools/perf/arch/arm64/annotate/instructions.c index 44eafd6..8f19087 100644 --- a/tools/perf/arch/arm64/annotate/instructions.c +++ b/tools/perf/arch/arm64/annotate/instructions.c @@ -50,7 +50,7 @@ static int arm64__annotate_init(struct arch *arch) arch->initialized = true; arch->priv = arm; arch->associate_instruction_ops = arm64__associate_instruction_ops; - arch->objdump.comment_char = ';'; + arch->objdump.comment_char = '/'; arch->objdump.skip_functions_char = '+'; return 0;
| |