linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 06/14] perf tools: Fix 32-bit cross build
Date: Tue, 22 Oct 2013 10:34:10 +0300	[thread overview]
Message-ID: <1382427258-17495-7-git-send-email-adrian.hunter@intel.com> (raw)
In-Reply-To: <1382427258-17495-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 326a26e..e462598 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -707,7 +707,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


  parent reply	other threads:[~2013-10-22  7:38 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 ` Adrian Hunter [this message]
2013-10-22  7:34 ` [PATCH V2 07/14] perf tools: Fix libunwind build and feature detection for 32-bit build Adrian Hunter
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-7-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).