From: Adrian Hunter <adrian.hunter@intel.com>
To: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>,
Ingo Molnar <mingo@redhat.com>,
linux-kernel@vger.kernel.org, David Ahern <dsahern@gmail.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Jiri Olsa <jolsa@redhat.com>, Mike Galbraith <efault@gmx.de>,
Namhyung Kim <namhyung@gmail.com>,
Paul Mackerras <paulus@samba.org>,
Stephane Eranian <eranian@google.com>
Subject: [PATCH V2 07/14] perf tools: Fix libunwind build and feature detection for 32-bit build
Date: Tue, 22 Oct 2013 10:34:11 +0300 [thread overview]
Message-ID: <1382427258-17495-8-git-send-email-adrian.hunter@intel.com> (raw)
In-Reply-To: <1382427258-17495-1-git-send-email-adrian.hunter@intel.com>
Use -lunwind-x86 instead of -lunwind-x86_64 for
32-bit build.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
---
tools/perf/config/Makefile | 6 ++++--
tools/perf/config/feature-checks/Makefile | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 2f1d7d7..ffb5f55 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -25,9 +25,11 @@ ifeq ($(ARCH),x86_64)
RAW_ARCH := x86_64
CFLAGS += -DHAVE_ARCH_X86_64_SUPPORT
ARCH_INCLUDE = ../../arch/x86/lib/memcpy_64.S ../../arch/x86/lib/memset_64.S
+ LIBUNWIND_LIBS = -lunwind -lunwind-x86_64
+ else
+ LIBUNWIND_LIBS = -lunwind -lunwind-x86
endif
NO_PERF_REGS := 0
- LIBUNWIND_LIBS = -lunwind -lunwind-x86_64
endif
ifeq ($(NO_PERF_REGS),0)
@@ -96,7 +98,7 @@ endif
feature_check = $(eval $(feature_check_code))
define feature_check_code
- feature-$(1) := $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS=$(LDFLAGS) -C config/feature-checks test-$1 >/dev/null 2>/dev/null && echo 1 || echo 0)
+ feature-$(1) := $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS=$(LDFLAGS) LIBUNWIND_LIBS="$(LIBUNWIND_LIBS)" -C config/feature-checks test-$1 >/dev/null 2>/dev/null && echo 1 || echo 0)
endef
feature_set = $(eval $(feature_set_code))
diff --git a/tools/perf/config/feature-checks/Makefile b/tools/perf/config/feature-checks/Makefile
index 353c00c..d37d58d 100644
--- a/tools/perf/config/feature-checks/Makefile
+++ b/tools/perf/config/feature-checks/Makefile
@@ -36,7 +36,7 @@ BUILD = $(CC) $(CFLAGS) $(LDFLAGS) -o $(OUTPUT)$@ $@.c
###############################
test-all:
- $(BUILD) -Werror -fstack-protector -fstack-protector-all -O2 -Werror -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lunwind -lunwind-x86_64 -lelf -laudit -I/usr/include/slang -lslang $(shell pkg-config --libs --cflags gtk+-2.0 2>/dev/null) $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl
+ $(BUILD) -Werror -fstack-protector -fstack-protector-all -O2 -Werror -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma $(LIBUNWIND_LIBS) -lelf -laudit -I/usr/include/slang -lslang $(shell pkg-config --libs --cflags gtk+-2.0 2>/dev/null) $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl
test-hello:
$(BUILD)
@@ -72,7 +72,7 @@ test-libnuma:
$(BUILD) -lnuma
test-libunwind:
- $(BUILD) -lunwind -lunwind-x86_64 -lelf
+ $(BUILD) $(LIBUNWIND_LIBS) -lelf
test-libaudit:
$(BUILD) -laudit
--
1.7.11.7
next prev parent reply other threads:[~2013-10-22 7:35 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-22 7:34 [PATCH V2 00/14] perf tools: fixes and tweaks Adrian Hunter
2013-10-22 7:34 ` [PATCH V2 01/14] perf tools: Fix non-debug build Adrian Hunter
2013-10-25 10:32 ` [tip:perf/core] " tip-bot for Adrian Hunter
2013-10-22 7:34 ` [PATCH V2 02/14] perf evsel: Add a debug print if perf_event_open fails Adrian Hunter
2013-10-22 7:34 ` [PATCH V2 03/14] perf script: Make perf_script a local variable Adrian Hunter
2013-10-23 5:55 ` David Ahern
2013-10-25 10:32 ` [tip:perf/core] " tip-bot for Adrian Hunter
2013-10-22 7:34 ` [PATCH V2 04/14] perf script: Set up output options for in-stream attributes Adrian Hunter
2013-10-23 6:15 ` David Ahern
2013-10-23 6:41 ` Adrian Hunter
2013-10-22 7:34 ` [PATCH V2 05/14] perf inject: Do not repipe attributes to a perf.data file Adrian Hunter
2013-10-25 10:32 ` [tip:perf/core] " tip-bot for Adrian Hunter
2013-10-22 7:34 ` [PATCH V2 06/14] perf tools: Fix 32-bit cross build Adrian Hunter
2013-10-22 7:34 ` Adrian Hunter [this message]
2013-10-22 7:34 ` [PATCH V2 08/14] perf evlist: Add a debug print if event buffer mmap fails Adrian Hunter
2013-10-22 7:34 ` [PATCH V2 09/14] perf record: Add an option to force per-cpu mmaps Adrian Hunter
2013-10-22 7:34 ` [PATCH V2 10/14] perf tools: Allow non-matching sample types Adrian Hunter
2013-10-22 7:34 ` [PATCH V2 11/14] perf sched: Make struct perf_sched sched a local variable Adrian Hunter
2013-10-23 6:43 ` David Ahern
2013-10-23 13:16 ` Arnaldo Carvalho de Melo
2013-10-25 10:32 ` [tip:perf/core] " tip-bot for Adrian Hunter
2013-10-22 7:34 ` [PATCH V2 12/14] perf sched: Fix optimized build time Adrian Hunter
2013-10-23 6:44 ` David Ahern
2013-10-23 13:17 ` Arnaldo Carvalho de Melo
2013-10-25 10:32 ` [tip:perf/core] perf sched: Optimize " tip-bot for Adrian Hunter
2013-10-22 7:34 ` [PATCH V2 13/14] perf tools: Do not accept parse_tag_value() overflow Adrian Hunter
2013-10-25 10:32 ` [tip:perf/core] " tip-bot for Adrian Hunter
2013-10-22 7:34 ` [PATCH V2 14/14] perf tools: Validate that mmap_pages is not too big Adrian Hunter
2013-10-25 10:32 ` [tip:perf/core] perf evlist: " tip-bot for Adrian Hunter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1382427258-17495-8-git-send-email-adrian.hunter@intel.com \
--to=adrian.hunter@intel.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@ghostprotocols.net \
--cc=dsahern@gmail.com \
--cc=efault@gmx.de \
--cc=eranian@google.com \
--cc=fweisbec@gmail.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@gmail.com \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).