pool/python-greenlet
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 127087 from devel:languages:python

Browse Source 
- add ppc64 platform support
- fix ppc platform (forwarded request 126971 from k0da)

OBS-URL: https://build.opensuse.org/request/show/127087
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-greenlet?expand=0&rev=7
This commit is contained in:
Stephan Kulow 2012-07-04 11:56:26 +00:00 committed by Git OBS Bridge
commit 0fa06d5c88
4 changed files with 121 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ppc-support.patch Normal file
View File

@ -0,0 +1,21 @@
Index: greenlet-0.3.1/platform/switch_ppc_unix.h
===================================================================
--- greenlet-0.3.1.orig/platform/switch_ppc_unix.h
+++ greenlet-0.3.1/platform/switch_ppc_unix.h
@@ -42,7 +42,7 @@
* is meant to be compiled non-dynamically!
*/
#define REGS_TO_SAVE "r13", "r14", "r15", "r16", "r17", "r18", "r19", "r20", \
- "r21", "r22", "r23", "r24", "r25", "r26", "r27", "r28", "r29", \
+ "r21", "r22", "r23", "r24", "r25", "r26", "r27", "r28", "r29", "r31", \
"cr2", "cr3", "cr4"
static int
slp_switch(void)
@@ -55,7 +55,6 @@ slp_switch(void)
__asm__ volatile (
"mr 11, %0\n"
"add 1, 1, 11\n"
- "add 30, 30, 11\n"
: /* no outputs */
: "g" (stsizediff)
: "11"

88
ppc64-support.patch Normal file
View File

@ -0,0 +1,88 @@
Index: greenlet-0.3.1/platform/switch_ppc64_linux.h
===================================================================
--- /dev/null
+++ greenlet-0.3.1/platform/switch_ppc64_linux.h
@@ -0,0 +1,70 @@
+/*
+ * this is the internal transfer function.
+ *
+ * HISTORY
+ * 09-Mar-12 Michael Ellerman <michael@ellerman.id.au>
+ * 64-bit implementation, copied from 32-bit.
+ * 07-Sep-05 (py-dev mailing list discussion)
+ * removed 'r31' from the register-saved. !!!! WARNING !!!!
+ * It means that this file can no longer be compiled statically!
+ * It is now only suitable as part of a dynamic library!
+ * 14-Jan-04 Bob Ippolito <bob@redivi.com>
+ * added cr2-cr4 to the registers to be saved.
+ * Open questions: Should we save FP registers?
+ * What about vector registers?
+ * Differences between darwin and unix?
+ * 24-Nov-02 Christian Tismer <tismer@tismer.com>
+ * needed to add another magic constant to insure
+ * that f in slp_eval_frame(PyFrameObject *f)
+ * STACK_REFPLUS will probably be 1 in most cases.
+ * gets included into the saved stack area.
+ * 04-Oct-02 Gustavo Niemeyer <niemeyer@conectiva.com>
+ * Ported from MacOS version.
+ * 17-Sep-02 Christian Tismer <tismer@tismer.com>
+ * after virtualizing stack save/restore, the
+ * stack size shrunk a bit. Needed to introduce
+ * an adjustment STACK_MAGIC per platform.
+ * 15-Sep-02 Gerd Woetzel <gerd.woetzel@GMD.DE>
+ * slightly changed framework for sparc
+ * 29-Jun-02 Christian Tismer <tismer@tismer.com>
+ * Added register 13-29, 31 saves. The same way as
+ * Armin Rigo did for the x86_unix version.
+ * This seems to be now fully functional!
+ * 04-Mar-02 Hye-Shik Chang <perky@fallin.lv>
+ * Ported from i386.
+ */
+
+#define STACK_REFPLUS 1
+
+#ifdef SLP_EVAL
+
+#define STACK_MAGIC 6
+
+/* !!!!WARNING!!!! need to add "r31" in the next line if this header file
+ * is meant to be compiled non-dynamically!
+ */
+#define REGS_TO_SAVE "r2", "r14", "r15", "r16", "r17", "r18", "r19", "r20", \
+ "r21", "r22", "r23", "r24", "r25", "r26", "r27", "r28", "r29", "r31", \
+ "cr2", "cr3", "cr4"
+static int
+slp_switch(void)
+{
+ register long *stackref, stsizediff;
+ __asm__ volatile ("" : : : REGS_TO_SAVE);
+ __asm__ ("mr %0, 1" : "=g" (stackref) : );
+ {
+ SLP_SAVE_STATE(stackref, stsizediff);
+ __asm__ volatile (
+ "mr 11, %0\n"
+ "add 1, 1, 11\n"
+ : /* no outputs */
+ : "g" (stsizediff)
+ : "11"
+ );
+ SLP_RESTORE_STATE();
+ }
+ __asm__ volatile ("" : : : REGS_TO_SAVE);
+ return 0;
+}
+
+#endif
Index: greenlet-0.3.1/slp_platformselect.h
===================================================================
--- greenlet-0.3.1.orig/slp_platformselect.h
+++ greenlet-0.3.1/slp_platformselect.h
@@ -8,6 +8,8 @@
#include "platform/switch_amd64_unix.h" /* gcc on amd64 */
#elif defined(__GNUC__) && defined(__i386__)
#include "platform/switch_x86_unix.h" /* gcc on X86 */
+#elif defined(__GNUC__) && defined(__powerpc64__) && defined(__linux__)
+#include "platform/switch_ppc64_linux.h" /* gcc on PowerPC 64-bit */
#elif defined(__GNUC__) && defined(__PPC__) && defined(__linux__)
#include "platform/switch_ppc_unix.h" /* gcc on PowerPC */
#elif defined(__GNUC__) && defined(__ppc__) && defined(__APPLE__)

6
python-greenlet.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jul 3 09:53:32 UTC 2012 - dvaleev@suse.com
- add ppc64 platform support
- fix ppc platform
-------------------------------------------------------------------
Fri Dec 23 13:20:47 UTC 2011 - idonmez@suse.com

6
python-greenlet.spec
View File

@ -28,6 +28,10 @@ Source0: http://pypi.python.org/packages/source/g/greenlet/greenlet-%{ver
Patch1: i686-register-fixes.patch
# PATCH-FIX-UPSTREAM idoenmez@suse.de get-rid-of-ts_origin.patch -- Upstream commit 2d5b17472757
Patch2: get-rid-of-ts_origin.patch
# PATCH-FIX-UPSTREAM dvaleev@suse.com ppc64-support.patch - Upstream commit b17773a780
Patch3: ppc64-support.patch
# PATCH-FIX-OPENSUSE dvaleev@suse.com ppc-support.patch - Fix ppc build (32bit)
Patch4: ppc-support.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: python-devel
BuildRequires: python-distribute
@ -54,6 +58,8 @@ This package contains header files required for C modules development.
%setup -q -n greenlet-%{version}
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
CFLAGS="%{optflags} -fno-strict-aliasing" python setup.py build