[tip:perf/urgent] perf tests: Fix compile when libunwind's unwind.h is available

From: tip-bot for Milian Wolff
Date: Wed Sep 13 2017 - 03:46:03 EST

Commit-ID: df90cc41d662ad5f700afc042df43e57ce1ed0a4
Gitweb: http://git.kernel.org/tip/df90cc41d662ad5f700afc042df43e57ce1ed0a4
Author: Milian Wolff <milian.wolff@xxxxxxxx>
AuthorDate: Wed, 6 Sep 2017 17:02:09 +0200
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Tue, 12 Sep 2017 12:34:02 -0300

perf tests: Fix compile when libunwind's unwind.h is available

When cross compiling perf and I want to link against a self-compiled
libunwind, I usually make the custom path where the libunwind headers
exist visible by adding the libunwind prefix to the include path when
compiling perf, i.e.:

$ ls $HOME/projects/compiled/other/include/
libunwind-coredump.h libunwind.h libunwind-x86_64.h
libunwind-common.h libunwind-dynamic.h libunwind-ptrace.h
$ make EXTRA_CFLAGS="-I$HOME/projects/compiled/other/include/

Note the `unwind.h` header from libunwind which leads to compile
errors when compiling tests/dwarf-unwind.c, since it shadows perf's

tests/dwarf-unwind.c:41:32: error: âstruct unwind_entryâ declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
static int unwind_entry(struct unwind_entry *entry, void *arg)
tests/dwarf-unwind.c: In function âunwind_entryâ:
tests/dwarf-unwind.c:44:22: error: dereferencing pointer to incomplete type âstruct unwind_entryâ
char *symbol = entry->sym ? entry->sym->name : NULL;
tests/dwarf-unwind.c: In function âunwind_threadâ:
tests/dwarf-unwind.c:92:8: error: implicit declaration of function âunwind__get_entriesâ; did you mean âunwind_entryâ? [-Werror=implicit-function-declaration]
err = unwind__get_entries(unwind_entry, &cnt, thread,
tests/dwarf-unwind.c:92:8: error: nested extern declaration of âunwind__get_entriesâ [-Werror=nested-externs]

Fix this compile error by specificing an explicit include of perf's
unwind.h in the util folder.

Signed-off-by: Milian Wolff <milian.wolff@xxxxxxxx>
Cc: David Ahern <dsahern@xxxxxxxxx>
Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Yao Jin <yao.jin@xxxxxxxxxxxxxxx>
Link: http://lkml.kernel.org/r/20170906150209.12579-1-milian.wolff@xxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
tools/perf/tests/dwarf-unwind.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/tests/dwarf-unwind.c b/tools/perf/tests/dwarf-unwind.c
index 2a7b9b4..9ba1d21 100644
--- a/tools/perf/tests/dwarf-unwind.c
+++ b/tools/perf/tests/dwarf-unwind.c
@@ -6,7 +6,7 @@
#include "debug.h"
#include "machine.h"
#include "event.h"
-#include "unwind.h"
+#include "../util/unwind.h"
#include "perf_regs.h"
#include "map.h"
#include "thread.h"