summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorTing Liu <b28495@freescale.com>2014-07-16 17:38:11 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-19 00:09:02 +0100
commit91bafd56319d5a7cc9d37e5f1a2f88754a2b9ea3 (patch)
tree965d95446cee17191958d06c3f2ed84b2c275ad2 /meta/recipes-devtools
parentece74dff68cabc113a15585b932eb9b530d009de (diff)
downloadpoky-91bafd56319d5a7cc9d37e5f1a2f88754a2b9ea3.tar.gz
strace: fix 64 bit process detection
(From OE-Core rev: f35552e4bbf865aa20148b161d5520de025faf02) Signed-off-by: Ting Liu <b28495@freescale.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/strace/strace-4.8/strace-fix-64-bit-process-detection.patch34
-rw-r--r--meta/recipes-devtools/strace/strace_4.8.bb1
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-devtools/strace/strace-4.8/strace-fix-64-bit-process-detection.patch b/meta/recipes-devtools/strace/strace-4.8/strace-fix-64-bit-process-detection.patch
new file mode 100644
index 0000000000..a6579df598
--- /dev/null
+++ b/meta/recipes-devtools/strace/strace-4.8/strace-fix-64-bit-process-detection.patch
@@ -0,0 +1,34 @@
1powerpc64: fix 64-bit process detection on embedded
2
3* syscall.c (get_scno) [POWERPC64]: Fix 64-bit process detection
4on embedded powerpc.
5
6Upstream-Status: Backport
7
8Signed-off-by: James Yang <james.yang@freescale.com>
9Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
10
11diff --git a/syscall.c.orig b/syscall.c
12index 7efee0e..72d9453 100644
13--- a/syscall.c.orig
14+++ b/syscall.c
15@@ -1207,11 +1207,14 @@ get_scno(struct tcb *tcp)
16 /* Check for 64/32 bit mode. */
17 if (upeek(tcp, sizeof(unsigned long)*PT_MSR, &val) < 0)
18 return -1;
19- /* SF is bit 0 of MSR */
20- if (val < 0)
21- currpers = 0;
22- else
23- currpers = 1;
24+
25+ /*
26+ * Check for 64/32 bit mode.
27+ * Embedded implementations covered by Book E extension of PPC use
28+ * bit 0 (CM) of 32-bit Machine state register (MSR).
29+ * Other implementations use bit 0 (SF) of 64-bit MSR.
30+ */
31+ currpers = (val & 0x8000000080000000) ? 0 : 1;
32 update_personality(tcp, currpers);
33 # endif
34 #elif defined(AVR32)
diff --git a/meta/recipes-devtools/strace/strace_4.8.bb b/meta/recipes-devtools/strace/strace_4.8.bb
index 71563d4a41..d954c37004 100644
--- a/meta/recipes-devtools/strace/strace_4.8.bb
+++ b/meta/recipes-devtools/strace/strace_4.8.bb
@@ -8,6 +8,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \
8 file://git-version-gen \ 8 file://git-version-gen \
9 file://strace-add-configure-options.patch \ 9 file://strace-add-configure-options.patch \
10 file://Makefile-ptest.patch \ 10 file://Makefile-ptest.patch \
11 file://strace-fix-64-bit-process-detection.patch \
11 file://run-ptest \ 12 file://run-ptest \
12 " 13 "
13 14