diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-09-29 03:43:46 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-09-29 03:43:46 -0400 |
| commit | 9c17dbc6eb73bdd8a6aaea1baefd37ff78d86148 (patch) | |
| tree | 5b303f98bc8898f26d2445138904f2fb14403a2d /tools/lib/api/Makefile | |
| parent | 18ab2cd3ee9d52dc64c5ae984146a261a328c4e8 (diff) | |
| parent | e637d17757a10732fa5d573c18f20b3cd4d31245 (diff) | |
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:
- Accept a zero --itrace period, meaning "as often as possible". In the case
of Intel PT that is the same as a period of 1 and a unit of 'instructions'
(i.e. --itrace=i1i). (Adrian Hunter)
- Harmonize itrace's synthesized callchains with the existing --max-stack
tool option. (Adrian Hunter)
- Allow time to be displayed in nanoseconds in 'perf script'. (Adrian Hunter)
- Fix potential infinite loop when handling Intel PT timestamps. (Adrian Hunter)
- Slighly improve Intel PT debug logging. (Adrian Hunter)
- Warn when AUX data has been lost, just like when processing PERF_RECORD_LOST.
(Adrian Hunter)
- Further document export-to-postgresql.py script. (Adrian Hunter)
- Add option to synthesize branch stack from auxtrace data. (Adrian Hunter)
- Use equivalent logic to avoid using dso->kernel. (Arnaldo Carvalho de Melo)
- Show proper error messages when parsing bad terms for hw/sw events. (He Kuang)
- Tracepoint event parsing improvements. (He Kuang)
- Store tracing mountpoint for better error message. (Jiri Olsa)
- Add fixdep to tools/build, bringing it closer to the kernel counterpart, from
where it is being lifted. (Jiri Olsa)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/lib/api/Makefile')
| -rw-r--r-- | tools/lib/api/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/lib/api/Makefile b/tools/lib/api/Makefile index fe1b02c2c95b..d85904dc9b38 100644 --- a/tools/lib/api/Makefile +++ b/tools/lib/api/Makefile | |||
| @@ -21,12 +21,14 @@ CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 | |||
| 21 | 21 | ||
| 22 | RM = rm -f | 22 | RM = rm -f |
| 23 | 23 | ||
| 24 | build := -f $(srctree)/tools/build/Makefile.build dir=. obj | ||
| 25 | API_IN := $(OUTPUT)libapi-in.o | 24 | API_IN := $(OUTPUT)libapi-in.o |
| 26 | 25 | ||
| 26 | all: | ||
| 27 | |||
| 27 | export srctree OUTPUT CC LD CFLAGS V | 28 | export srctree OUTPUT CC LD CFLAGS V |
| 29 | include $(srctree)/tools/build/Makefile.include | ||
| 28 | 30 | ||
| 29 | all: $(LIBFILE) | 31 | all: fixdep $(LIBFILE) |
| 30 | 32 | ||
| 31 | $(API_IN): FORCE | 33 | $(API_IN): FORCE |
| 32 | @$(MAKE) $(build)=libapi | 34 | @$(MAKE) $(build)=libapi |