From e0cbfaedc4a08a70aee5c864b4acbc104ed67924 Mon Sep 17 00:00:00 2001 From: Derek Straka Date: Sat, 30 Jun 2018 07:37:35 -0400 Subject: python: update to version 2.7.15 Update to the latest stable version License-Update: Copyright year updated to include 2018 Remove the alignment patch that is included upstream (From OE-Core rev: 855020053906478cea164ed254c08bedce48479d) Signed-off-by: Derek Straka Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../python/python/fix-gc-alignment.patch | 43 ---------------------- 1 file changed, 43 deletions(-) delete mode 100644 meta/recipes-devtools/python/python/fix-gc-alignment.patch (limited to 'meta/recipes-devtools/python/python/fix-gc-alignment.patch') diff --git a/meta/recipes-devtools/python/python/fix-gc-alignment.patch b/meta/recipes-devtools/python/python/fix-gc-alignment.patch deleted file mode 100644 index b63cd08747..0000000000 --- a/meta/recipes-devtools/python/python/fix-gc-alignment.patch +++ /dev/null @@ -1,43 +0,0 @@ -Upstream-Status: Submitted -Signed-off-by: Ross Burton - -Fix for over-aligned GC info -Patch by Florian Weimer - -See: https://bugzilla.redhat.com/show_bug.cgi?id=1540316 -Upstream discussion: https://mail.python.org/pipermail/python-dev/2018-January/152000.html - -diff --git a/Include/objimpl.h b/Include/objimpl.h -index 55e83eced6..aa906144dc 100644 ---- a/Include/objimpl.h -+++ b/Include/objimpl.h -@@ -248,6 +248,18 @@ PyAPI_FUNC(PyVarObject *) _PyObject_GC_Resize(PyVarObject *, Py_ssize_t); - /* for source compatibility with 2.2 */ - #define _PyObject_GC_Del PyObject_GC_Del - -+/* Former over-aligned definition of PyGC_Head, used to compute the -+ size of the padding for the new version below. */ -+union _gc_head; -+union _gc_head_old { -+ struct { -+ union _gc_head *gc_next; -+ union _gc_head *gc_prev; -+ Py_ssize_t gc_refs; -+ } gc; -+ long double dummy; -+}; -+ - /* GC information is stored BEFORE the object structure. */ - typedef union _gc_head { - struct { -@@ -255,7 +267,8 @@ typedef union _gc_head { - union _gc_head *gc_prev; - Py_ssize_t gc_refs; - } gc; -- long double dummy; /* force worst-case alignment */ -+ double dummy; /* force worst-case alignment */ -+ char dummy_padding[sizeof(union _gc_head_old)]; - } PyGC_Head; - - extern PyGC_Head *_PyGC_generation0; - \ No newline at end of file -- cgit v1.2.3-54-g00ecf