diff options
| -rw-r--r-- | meta/recipes-kernel/sysprof/files/0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch | 35 | ||||
| -rw-r--r-- | meta/recipes-kernel/sysprof/sysprof_git.bb | 1 |
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 0000000000..041054e6e8 --- /dev/null +++ b/meta/recipes-kernel/sysprof/files/0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch | |||
| @@ -0,0 +1,35 @@ | |||
| 1 | Upstream-Status: Backport | ||
| 2 | |||
| 3 | From 4708a509aa9d65ae93e9824e42ddbc6e8d42d90c Mon Sep 17 00:00:00 2001 | ||
| 4 | From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel@daenzer.net> | ||
| 5 | Date: Sat, 27 Aug 2011 20:04:44 +0200 | ||
| 6 | Subject: [PATCH] Fix PowerPC checks for __NR_perf_counter_open. | ||
| 7 | MIME-Version: 1.0 | ||
| 8 | Content-Type: text/plain; charset=UTF-8 | ||
| 9 | Content-Transfer-Encoding: 8bit | ||
| 10 | |||
| 11 | __ppc__ isn't defined here on Debian powerpc. Grepping through the headers | ||
| 12 | installed in /usr/include, there are a few references to __ppc__ and | ||
| 13 | __ppc64__, but I suspect they're for other OSs. | ||
| 14 | |||
| 15 | Signed-off-by: Michel Dänzer <michel@daenzer.net> | ||
| 16 | --- | ||
| 17 | collector.c | 2 +- | ||
| 18 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
| 19 | |||
| 20 | diff --git a/collector.c b/collector.c | ||
| 21 | index b28964f..fe16967 100644 | ||
| 22 | --- a/collector.c | ||
| 23 | +++ b/collector.c | ||
| 24 | @@ -175,7 +175,7 @@ sysprof_perf_counter_open (struct perf_counter_attr *attr, | ||
| 25 | #define __NR_perf_counter_open 337 | ||
| 26 | #elif defined(__hppa__) | ||
| 27 | #define __NR_perf_counter_open 318 | ||
| 28 | -#elif defined(__ppc__) || defined(__ppc64__) | ||
| 29 | +#elif defined(__powerpc__) || defined(__powerpc64__) | ||
| 30 | #define __NR_perf_counter_open 319 | ||
| 31 | #elif defined(__s390__) | ||
| 32 | #define __NR_perf_counter_open 331 | ||
| 33 | -- | ||
| 34 | 1.7.6.1 | ||
| 35 | |||
diff --git a/meta/recipes-kernel/sysprof/sysprof_git.bb b/meta/recipes-kernel/sysprof/sysprof_git.bb index 10bde0487d..c55326352b 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}" | |||
| 10 | 10 | ||
| 11 | SRC_URI = "git://git.gnome.org/sysprof;protocol=git \ | 11 | SRC_URI = "git://git.gnome.org/sysprof;protocol=git \ |
| 12 | file://define-NT_GNU_BUILD_ID.patch \ | 12 | file://define-NT_GNU_BUILD_ID.patch \ |
| 13 | file://0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch \ | ||
| 13 | " | 14 | " |
| 14 | 15 | ||
| 15 | SRC_URI_append_arm = " file://rmb-arm.patch" | 16 | SRC_URI_append_arm = " file://rmb-arm.patch" |
