[PATCH 18/34] perf kbuild: remove legacy on_exit-related build variable

From: Alexis Berlemont
Date: Tue May 13 2014 - 18:10:47 EST


Remove HAVE_ON_EXIT_SUPPORT (replaced by CONFIG_ON_EXIT)
---
tools/perf/Kconfig | 6 ++++++
tools/perf/builtin-record.c | 4 +++-
tools/perf/config/Makefile | 6 +++---
3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/tools/perf/Kconfig b/tools/perf/Kconfig
index ffc1d81..34a8b09 100644
--- a/tools/perf/Kconfig
+++ b/tools/perf/Kconfig
@@ -190,6 +190,12 @@ config TIMERFD
---help---
Timer via file descriptor

+config ON_EXIT
+ bool "Support of on_exit() function"
+ default n
+ ---help---
+ On exit support
+
config DEMANGLE
bool "Demangle symbols"
default n
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 8ce62ef..372a812 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -5,6 +5,8 @@
* (or a CPU, or a PID) into the perf.data output file - for
* later analysis via perf report.
*/
+
+#include "generated/autoconf.h"
#include "builtin.h"

#include "perf.h"
@@ -30,7 +32,7 @@
#include <sched.h>
#include <sys/mman.h>

-#ifndef HAVE_ON_EXIT_SUPPORT
+#ifndef CONFIG_ON_EXIT
#ifndef ATEXIT_MAX
#define ATEXIT_MAX 32
#endif
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index ff7f01c..c128f30 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -566,9 +566,9 @@ ifdef CONFIG_LIBIBERTY_ONLY
endif
endif

-ifndef NO_ON_EXIT
- ifeq ($(feature-on-exit), 1)
- CFLAGS += -DHAVE_ON_EXIT_SUPPORT
+ifdef CONFIG_ON_EXIT
+ ifneq ($(feature-on-exit), 1)
+ $(shell $(KCONFIG_SCRIPT) -d CONFIG_ON_EXIT)
endif
endif

--
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/