From 6532125fcb60985ffee888eab108bcb49197fecd Mon Sep 17 00:00:00 2001 From: Namhyung Kim Date: Tue, 2 Oct 2012 01:32:51 +0900 Subject: [PATCH] --- yaml --- r: 333956 b: refs/heads/master c: 4e34d9588b46f44a4dba718606913133f15e4b21 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/tools/perf/Makefile | 10 +++++----- trunk/tools/perf/util/util.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 83a74cd84cac..5849a0b1697a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d8061faca7a50010f037374410f0c3647c3ecf8 +refs/heads/master: 4e34d9588b46f44a4dba718606913133f15e4b21 diff --git a/trunk/tools/perf/Makefile b/trunk/tools/perf/Makefile index 5216ade909d0..f9126f89efef 100644 --- a/trunk/tools/perf/Makefile +++ b/trunk/tools/perf/Makefile @@ -45,6 +45,8 @@ include config/utilities.mak # # Define NO_LIBUNWIND if you do not want libunwind dependency for dwarf # backtrace post unwind. +# +# Define NO_BACKTRACE if you do not want stack backtrace debug feature $(OUTPUT)PERF-VERSION-FILE: .FORCE-PERF-VERSION-FILE @$(SHELL_PATH) util/PERF-VERSION-GEN $(OUTPUT) @@ -749,11 +751,9 @@ ifndef NO_STRLCPY endif endif -ifdef NO_BACKTRACE - BASIC_CFLAGS += -DNO_BACKTRACE -else - ifneq ($(call try-cc,$(SOURCE_BACKTRACE),),y) - BASIC_CFLAGS += -DNO_BACKTRACE +ifndef NO_BACKTRACE + ifeq ($(call try-cc,$(SOURCE_BACKTRACE),),y) + BASIC_CFLAGS += -DBACKTRACE_SUPPORT endif endif diff --git a/trunk/tools/perf/util/util.c b/trunk/tools/perf/util/util.c index 2055cf38041c..99664598bc1a 100644 --- a/trunk/tools/perf/util/util.c +++ b/trunk/tools/perf/util/util.c @@ -1,7 +1,7 @@ #include "../perf.h" #include "util.h" #include -#ifndef NO_BACKTRACE +#ifdef BACKTRACE_SUPPORT #include #endif #include @@ -165,7 +165,7 @@ size_t hex_width(u64 v) } /* Obtain a backtrace and print it to stdout. */ -#ifndef NO_BACKTRACE +#ifdef BACKTRACE_SUPPORT void dump_stack(void) { void *array[16];