perf jvmti: Include JVMTI support for s390

Enable JVMTI support for s390 perf tool chain.

Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Hendrik Brueckner <brueckner@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Link: http://lore.kernel.org/lkml/20190909114116.50469-3-tmricht@linux.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/arch/s390/Makefile b/tools/perf/arch/s390/Makefile
index cb19878..6ac8887 100644 (file)
--- a/tools/perf/arch/s390/Makefile
+++ b/tools/perf/arch/s390/Makefile
@@ -4,6 +4,7 @@ PERF_HAVE_DWARF_REGS := 1
 endif
 HAVE_KVM_STAT_SUPPORT := 1
 PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1
 endif
 HAVE_KVM_STAT_SUPPORT := 1
 PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1

+PERF_HAVE_JITDUMP := 1

 
 #
 # Syscall table generation for perf
 
 #
 # Syscall table generation for perf

diff --git a/tools/perf/util/genelf.h b/tools/perf/util/genelf.h
index b72440b..d413755 100644 (file)
--- a/tools/perf/util/genelf.h
+++ b/tools/perf/util/genelf.h
@@ -35,6 +35,9 @@ int jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_ent
 #elif defined(__sparc__)
 #define GEN_ELF_ARCH   EM_SPARC
 #define GEN_ELF_CLASS  ELFCLASS32
 #elif defined(__sparc__)
 #define GEN_ELF_ARCH   EM_SPARC
 #define GEN_ELF_CLASS  ELFCLASS32

+#elif defined(__s390x__)
+#define GEN_ELF_ARCH   EM_S390
+#define GEN_ELF_CLASS  ELFCLASS64

 #else
 #error "unsupported architecture"
 #endif
 #else
 #error "unsupported architecture"
 #endif