external/python3/ubsan.patch.0 | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
New commits:
commit e376bc04dc426ff3470647fa1abd4e28d263f00e
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Jan 13 16:12:55 2015 +0100
external/python3: Work around -fsanitize=alignment
Change-Id: I33976bc96fc78dd0210d9aec6d1ec925f514c7f2
diff --git a/external/python3/ubsan.patch.0 b/external/python3/ubsan.patch.0
index acfd189..39717d2 100644
--- a/external/python3/ubsan.patch.0
+++ b/external/python3/ubsan.patch.0
@@ -1,3 +1,25 @@
+--- Modules/_ctypes/libffi/src/x86/ffi64.c
++++ Modules/_ctypes/libffi/src/x86/ffi64.c
+@@ -545,11 +545,15 @@
+ tramp = (volatile unsigned short *) &closure->tramp[0];
+
+ tramp[0] = 0xbb49; /* mov <code>, %r11 */
+- *((unsigned long long * volatile) &tramp[1])
+- = (unsigned long) ffi_closure_unix64;
++ tramp[1] = (unsigned long) ffi_closure_unix64;
++ tramp[2] = ((unsigned long) ffi_closure_unix64) >> 16;
++ tramp[3] = ((unsigned long) ffi_closure_unix64) >> 32;
++ tramp[4] = ((unsigned long) ffi_closure_unix64) >> 48;
+ tramp[5] = 0xba49; /* mov <data>, %r10 */
+- *((unsigned long long * volatile) &tramp[6])
+- = (unsigned long) codeloc;
++ tramp[6] = (unsigned long) codeloc;
++ tramp[7] = ((unsigned long) codeloc) >> 16;
++ tramp[8] = ((unsigned long) codeloc) >> 32;
++ tramp[9] = ((unsigned long) codeloc) >> 48;
+
+ /* Set the carry bit iff the function uses any sse registers.
+ This is clc or stc, together with the first byte of the jmp. */
--- Objects/listobject.c
+++ Objects/listobject.c
@@ -2036,7 +2036,7 @@
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
