[oe-commits] Bruce Ashfield : perf: fix v3.17 powerpc compilation issues
git at git.openembedded.org
git at git.openembedded.org
Thu Sep 11 10:01:26 UTC 2014
Module: openembedded-core.git
Branch: master-next
Commit: 9f204a02f07f8e378e8a078db103a6ba94ec55cb
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=9f204a02f07f8e378e8a078db103a6ba94ec55cb
Author: Bruce Ashfield <bruce.ashfield at windriver.com>
Date: Sun Sep 7 23:57:29 2014 -0400
perf: fix v3.17 powerpc compilation issues
The powerpc perf arch port has two issues in the current 3.17-rc
seriers. Undefined dwarf symbols and undefined pr_debug calls.
commit a60335ba [perf tools powerpc: Adjust callchain based on DWARF debug info]
introduces skip-callchain-idx.c, and breaks the perf build.
Until fixes get into the mainline kernel, we temporarily fix the issues by
adding a forced linke to -ldw and modifying skip-callchain-idx.c to include
the proper debug files for pr_debug.
Signed-off-by: Bruce Ashfield <bruce.ashfield at windriver.com>
---
meta/recipes-kernel/perf/perf.bb | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index cbd03f2..8112986 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -78,6 +78,7 @@ EXTRA_OEMAKE = '\
ARCH=${ARCH} \
CC="${CC}" \
AR="${AR}" \
+ EXTRA_CFLAGS="-ldw" \
perfexecdir=${libexecdir} \
NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 ${LIBUNWIND_DEFINES} ${SCRIPTING_DEFINES} \
'
@@ -143,6 +144,10 @@ do_configure_prepend () {
if [ -e "${S}/tools/perf/config/feature-checks/Makefile" ]; then
sed -i 's,CC := $(CROSS_COMPILE)gcc -MD,CC += -MD,' ${S}/tools/perf/config/feature-checks/Makefile
fi
+ # 3.17-rc1+ has a include issue for powerpc. Temporarily sed in the appropriate include
+ if [ -e "${S}/tools/perf/arch/powerpc/util/skip-callchain-idx.c" ]; then
+ sed -i 's,#include "util/callchain.h",#include "util/callchain.h"\n#include "util/debug.h",' ${S}/tools/perf/arch/powerpc/util/skip-callchain-idx.c
+ fi
}
python do_package_prepend() {
More information about the Openembedded-commits
mailing list