aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/sysprof
diff options
context:
space:
mode:
authorMatthew McClintock <msm@freescale.com>2011-10-05 16:26:49 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-10 09:54:03 +0100
commit4732222c46652951e66aae377631f4a361179d8f (patch)
tree1e5de7fab5490e79e4b2d7365399b04bf9550ee8 /meta/recipes-kernel/sysprof
parent1325f506972555d4c218c15090bfa3f63fb13473 (diff)
downloadopenembedded-core-contrib-4732222c46652951e66aae377631f4a361179d8f.tar.gz
Fix sysprof for powerpc64
__ppc64__ is not defined on powerpc64, rather __powerpc64__ is, this uses a patch that is already upstream to fix builds for powerpc64 Signed-off-by: Matthew McClintock <msm@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/sysprof')
-rw-r--r--meta/recipes-kernel/sysprof/files/0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch35
-rw-r--r--meta/recipes-kernel/sysprof/sysprof_git.bb1
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-kernel/sysprof/files/0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch b/meta/recipes-kernel/sysprof/files/0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch
new file mode 100644
index 00000000000..041054e6e84
--- /dev/null
+++ b/meta/recipes-kernel/sysprof/files/0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch
@@ -0,0 +1,35 @@
+Upstream-Status: Backport
+
+From 4708a509aa9d65ae93e9824e42ddbc6e8d42d90c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel@daenzer.net>
+Date: Sat, 27 Aug 2011 20:04:44 +0200
+Subject: [PATCH] Fix PowerPC checks for __NR_perf_counter_open.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+__ppc__ isn't defined here on Debian powerpc. Grepping through the headers
+installed in /usr/include, there are a few references to __ppc__ and
+__ppc64__, but I suspect they're for other OSs.
+
+Signed-off-by: Michel Dänzer <michel@daenzer.net>
+---
+ collector.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/collector.c b/collector.c
+index b28964f..fe16967 100644
+--- a/collector.c
++++ b/collector.c
+@@ -175,7 +175,7 @@ sysprof_perf_counter_open (struct perf_counter_attr *attr,
+ #define __NR_perf_counter_open 337
+ #elif defined(__hppa__)
+ #define __NR_perf_counter_open 318
+-#elif defined(__ppc__) || defined(__ppc64__)
++#elif defined(__powerpc__) || defined(__powerpc64__)
+ #define __NR_perf_counter_open 319
+ #elif defined(__s390__)
+ #define __NR_perf_counter_open 331
+--
+1.7.6.1
+
diff --git a/meta/recipes-kernel/sysprof/sysprof_git.bb b/meta/recipes-kernel/sysprof/sysprof_git.bb
index 10bde0487dc..c55326352b7 100644
--- a/meta/recipes-kernel/sysprof/sysprof_git.bb
+++ b/meta/recipes-kernel/sysprof/sysprof_git.bb
@@ -10,6 +10,7 @@ PV = "1.1.8+git${SRCPV}"
SRC_URI = "git://git.gnome.org/sysprof;protocol=git \
file://define-NT_GNU_BUILD_ID.patch \
+ file://0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch \
"
SRC_URI_append_arm = " file://rmb-arm.patch"