diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-03-04 00:35:43 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-03-04 00:35:43 -0500 |
| commit | d2c032e3dc58137a7261a7824d3acce435db1d66 (patch) | |
| tree | 7eea1c7c6103eefe879f07472eec99b3c41eb792 /tools/perf/util/symbol-elf.c | |
| parent | 7e8e385aaf6ed5b64b5d9108081cfcdcdd021b78 (diff) | |
| parent | 13a7a6ac0a11197edcd0f756a035f472b42cdf8b (diff) | |
Merge tag 'v4.0-rc2' into x86/asm, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/symbol-elf.c')
| -rw-r--r-- | tools/perf/util/symbol-elf.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c index b24f9d8727a8..33b7a2aef713 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c | |||
| @@ -11,6 +11,11 @@ | |||
| 11 | #include <symbol/kallsyms.h> | 11 | #include <symbol/kallsyms.h> |
| 12 | #include "debug.h" | 12 | #include "debug.h" |
| 13 | 13 | ||
| 14 | #ifndef EM_AARCH64 | ||
| 15 | #define EM_AARCH64 183 /* ARM 64 bit */ | ||
| 16 | #endif | ||
| 17 | |||
| 18 | |||
| 14 | #ifdef HAVE_CPLUS_DEMANGLE_SUPPORT | 19 | #ifdef HAVE_CPLUS_DEMANGLE_SUPPORT |
| 15 | extern char *cplus_demangle(const char *, int); | 20 | extern char *cplus_demangle(const char *, int); |
| 16 | 21 | ||