From bf21d9758c2d87eb2ba5bc86d6f037ef7de9190f Mon Sep 17 00:00:00 2001
From: Irina Tirdea <irina.tirdea@intel.com>
Date: Sat, 8 Sep 2012 03:43:23 +0300
Subject: [PATCH] --- yaml --- r: 323784 b: refs/heads/master c:
 c9f08bee50c71b06685ccff8110e56a7c05662b7 h: refs/heads/master v: v3

---
 [refs]                                    |  2 +-
 trunk/tools/perf/Makefile                 |  8 ++++++++
 trunk/tools/perf/config/feature-tests.mak | 14 ++++++++++++++
 trunk/tools/perf/util/util.c              |  6 ++++++
 4 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 78fc2a7c6602..1f1230273cca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9612ef6716efc20fac0f57d59452cda4e6846bda
+refs/heads/master: c9f08bee50c71b06685ccff8110e56a7c05662b7
diff --git a/trunk/tools/perf/Makefile b/trunk/tools/perf/Makefile
index afd507574902..3eda49215730 100644
--- a/trunk/tools/perf/Makefile
+++ b/trunk/tools/perf/Makefile
@@ -755,6 +755,14 @@ else
 	endif
 endif
 
+ifdef NO_BACKTRACE
+       BASIC_CFLAGS += -DNO_BACKTRACE
+else
+       ifneq ($(call try-cc,$(SOURCE_BACKTRACE),),y)
+               BASIC_CFLAGS += -DNO_BACKTRACE
+       endif
+endif
+
 ifdef ASCIIDOC8
 	export ASCIIDOC8
 endif
diff --git a/trunk/tools/perf/config/feature-tests.mak b/trunk/tools/perf/config/feature-tests.mak
index 2f1156a62ab7..116690a669d2 100644
--- a/trunk/tools/perf/config/feature-tests.mak
+++ b/trunk/tools/perf/config/feature-tests.mak
@@ -179,3 +179,17 @@ int main(void)
 }
 endef
 endif
+
+ifndef NO_BACKTRACE
+define SOURCE_BACKTRACE
+#include <execinfo.h>
+#include <stdio.h>
+
+int main(void)
+{
+	backtrace(NULL, 0);
+	backtrace_symbols(NULL, 0);
+	return 0;
+}
+endef
+endif
diff --git a/trunk/tools/perf/util/util.c b/trunk/tools/perf/util/util.c
index 1b8775c3707d..2055cf38041c 100644
--- a/trunk/tools/perf/util/util.c
+++ b/trunk/tools/perf/util/util.c
@@ -1,7 +1,9 @@
 #include "../perf.h"
 #include "util.h"
 #include <sys/mman.h>
+#ifndef NO_BACKTRACE
 #include <execinfo.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -163,6 +165,7 @@ size_t hex_width(u64 v)
 }
 
 /* Obtain a backtrace and print it to stdout. */
+#ifndef NO_BACKTRACE
 void dump_stack(void)
 {
 	void *array[16];
@@ -177,3 +180,6 @@ void dump_stack(void)
 
 	free(strings);
 }
+#else
+void dump_stack(void) {}
+#endif