forked from amazingfate/loongoffice
d0f3363aa8
The original patch caused compilation of x86-ffi64.c to fail, but that failure was silently ignored by the build. Change-Id: I93a0cde041b8f9546873d6cc30c1b690da098642
69 lines
2.6 KiB
Plaintext
69 lines
2.6 KiB
Plaintext
--- Modules/_ctypes/_ctypes.c
|
|
+++ Modules/_ctypes/_ctypes.c
|
|
@@ -1358,8 +1358,10 @@
|
|
goto error;
|
|
}
|
|
stgdict->shape[0] = length;
|
|
- memmove(&stgdict->shape[1], itemdict->shape,
|
|
- sizeof(Py_ssize_t) * (stgdict->ndim - 1));
|
|
+ if (itemdict->shape) {
|
|
+ memmove(&stgdict->shape[1], itemdict->shape,
|
|
+ sizeof(Py_ssize_t) * (stgdict->ndim - 1));
|
|
+ }
|
|
|
|
itemsize = itemdict->size;
|
|
if (length * itemsize < 0) {
|
|
--- Modules/_ctypes/libffi/src/x86/ffi64.c
|
|
+++ Modules/_ctypes/libffi/src/x86/ffi64.c
|
|
@@ -548,11 +548,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. */
|
|
--- Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
|
|
+++ Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
|
|
@@ -599,9 +599,15 @@
|
|
tramp = (volatile unsigned short*)&closure->tramp[0];
|
|
|
|
tramp[0] = 0xbb49; /* mov <code>, %r11 */
|
|
- *(void* volatile*)&tramp[1] = ffi_closure_unix64;
|
|
+ tramp[1] = (unsigned short) ffi_closure_unix64;
|
|
+ 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) (((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. */
|
|
--- Objects/listobject.c
|
|
+++ Objects/listobject.c
|
|
@@ -641,7 +641,7 @@
|
|
goto Error;
|
|
}
|
|
}
|
|
- memcpy(recycle, &item[ilow], s);
|
|
+ if (s != 0) memcpy(recycle, &item[ilow], s);
|
|
|
|
if (d < 0) { /* Delete -d items */
|
|
Py_ssize_t tail;
|