Commit 46dad054 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf jitdump: DWARF is also needed 

While building on a Docker container for ubuntu and installing package
by package one ends up with:

    MKDIR    /tmp/build/util/
    CC       /tmp/build/util/genelf.o
  util/genelf.c:22:19: fatal error: dwarf.h: No such file or directory
   #include <dwarf.h>
                   ^
  compilation terminated.
  mv: cannot stat '/tmp/build/util/.genelf.o.tmp': No such file or directory

Because the jitdump code needs the DWARF related development packages to
be installed. So make it dependent on that so that the build can succeed
without jitdump support.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-le498robnmxd40237wej3w62@git.kernel.org


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

tools/perf/builtin-inject.c

+5 −5
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static int perf_event__repipe_oe_synth(struct perf_tool *tool, 
	return perf_event__repipe_synth(tool, event);

}



#ifdef HAVE_LIBELF_SUPPORT

#if defined(HAVE_LIBELF_SUPPORT) && defined(HAVE_DWARF_SUPPORT)

static int perf_event__drop_oe(struct perf_tool *tool __maybe_unused,

			       union perf_event *event __maybe_unused,

			       struct ordered_events *oe __maybe_unused)
@@ -245,7 +245,7 @@ static int perf_event__repipe_mmap(struct perf_tool *tool, 
	return err;

}



#ifdef HAVE_LIBELF_SUPPORT

#if defined(HAVE_LIBELF_SUPPORT) && defined(HAVE_DWARF_SUPPORT)

static int perf_event__jit_repipe_mmap(struct perf_tool *tool,

				       union perf_event *event,

				       struct perf_sample *sample,
@@ -283,7 +283,7 @@ static int perf_event__repipe_mmap2(struct perf_tool *tool, 
	return err;

}



#ifdef HAVE_LIBELF_SUPPORT

#if defined(HAVE_LIBELF_SUPPORT) && defined(HAVE_DWARF_SUPPORT)

static int perf_event__jit_repipe_mmap2(struct perf_tool *tool,

					union perf_event *event,

					struct perf_sample *sample,
@@ -795,7 +795,7 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused) 
		"perf inject [<options>]",

		NULL

	};

#ifndef HAVE_LIBELF_SUPPORT

#if !defined(HAVE_LIBELF_SUPPORT) || !defined(HAVE_DWARF_SUPPORT)

	set_option_nobuild(options, 'j', "jit", "NO_LIBELF=1", true);

#endif

	argc = parse_options(argc, argv, options, inject_usage, 0);
@@ -833,7 +833,7 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused) 
		inject.tool.ordered_events = true;

		inject.tool.ordering_requires_timestamps = true;

	}

#ifdef HAVE_LIBELF_SUPPORT

#if defined(HAVE_LIBELF_SUPPORT) && defined(HAVE_DWARF_SUPPORT)

	if (inject.jit_mode) {

		inject.tool.mmap2	   = perf_event__jit_repipe_mmap2;

		inject.tool.mmap	   = perf_event__jit_repipe_mmap;

tools/perf/util/Build

+3 −0
Original line number Diff line number Diff line
@@ -107,9 +107,12 @@ libperf-y += scripting-engines/ 
libperf-$(CONFIG_ZLIB) += zlib.o

libperf-$(CONFIG_LZMA) += lzma.o

libperf-y += demangle-java.o



ifdef CONFIG_DWARF

libperf-$(CONFIG_LIBELF) += jitdump.o

libperf-$(CONFIG_LIBELF) += genelf.o

libperf-$(CONFIG_LIBELF) += genelf_debug.o

endif



CFLAGS_config.o   += -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"

# avoid compiler warnings in 32-bit mode

CRA Git | Maintained and supported by SUSTech CRA and CCSE