From: Andrew Jeffery <andrew@aj.id.au>
To: openembedded-devel@lists.openembedded.org
Cc: anuj.mittal@intel.com, openbmc@lists.ozlabs.org,
Andrew Jeffery <andrew@aj.id.au>
Subject: [meta-python][PATCH v2 2/3] meta-python: Port python-pyflame to 32-bit ARM
Date: Thu, 10 May 2018 16:07:17 +0930 [thread overview]
Message-ID: <20180510063718.16913-2-andrew@aj.id.au> (raw)
In-Reply-To: <20180510063718.16913-1-andrew@aj.id.au>
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
---
...ract-over-user_regs_struct-name-which-dif.patch | 69 ++++++++++++++++++++++
.../python/python-pyflame_1.6.6.bb | 2 +
2 files changed, 71 insertions(+)
create mode 100644 meta-python/recipes-devtools/python/python-pyflame-1.6.6/0001-ptrace-Abstract-over-user_regs_struct-name-which-dif.patch
diff --git a/meta-python/recipes-devtools/python/python-pyflame-1.6.6/0001-ptrace-Abstract-over-user_regs_struct-name-which-dif.patch b/meta-python/recipes-devtools/python/python-pyflame-1.6.6/0001-ptrace-Abstract-over-user_regs_struct-name-which-dif.patch
new file mode 100644
index 000000000000..09c4394c2a4b
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python-pyflame-1.6.6/0001-ptrace-Abstract-over-user_regs_struct-name-which-dif.patch
@@ -0,0 +1,69 @@
+From 2ef124e235a47dd4742813cf80e11a89cf4f02f8 Mon Sep 17 00:00:00 2001
+From: Andrew Jeffery <andrew@aj.id.au>
+Date: Thu, 3 May 2018 12:35:31 +0930
+Subject: [PATCH] ptrace: Abstract over user_regs_struct name, which differs on
+ ARM32
+
+Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
+---
+ src/ptrace.cc | 6 +++---
+ src/ptrace.h | 10 ++++++++--
+ 2 files changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/src/ptrace.cc b/src/ptrace.cc
+index 485f58e4d82e..610fabb3b8e8 100644
+--- a/src/ptrace.cc
++++ b/src/ptrace.cc
+@@ -122,8 +122,8 @@ void PtraceInterrupt(pid_t pid) {
+ DoWait(pid);
+ }
+
+-struct user_regs_struct PtraceGetRegs(pid_t pid) {
+- struct user_regs_struct regs;
++user_regs_struct PtraceGetRegs(pid_t pid) {
++ user_regs_struct regs;
+ if (ptrace(PTRACE_GETREGS, pid, 0, ®s)) {
+ std::ostringstream ss;
+ ss << "Failed to PTRACE_GETREGS: " << strerror(errno);
+@@ -132,7 +132,7 @@ struct user_regs_struct PtraceGetRegs(pid_t pid) {
+ return regs;
+ }
+
+-void PtraceSetRegs(pid_t pid, struct user_regs_struct regs) {
++void PtraceSetRegs(pid_t pid, user_regs_struct regs) {
+ if (ptrace(PTRACE_SETREGS, pid, 0, ®s)) {
+ std::ostringstream ss;
+ ss << "Failed to PTRACE_SETREGS: " << strerror(errno);
+diff --git a/src/ptrace.h b/src/ptrace.h
+index 7083be1c4dfd..d6af8bf9f83a 100644
+--- a/src/ptrace.h
++++ b/src/ptrace.h
+@@ -23,6 +23,12 @@
+
+ #include "./config.h"
+
++#if defined(__arm__)
++typedef struct user_regs user_regs_struct;
++#else
++typedef struct user_regs_struct user_regs_struct;
++#endif
++
+ namespace pyflame {
+
+ int DoWait(pid_t pid, int options = 0);
+@@ -39,10 +45,10 @@ void PtraceSeize(pid_t pid);
+ void PtraceInterrupt(pid_t pid);
+
+ // get regs from a process
+-struct user_regs_struct PtraceGetRegs(pid_t pid);
++user_regs_struct PtraceGetRegs(pid_t pid);
+
+ // set regs in a process
+-void PtraceSetRegs(pid_t pid, struct user_regs_struct regs);
++void PtraceSetRegs(pid_t pid, user_regs_struct regs);
+
+ // poke a long word into an address
+ void PtracePoke(pid_t pid, unsigned long addr, long data);
+--
+2.14.1
+
diff --git a/meta-python/recipes-devtools/python/python-pyflame_1.6.6.bb b/meta-python/recipes-devtools/python/python-pyflame_1.6.6.bb
index 96f03305f883..7a6d3b09962f 100644
--- a/meta-python/recipes-devtools/python/python-pyflame_1.6.6.bb
+++ b/meta-python/recipes-devtools/python/python-pyflame_1.6.6.bb
@@ -1 +1,3 @@
require python-pyflame.inc
+
+SRC_URI += "file://0001-ptrace-Abstract-over-user_regs_struct-name-which-dif.patch"
--
2.14.1
next prev parent reply other threads:[~2018-05-10 6:38 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-10 6:37 [meta-python][PATCH v2 1/3] meta-python: Add python-pyflame recipe Andrew Jeffery
2018-05-10 6:37 ` Andrew Jeffery [this message]
2018-05-10 6:37 ` [meta-python][PATCH v2 3/3] meta-python: Make python-pyflame cope with prelinked ELFs Andrew Jeffery
2018-05-29 11:48 ` [meta-python][PATCH v2 1/3] meta-python: Add python-pyflame recipe Andrew Jeffery
2018-05-29 17:04 ` [oe] " Khem Raj
2018-05-29 22:03 ` Andrew Jeffery
2018-05-29 22:23 ` Khem Raj
2018-05-29 22:29 ` Andrew Jeffery
2018-05-31 16:48 ` Khem Raj
2018-06-01 2:36 ` Andrew Jeffery
2018-06-01 4:37 ` Khem Raj
2018-06-01 5:52 ` Andrew Jeffery
2018-06-22 21:12 ` Khem Raj
2018-09-04 9:38 ` Martin Jansa
2018-09-04 18:51 ` Khem Raj
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180510063718.16913-2-andrew@aj.id.au \
--to=andrew@aj.id.au \
--cc=anuj.mittal@intel.com \
--cc=openbmc@lists.ozlabs.org \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).