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 V3 03/11] perf tools: Fix 32-bit cross build
Date: Fri, 1 Nov 2013 15:51:31 +0200 [thread overview]
Message-ID: <1383313899-15987-4-git-send-email-adrian.hunter@intel.com> (raw)
In-Reply-To: <1383313899-15987-1-git-send-email-adrian.hunter@intel.com>
Setting EXTRA_CFLAGS=-m32 did not work because it
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 bc7cfa1..f1cb389 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -709,7 +709,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 543aa95..2f1d7d7 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -96,7 +96,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="$(EXTRA_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))
@@ -173,7 +173,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="$(EXTRA_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-11-01 13:52 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-01 13:51 [PATCH V3 00/11] perf tools: fixes and tweaks Adrian Hunter
2013-11-01 13:51 ` [PATCH V3 01/11] perf evsel: Add a debug print if perf_event_open fails Adrian Hunter
2013-11-04 20:20 ` [tip:perf/core] " tip-bot for Adrian Hunter
2013-11-01 13:51 ` [PATCH V3 02/11] perf script: Set up output options for in-stream attributes Adrian Hunter
2013-11-04 20:20 ` [tip:perf/core] " tip-bot for Adrian Hunter
2013-11-01 13:51 ` Adrian Hunter [this message]
2013-11-04 20:20 ` [tip:perf/core] perf tools: Fix 32-bit cross build tip-bot for Adrian Hunter
2013-11-01 13:51 ` [PATCH V3 04/11] perf tools: Fix libunwind build and feature detection for 32-bit build Adrian Hunter
2013-11-04 20:20 ` [tip:perf/core] " tip-bot for Adrian Hunter
2013-11-01 13:51 ` [PATCH V3 05/11] perf evlist: Add a debug print if event buffer mmap fails Adrian Hunter
2013-11-04 20:20 ` [tip:perf/core] " tip-bot for Adrian Hunter
2013-11-01 13:51 ` [PATCH V3 06/11] perf record: Add an option to force per-cpu mmaps Adrian Hunter
[not found] ` <20131104152942.GA4004@krava.brq.redhat.com>
2013-11-05 8:28 ` Adrian Hunter
2013-11-05 9:42 ` Jiri Olsa
2013-11-05 13:09 ` Adrian Hunter
2013-11-05 13:30 ` Jiri Olsa
2013-11-05 14:25 ` Arnaldo Carvalho de Melo
2013-11-05 17:31 ` Arnaldo Carvalho de Melo
2013-11-08 7:57 ` Adrian Hunter
2013-11-08 8:40 ` Peter Zijlstra
2013-11-08 14:13 ` Arnaldo Carvalho de Melo
2013-11-11 12:06 ` Ingo Molnar
2013-11-13 2:48 ` Sukadev Bhattiprolu
2013-11-15 7:25 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2013-11-01 13:51 ` [PATCH V3 07/11] perf evsel: Always use perf_evsel__set_sample_bit() Adrian Hunter
2013-11-04 20:21 ` [tip:perf/core] perf evsel: Always use perf_evsel__set_sample_bit () tip-bot for Adrian Hunter
2013-11-01 13:51 ` [PATCH V3 08/11] perf evsel: Add missing overflow check Adrian Hunter
2013-11-04 20:21 ` [tip:perf/core] perf evsel: Add missing overflow check for TRANSACTION tip-bot for Adrian Hunter
2013-11-01 13:51 ` [PATCH V3 09/11] perf test: Update "sample parsing" test for PERF_SAMPLE_TRANSACTION Adrian Hunter
2013-11-04 20:21 ` [tip:perf/core] " tip-bot for Adrian Hunter
2013-11-01 13:51 ` [PATCH V3 10/11] perf evsel: Add missing PERF_SAMPLE_TRANSACTION Adrian Hunter
2013-11-04 20:21 ` [tip:perf/core] perf evsel: Synthesize PERF_SAMPLE_TRANSACTION tip-bot for Adrian Hunter
2013-11-01 13:51 ` [PATCH V3 11/11] perf tools: Allow non-matching sample types 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=1383313899-15987-4-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).