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 09/19] perf tools: Fix 32-bit cross build
Date: Fri, 18 Oct 2013 15:29:06 +0300 [thread overview]
Message-ID: <1382099356-4918-10-git-send-email-adrian.hunter@intel.com> (raw)
In-Reply-To: <1382099356-4918-1-git-send-email-adrian.hunter@intel.com>
Setting EXTRA_CFLAGS=-m32 did not work because CFLAGS
was not passed around.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
tools/perf/Makefile.perf | 2 +-
tools/perf/config/Makefile | 4 ++--
tools/perf/config/feature-checks/Makefile | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index c873e03..699cdb7 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -706,7 +706,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)
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index c516d6b..c94a06b 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -92,7 +92,7 @@ endif
feature_check = $(eval $(feature_check_code))
define feature_check_code
- feature-$(1) := $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) 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="$(CFLAGS)" LDFLAGS=$(LDFLAGS) -C config/feature-checks test-$1 >/dev/null 2>/dev/null && echo 1 || echo 0)
endef
feature_set = $(eval $(feature_set_code))
@@ -169,7 +169,7 @@ ifeq ($(feature-all), 1)
#
$(foreach feat,$(CORE_FEATURE_TESTS),$(call feature_set,$(feat)))
else
- $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) LDFLAGS=$(LDFLAGS) -i -j -C config/feature-checks $(CORE_FEATURE_TESTS) >/dev/null 2>&1)
+ $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CFLAGS="$(CFLAGS)" LDFLAGS=$(LDFLAGS) -i -j -C config/feature-checks $(CORE_FEATURE_TESTS) >/dev/null 2>&1)
$(foreach feat,$(CORE_FEATURE_TESTS),$(call feature_check,$(feat)))
endif
diff --git a/tools/perf/config/feature-checks/Makefile b/tools/perf/config/feature-checks/Makefile
index 452b67c..353c00c 100644
--- a/tools/perf/config/feature-checks/Makefile
+++ b/tools/perf/config/feature-checks/Makefile
@@ -31,7 +31,7 @@ CC := $(CC) -MD
all: $(FILES)
-BUILD = $(CC) $(LDFLAGS) -o $(OUTPUT)$@ $@.c
+BUILD = $(CC) $(CFLAGS) $(LDFLAGS) -o $(OUTPUT)$@ $@.c
###############################
--
1.7.11.7
next prev parent reply other threads:[~2013-10-18 12:33 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-18 12:28 [PATCH 00/19] perf tools: fixes and tweaks Adrian Hunter
2013-10-18 12:28 ` [PATCH 01/19] perf evsel: Add missing 'mmap2' from debug print Adrian Hunter
2013-10-23 7:53 ` [tip:perf/core] " tip-bot for Adrian Hunter
2013-10-18 12:28 ` [PATCH 02/19] perf evsel: Add a debug print if perf_event_open fails Adrian Hunter
2013-10-18 12:29 ` [PATCH 03/19] perf record: Improve write_output error message Adrian Hunter
2013-10-20 20:43 ` Jiri Olsa
2013-10-21 6:07 ` Adrian Hunter
2013-10-21 8:48 ` Jiri Olsa
2013-10-23 7:53 ` [tip:perf/core] " tip-bot for Adrian Hunter
2013-10-18 12:29 ` [PATCH 04/19] perf evsel: Add missing decrement in id sample parsing Adrian Hunter
2013-10-20 20:44 ` Jiri Olsa
2013-10-23 7:53 ` [tip:perf/core] " tip-bot for Adrian Hunter
2013-10-18 12:29 ` [PATCH 05/19] perf session: Add missing sample flush for piped events Adrian Hunter
2013-10-20 20:45 ` Jiri Olsa
2013-10-23 7:53 ` [tip:perf/core] " tip-bot for Adrian Hunter
2013-10-18 12:29 ` [PATCH 06/19] perf session: Add missing members to perf_event__attr_swap() Adrian Hunter
2013-10-20 20:47 ` Jiri Olsa
2013-10-23 7:53 ` [tip:perf/core] " tip-bot for Adrian Hunter
2013-10-18 12:29 ` [PATCH 07/19] perf script: Set up output options for in-stream attributes Adrian Hunter
2013-10-18 13:30 ` David Ahern
2013-10-18 14:32 ` Arnaldo Carvalho de Melo
2013-10-22 7:35 ` Adrian Hunter
2013-10-18 12:29 ` [PATCH 08/19] perf inject: Do not repipe attributes to a perf.data file Adrian Hunter
2013-10-18 12:29 ` Adrian Hunter [this message]
2013-10-20 20:42 ` [PATCH 09/19] perf tools: Fix 32-bit cross build Jiri Olsa
2013-10-21 5:53 ` Adrian Hunter
2013-10-21 8:46 ` Jiri Olsa
2013-10-21 9:02 ` Adrian Hunter
2013-10-21 14:12 ` Arnaldo Carvalho de Melo
2013-10-21 18:29 ` Adrian Hunter
2013-10-18 12:29 ` [PATCH 10/19] perf evlist: Fix 32-bit build error Adrian Hunter
2013-10-23 7:53 ` [tip:perf/core] " tip-bot for Adrian Hunter
2013-10-18 12:29 ` [PATCH 11/19] perf tools: Fix test_on_exit for 32-bit build Adrian Hunter
2013-10-23 7:53 ` [tip:perf/core] " tip-bot for Adrian Hunter
2013-10-18 12:29 ` [PATCH 12/19] perf tools: Fix bench/numa.c " Adrian Hunter
2013-10-23 7:54 ` [tip:perf/core] " tip-bot for Adrian Hunter
2013-10-18 12:29 ` [PATCH 13/19] perf tools: Fix libunwind build and feature detection " Adrian Hunter
2013-10-20 20:43 ` Jiri Olsa
2013-10-21 14:14 ` Arnaldo Carvalho de Melo
2013-10-22 7:40 ` Adrian Hunter
2013-10-18 12:29 ` [PATCH 14/19] perf evlist: Add a debug print if event buffer mmap fails Adrian Hunter
2013-10-20 20:43 ` Jiri Olsa
2013-10-18 12:29 ` [PATCH 15/19] perf tools: fix perf_evlist__mmap comments Adrian Hunter
2013-10-23 7:54 ` [tip:perf/core] perf evlist: Fix " tip-bot for Adrian Hunter
2013-10-18 12:29 ` [PATCH 16/19] perf tools: factor out duplicated evlist mmap code Adrian Hunter
2013-10-23 7:54 ` [tip:perf/core] perf evlist: Factor out duplicated " tip-bot for Adrian Hunter
2013-10-18 12:29 ` [PATCH 17/19] perf script: print addr by default for BTS Adrian Hunter
2013-10-18 18:20 ` David Ahern
2013-10-23 7:54 ` [tip:perf/core] perf script: Print " tip-bot for Adrian Hunter
2013-10-18 12:29 ` [PATCH 18/19] perf record: add an option to force per-cpu mmaps Adrian Hunter
2013-10-18 12:29 ` [PATCH 19/19] perf tools: allow non-matching sample types Adrian Hunter
2013-10-18 14:25 ` David Ahern
2013-10-18 14:50 ` Adrian Hunter
2013-10-18 15:03 ` David Ahern
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=1382099356-4918-10-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).