mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix patch

Browse Source 
The original patch caused compilation of x86-ffi64.c to fail, but that
failure was silently ignored by the build.

Change-Id: I93a0cde041b8f9546873d6cc30c1b690da098642
This commit is contained in:
Stephan Bergmann
2017-01-17 21:07:01 +01:00
parent 562edf0f09
commit d0f3363aa8
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
external/python3/ubsan.patch.0 vendored
View File

@@ -43,15 +43,15 @@
tramp[0] = 0xbb49; /* mov <code>, %r11 */
- *(void* volatile*)&tramp[1] = ffi_closure_unix64;
+ tramp[1] = (unsigned short) ffi_closure_unix64;
+ tramp[2] = (unsigned short) (ffi_closure_unix64 >> 16);
+ tramp[3] = (unsigned short) (ffi_closure_unix64 >> 32);
+ tramp[4] = (unsigned short) (ffi_closure_unix64 >> 48);
+ tramp[2] = (unsigned short) (((unsigned long)ffi_closure_unix64) >> 16);
+ tramp[3] = (unsigned short) (((unsigned long)ffi_closure_unix64) >> 32);
+ tramp[4] = (unsigned short) (((unsigned long)ffi_closure_unix64) >> 48);
tramp[5] = 0xba49; /* mov <data>, %r10 */
- *(void* volatile*)&tramp[6] = closure;
+ tramp[6] = (unsigned short) closure;
+ tramp[7] = (unsigned short) (closure >> 16);
+ tramp[8] = (unsigned short) (closure >> 32);
+ tramp[9] = (unsigned short) (closure >> 48);
+ tramp[7] = (unsigned short) (((unsigned long)closure) >> 16);
+ tramp[8] = (unsigned short) (((unsigned long)closure) >> 32);
+ tramp[9] = (unsigned short) (((unsigned long)closure) >> 48);
/* Set the carry bit if the function uses any sse registers.
This is clc or stc, together with the first byte of the jmp. */