summaryrefslogtreecommitdiff
path: root/dev-python/greenlet/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
commit3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
treec513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-python/greenlet/files
parent05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
gentoo resync : 25.08.2020
Diffstat (limited to 'dev-python/greenlet/files')
-rw-r--r--dev-python/greenlet/files/greenlet-0.4.15-Add-support-for-DEC-Alpha.patch63
-rw-r--r--dev-python/greenlet/files/greenlet-0.4.15-py39.patch48
2 files changed, 0 insertions, 111 deletions
diff --git a/dev-python/greenlet/files/greenlet-0.4.15-Add-support-for-DEC-Alpha.patch b/dev-python/greenlet/files/greenlet-0.4.15-Add-support-for-DEC-Alpha.patch
deleted file mode 100644
index 6a5b37b0e944..000000000000
--- a/dev-python/greenlet/files/greenlet-0.4.15-Add-support-for-DEC-Alpha.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-https://github.com/python-greenlet/greenlet/pull/160
-
-From 839dfa8d4bc4e9a0b97a1984ab2519841f5511e4 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Mon, 16 Mar 2020 14:38:21 -0700
-Subject: [PATCH] Add support for DEC Alpha
-
----
- platform/switch_alpha_unix.h | 30 ++++++++++++++++++++++++++++++
- slp_platformselect.h | 2 ++
- 2 files changed, 32 insertions(+)
- create mode 100644 platform/switch_alpha_unix.h
-
-diff --git a/platform/switch_alpha_unix.h b/platform/switch_alpha_unix.h
-new file mode 100644
-index 0000000..216619f
---- /dev/null
-+++ b/platform/switch_alpha_unix.h
-@@ -0,0 +1,30 @@
-+#define STACK_REFPLUS 1
-+
-+#ifdef SLP_EVAL
-+#define STACK_MAGIC 0
-+
-+#define REGS_TO_SAVE "$9", "$10", "$11", "$12", "$13", "$14", "$15", \
-+ "$f2", "$f3", "$f4", "$f5", "$f6", "$f7", "$f8", "$f9"
-+
-+static int
-+slp_switch(void)
-+{
-+ register int ret;
-+ register long *stackref, stsizediff;
-+ __asm__ volatile ("" : : : REGS_TO_SAVE);
-+ __asm__ volatile ("mov $30, %0" : "=r" (stackref) : );
-+ {
-+ SLP_SAVE_STATE(stackref, stsizediff);
-+ __asm__ volatile (
-+ "addq $30, %0, $30\n\t"
-+ : /* no outputs */
-+ : "r" (stsizediff)
-+ );
-+ SLP_RESTORE_STATE();
-+ }
-+ __asm__ volatile ("" : : : REGS_TO_SAVE);
-+ __asm__ volatile ("mov $31, %0" : "=r" (ret) : );
-+ return ret;
-+}
-+
-+#endif
-diff --git a/slp_platformselect.h b/slp_platformselect.h
-index bed9e6d..fb99aed 100644
---- a/slp_platformselect.h
-+++ b/slp_platformselect.h
-@@ -51,4 +51,6 @@
- #include "platform/switch_csky_gcc.h" /* gcc on csky */
- #elif defined(__GNUC__) && defined(__riscv)
- #include "platform/switch_riscv_unix.h" /* gcc on RISC-V */
-+#elif defined(__GNUC__) && defined(__alpha__)
-+#include "platform/switch_alpha_unix.h" /* gcc on DEC Alpha */
- #endif
---
-2.24.1
-
diff --git a/dev-python/greenlet/files/greenlet-0.4.15-py39.patch b/dev-python/greenlet/files/greenlet-0.4.15-py39.patch
deleted file mode 100644
index 15cf75d32e55..000000000000
--- a/dev-python/greenlet/files/greenlet-0.4.15-py39.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From d05b62bb75e6a3e217435a1fe0f15a53e692898c Mon Sep 17 00:00:00 2001
-From: Victor Stinner <vstinner@python.org>
-Date: Wed, 18 Mar 2020 15:09:33 +0100
-Subject: [PATCH] Port to Python 3.9
-
-On Python 3.9, define _Py_DEC_REFTOTAL which has been removed by:
-https://github.com/python/cpython/commit/49932fec62c616ec88da52642339d83ae719e924
-
-Replace also PyEval_CallObjectWithKeywords() with PyObject_Call(),
-since PyEval_CallObjectWithKeywords() has been deprecated in
-Python 3.9 and PyObject_Call() has the same behavior. The only
-difference is that PyEval_CallObjectWithKeywords() can be called with
-args=NULL, but g_initialstub() ensures that args is not NULL.
----
- greenlet.c | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/greenlet.c b/greenlet.c
-index ec738b9..d37fc97 100644
---- a/greenlet.c
-+++ b/greenlet.c
-@@ -109,6 +109,16 @@ extern PyTypeObject PyGreenlet_Type;
- #define GREENLET_USE_TRACING 1
- #endif
-
-+#ifndef _Py_DEC_REFTOTAL
-+ /* _Py_DEC_REFTOTAL macro has been removed from Python 3.9 by:
-+ https://github.com/python/cpython/commit/49932fec62c616ec88da52642339d83ae719e924 */
-+# ifdef Py_REF_DEBUG
-+# define _Py_DEC_REFTOTAL _Py_RefTotal--
-+# else
-+# define _Py_DEC_REFTOTAL
-+# endif
-+#endif
-+
- /* Weak reference to the switching-to greenlet during the slp switch */
- static PyGreenlet* volatile ts_target = NULL;
- /* Strong reference to the switching from greenlet after the switch */
-@@ -820,8 +830,7 @@ static int GREENLET_NOINLINE(g_initialstub)(void* mark)
- result = NULL;
- } else {
- /* call g.run(*args, **kwargs) */
-- result = PyEval_CallObjectWithKeywords(
-- run, args, kwargs);
-+ result = PyObject_Call(run, args, kwargs);
- Py_DECREF(args);
- Py_XDECREF(kwargs);
- }