[PATCH 19/34] perf kbuild: remove legacy backtrace-related build variable

From: Alexis Berlemont
Date: Tue May 13 2014 - 18:06:19 EST


Remove HAVE_BACKTRACE_SUPPORT (replaced by CONFIG_BACKTRACE)
---
tools/perf/Kconfig | 1 -
tools/perf/config/Makefile | 6 +++---
tools/perf/util/util.c | 5 +++--
3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/perf/Kconfig b/tools/perf/Kconfig
index 34a8b09..fad1c48 100644
--- a/tools/perf/Kconfig
+++ b/tools/perf/Kconfig
@@ -244,7 +244,6 @@ config LIBUNWIND_DIR
---help---
libunwind directory

-
config NUMA
bool "Numa support (bench)"
default n
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index c128f30..4a21452 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -572,9 +572,9 @@ ifdef CONFIG_ON_EXIT
endif
endif

-ifndef NO_BACKTRACE
- ifeq ($(feature-backtrace), 1)
- CFLAGS += -DHAVE_BACKTRACE_SUPPORT
+ifdef CONFIG_BACKTRACE
+ ifneq ($(feature-backtrace), 1)
+ $(shell $(KCONFIG_SCRIPT) -d CONFIG_BACKTRACE)
endif
endif

diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
index 9f66549..6b5db6d 100644
--- a/tools/perf/util/util.c
+++ b/tools/perf/util/util.c
@@ -1,8 +1,9 @@
+#include "generated/autoconf.h"
#include "../perf.h"
#include "util.h"
#include <api/fs/fs.h>
#include <sys/mman.h>
-#ifdef HAVE_BACKTRACE_SUPPORT
+#ifdef CONFIG_BACKTRACE
#include <execinfo.h>
#endif
#include <stdio.h>
@@ -237,7 +238,7 @@ int hex2u64(const char *ptr, u64 *long_val)
}

/* Obtain a backtrace and print it to stdout. */
-#ifdef HAVE_BACKTRACE_SUPPORT
+#ifdef CONFIG_BACKTRACE
void dump_stack(void)
{
void *array[16];
--
1.9.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/