aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2010-01-12 05:58:29 -0500
committerIngo Molnar <mingo@elte.hu>2010-01-13 04:08:11 -0500
commit830395188fae5f4028fa3c38ab1b031aae18a64c (patch)
treeacf4bec52688051f3694b6857054175911131daf
parentc2c5d45d46c8c0fd34291dec958670ad4816796f (diff)
perf tools: Move QUIET_STDERR def to before first use
QUIET_STDERR is used when detecting if -fstack-protector-all can be used. Noticed while building the perf tools on a Debian PARISC64 machine. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Frédéric Weisbecker <fweisbec@gmail.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Paul Mackerras <paulus@samba.org> LKML-Reference: <1263293910-8484-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--tools/perf/Makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 652a470b5f74..07f596d29e9a 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -250,6 +250,12 @@ PTHREAD_LIBS = -lpthread
250# explicitly what architecture to check for. Fix this up for yours.. 250# explicitly what architecture to check for. Fix this up for yours..
251SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__ 251SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__
252 252
253ifeq ($(V), 2)
254 QUIET_STDERR = ">/dev/null"
255else
256 QUIET_STDERR = ">/dev/null 2>&1"
257endif
258
253ifeq ($(shell sh -c "echo 'int foo(void) {char X[2]; return 3;}' | $(CC) -x c -c -Werror -fstack-protector-all - -o /dev/null "$(QUIET_STDERR)" && echo y"), y) 259ifeq ($(shell sh -c "echo 'int foo(void) {char X[2]; return 3;}' | $(CC) -x c -c -Werror -fstack-protector-all - -o /dev/null "$(QUIET_STDERR)" && echo y"), y)
254 CFLAGS := $(CFLAGS) -fstack-protector-all 260 CFLAGS := $(CFLAGS) -fstack-protector-all
255endif 261endif
@@ -451,11 +457,6 @@ BUILTIN_OBJS += builtin-kmem.o
451 457
452PERFLIBS = $(LIB_FILE) 458PERFLIBS = $(LIB_FILE)
453 459
454ifeq ($(V), 2)
455 QUIET_STDERR = ">/dev/null"
456else
457 QUIET_STDERR = ">/dev/null 2>&1"
458endif
459# 460#
460# Platform specific tweaks 461# Platform specific tweaks
461# 462#