diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-11-04 21:14:04 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-11-04 21:14:04 +0100 |
| commit | 87968f94fbea47df334502a0db645833ce8a848b (patch) | |
| tree | a8acb87cf151aed23aa0f64d2f78567b6eaffc75 /tools/perf/Makefile.perf | |
| parent | 2a3ede8cb2ddee5885518e4232aca13056f9a6e0 (diff) | |
| parent | 6d862b8c14ba539c7c87ffc77f2e1d6dc9630c4d (diff) | |
| download | linux-87968f94fbea47df334502a0db645833ce8a848b.tar.gz linux-87968f94fbea47df334502a0db645833ce8a848b.tar.bz2 linux-87968f94fbea47df334502a0db645833ce8a848b.zip | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
* Add new COMM infrastructure, further improving histogram processing, from
Frédéric Weisbecker, one fix from Namhyung Kim.
* Enhance option parse error message, showing just the help lines of the
options affected, from Namhyung Kim.
* Fixup PERF_SAMPLE_TRANSACTION handling in sample synthesizing and
'perf test', from Adrian Hunter.
* Set up output options for in-stream attributes, from Adrian Hunter.
* Fix 32-bit cross build, from Adrian Hunter.
* Fix libunwind build and feature detection for 32-bit build, from Adrian Hunter.
* Always use perf_evsel__set_sample_bit to set sample_type, from Adrian Hunter.
perf evlist: Add a debug print if event buffer mmap fails
* Add missing data.h into LIB_H headers, fix from Jiri Olsa.
* libtraceevent updates from upstream trace-cmd repo, from Steven Rostedt.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/Makefile.perf')
| -rw-r--r-- | tools/perf/Makefile.perf | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 8a9ca3836043..5b8639025aae 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -273,6 +273,7 @@ LIB_H += util/color.h LIB_H += util/values.h LIB_H += util/sort.h LIB_H += util/hist.h +LIB_H += util/comm.h LIB_H += util/thread.h LIB_H += util/thread_map.h LIB_H += util/trace-event.h @@ -295,6 +296,7 @@ LIB_H += ui/helpline.h LIB_H += ui/progress.h LIB_H += ui/util.h LIB_H += ui/ui.h +LIB_H += util/data.h LIB_OBJS += $(OUTPUT)util/abspath.o LIB_OBJS += $(OUTPUT)util/alias.o @@ -340,6 +342,7 @@ LIB_OBJS += $(OUTPUT)util/machine.o LIB_OBJS += $(OUTPUT)util/map.o LIB_OBJS += $(OUTPUT)util/pstack.o LIB_OBJS += $(OUTPUT)util/session.o +LIB_OBJS += $(OUTPUT)util/comm.o LIB_OBJS += $(OUTPUT)util/thread.o LIB_OBJS += $(OUTPUT)util/thread_map.o LIB_OBJS += $(OUTPUT)util/trace-event-parse.o @@ -708,7 +711,7 @@ $(LIB_FILE): $(LIB_OBJS) TE_SOURCES = $(wildcard $(TRACE_EVENT_DIR)*.[ch]) $(LIBTRACEEVENT): $(TE_SOURCES) - $(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(QUIET_SUBDIR1) O=$(OUTPUT) libtraceevent.a + $(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(QUIET_SUBDIR1) O=$(OUTPUT) CFLAGS="-g -Wall $(EXTRA_CFLAGS)" libtraceevent.a $(LIBTRACEEVENT)-clean: $(call QUIET_CLEAN, libtraceevent) |