mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 10:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merge with 3.2

Browse source
This commit is contained in:
Ezio Melotti 2011-03-15 19:21:03 +02:00
commit 3796befe37
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Modules/_ctypes/libffi/ChangeLog
View file

@ -3084,7 +3084,7 @@
2003-09-18 Kaz Kojima <kkojima@gcc.gnu.org> 2003-09-18 Kaz Kojima <kkojima@gcc.gnu.org>
* src/sh/ffi.c (ffi_prep_args): Take account into the alignment * src/sh/ffi.c (ffi_prep_args): Take account into the alignement
for the register size. for the register size.
(ffi_closure_helper_SYSV): Handle the structure return value (ffi_closure_helper_SYSV): Handle the structure return value
address correctly. address correctly.
@ -3344,7 +3344,7 @@
2003-02-06 Andreas Tobler <a.tobler@schweiz.ch> 2003-02-06 Andreas Tobler <a.tobler@schweiz.ch>
* libffi/src/powerpc/darwin_closure.S: * libffi/src/powerpc/darwin_closure.S:
Fix alignment bug, allocate 8 bytes for the result. Fix alignement bug, allocate 8 bytes for the result.
* libffi/src/powerpc/aix_closure.S: * libffi/src/powerpc/aix_closure.S:
Likewise. Likewise.
* libffi/src/powerpc/ffi_darwin.c: * libffi/src/powerpc/ffi_darwin.c:

4
Modules/_ctypes/libffi/src/dlmalloc.c
View file

@ -1326,7 +1326,7 @@ static void* win32direct_mmap(size_t size) {
return (ptr != 0)? ptr: MFAIL; return (ptr != 0)? ptr: MFAIL;
} }
/* This function supports releasing coalesced segments */ /* This function supports releasing coalesed segments */
static int win32munmap(void* ptr, size_t size) { static int win32munmap(void* ptr, size_t size) {
MEMORY_BASIC_INFORMATION minfo; MEMORY_BASIC_INFORMATION minfo;
char* cptr = ptr; char* cptr = ptr;
@ -1362,7 +1362,7 @@ static int win32munmap(void* ptr, size_t size) {
#define CALL_MORECORE(S) MFAIL #define CALL_MORECORE(S) MFAIL
#endif /* HAVE_MORECORE */ #endif /* HAVE_MORECORE */
/* mstate bit set if contiguous morecore disabled or failed */ /* mstate bit set if continguous morecore disabled or failed */
#define USE_NONCONTIGUOUS_BIT (4U) #define USE_NONCONTIGUOUS_BIT (4U)
/* segment bit set in create_mspace_with_base */ /* segment bit set in create_mspace_with_base */

2
Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c
View file

@ -592,7 +592,7 @@ typedef struct aix_fd_struct {
+---------------------------------------+ 160 +---------------------------------------+ 160
| result area 8 | | result area 8 |
+---------------------------------------+ 168 +---------------------------------------+ 168
| alignment to the next multiple of 16 | | alignement to the next multiple of 16 |
SP current --> +---------------------------------------+ 176 <- parent frame SP current --> +---------------------------------------+ 176 <- parent frame
| back chain to caller 4 | | back chain to caller 4 |
+---------------------------------------+ 180 +---------------------------------------+ 180

2
Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c
View file

@ -650,7 +650,7 @@ ffi_call(
+---------------------------------------+ 160 +---------------------------------------+ 160
| result area 8 | | result area 8 |
+---------------------------------------+ 168 +---------------------------------------+ 168
| alignment to the next multiple of 16 | | alignement to the next multiple of 16 |
SP current --> +---------------------------------------+ 176 <- parent frame SP current --> +---------------------------------------+ 176 <- parent frame
| back chain to caller 4 | | back chain to caller 4 |
+---------------------------------------+ 180 +---------------------------------------+ 180