rpm/python
SHA256
1
0
Fork 0
forked from pool/python
Code Pull Requests Activity

Accepting request 593954 from home:marxin:branches:devel:languages:python:Factory

Browse Source 
- Add gcc8-miscompilation-fix.patch (boo#1084650).

OBS-URL: https://build.opensuse.org/request/show/593954
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=227
This commit is contained in:
Tomáš Chvátal 2018-04-06 10:15:40 +00:00 committed by Git OBS Bridge
parent 461b84379a
commit 7fc40ecb9b
3 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gcc8-miscompilation-fix.patch Normal file
View File

@ -0,0 +1,33 @@
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;

5
python-base.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Apr 6 10:11:22 UTC 2018 - mliska@suse.cz
- Add gcc8-miscompilation-fix.patch (boo#1084650).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 20 13:14:27 UTC 2018 - bwiedemann@suse.com Tue Feb 20 13:14:27 UTC 2018 - bwiedemann@suse.com

2
python-base.spec
View File

@ -62,6 +62,7 @@ Patch39: python-fix-shebang.patch
Patch40: python-skip_random_failing_tests.patch Patch40: python-skip_random_failing_tests.patch
# PATCH-FIX-UPSTREAM sorted tar https://github.com/python/cpython/pull/2263 # PATCH-FIX-UPSTREAM sorted tar https://github.com/python/cpython/pull/2263
Patch41: python-sorted_tar.patch Patch41: python-sorted_tar.patch
Patch42: gcc8-miscompilation-fix.patch
# COMMON-PATCH-END # COMMON-PATCH-END
%define python_version %(echo %{tarversion} | head -c 3) %define python_version %(echo %{tarversion} | head -c 3)
BuildRequires: automake BuildRequires: automake
@ -170,6 +171,7 @@ other applications.
%patch40 -p1 %patch40 -p1
%endif %endif
%patch41 -p1 %patch41 -p1
%patch42 -p1
# drop Autoconf version requirement # drop Autoconf version requirement
sed -i 's/^version_required/dnl version_required/' configure.ac sed -i 's/^version_required/dnl version_required/' configure.ac