diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-20 13:23:55 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-20 13:23:55 +0200 |
| commit | d499c106843afa0703a68c64662bf42a16421aec (patch) | |
| tree | b64a92cfbc543e9a8f92a9a85bd05da89553e54e /tools/lib | |
| parent | aa891009ee8863944a96ba4a348102f3d5f5f931 (diff) | |
| parent | 2d8e405acd787f4b975f73e0f8d9804b272c00f0 (diff) | |
| download | linux-d499c106843afa0703a68c64662bf42a16421aec.tar.gz linux-d499c106843afa0703a68c64662bf42a16421aec.tar.bz2 linux-d499c106843afa0703a68c64662bf42a16421aec.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:
User visible changes:
- Fix "Command" sort_entry's cmp and collapse function (Jiri Olsa)
- Load map's symtab before 'perf probe' glob matching (Wang Nan)
- Set vmlinux_path__nr_entries to 0 in vmlinux_path__exit, to fix
the use case where this code is called multiple times, which wasn't
that common when it was introduced but seems to be now (Wang Nan).
Infrastructure changes:
- Protect dso symtab and cache operations with a mutex (Namhyung Kim)
- Make all refcnt operations use atomic.h (Arnaldo Carvalho de Melo)
- Install libtraceevent.a into libdir (Wang Nan)
Build fixes:
- Fix one build failure on RHEL5 by making 'perf bench numa' use the
__weak sched_getcpu() provided by cloexec.h (Arnaldo Carvalho de Melo)
- Fix dwarf-aux.c compilation on i386 (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')
| -rw-r--r-- | tools/lib/traceevent/Makefile | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile index d410da335e3d..84640394ebf9 100644 --- a/tools/lib/traceevent/Makefile +++ b/tools/lib/traceevent/Makefile @@ -34,9 +34,15 @@ INSTALL = install DESTDIR ?= DESTDIR_SQ = '$(subst ','\'',$(DESTDIR))' +LP64 := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1) +ifeq ($(LP64), 1) + libdir_relative = lib64 +else + libdir_relative = lib +endif + prefix ?= /usr/local -bindir_relative = bin -bindir = $(prefix)/$(bindir_relative) +libdir = $(prefix)/$(libdir_relative) man_dir = $(prefix)/share/man man_dir_SQ = '$(subst ','\'',$(man_dir))' @@ -58,7 +64,7 @@ ifeq ($(prefix),$(HOME)) override plugin_dir = $(HOME)/.traceevent/plugins set_plugin_dir := 0 else -override plugin_dir = $(prefix)/lib/traceevent/plugins +override plugin_dir = $(libdir)/traceevent/plugins endif endif @@ -85,11 +91,11 @@ srctree := $(patsubst %/,%,$(dir $(srctree))) #$(info Determined 'srctree' to be $(srctree)) endif -export prefix bindir src obj +export prefix libdir src obj # Shell quotes -bindir_SQ = $(subst ','\'',$(bindir)) -bindir_relative_SQ = $(subst ','\'',$(bindir_relative)) +libdir_SQ = $(subst ','\'',$(libdir)) +libdir_relative_SQ = $(subst ','\'',$(libdir_relative)) plugin_dir_SQ = $(subst ','\'',$(plugin_dir)) LIB_FILE = libtraceevent.a libtraceevent.so @@ -240,7 +246,7 @@ endef install_lib: all_cmd install_plugins $(call QUIET_INSTALL, $(LIB_FILE)) \ - $(call do_install,$(LIB_FILE),$(bindir_SQ)) + $(call do_install,$(LIB_FILE),$(libdir_SQ)) install_plugins: $(PLUGINS) $(call QUIET_INSTALL, trace_plugins) \ |