ag/cpython-source-deps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #253 from iains/darwin-build

Browse Source 
Some Darwin build fixes
This commit is contained in:
Richard Henderson
2016-06-03 23:04:56 -07:00
parent 02089a1b5c 52fbd12dca
commit 96d9bf4b55
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -197,7 +197,7 @@ case "$target" in
[Cannot use PROT_EXEC on this target, so, we revert to [Cannot use PROT_EXEC on this target, so, we revert to
alternative means]) alternative means])
;; ;;
*-apple-darwin1* | *-*-freebsd* | *-*-kfreebsd* | *-*-openbsd* | *-pc-solaris*) *-apple-darwin* | *-*-freebsd* | *-*-kfreebsd* | *-*-openbsd* | *-pc-solaris*)
AC_DEFINE(FFI_MMAP_EXEC_WRIT, 1, AC_DEFINE(FFI_MMAP_EXEC_WRIT, 1,
[Cannot use malloc on this target, so, we revert to [Cannot use malloc on this target, so, we revert to
alternative means]) alternative means])

6
src/powerpc/darwin_closure.S
View File

@@ -353,7 +353,7 @@ Lret_type13:
bgt Lstructend ; not a special small case bgt Lstructend ; not a special small case
b Lsmallstruct ; see if we need more. b Lsmallstruct ; see if we need more.
#else #else
cmpi 0,r0,4 cmpwi 0,r0,4
bgt Lfinish ; not by value bgt Lfinish ; not by value
lg r3,0(r5) lg r3,0(r5)
b Lfinish b Lfinish
@@ -494,8 +494,8 @@ LSFDE1:
LASFDE1: LASFDE1:
.long LASFDE1-EH_frame1 ; FDE CIE offset .long LASFDE1-EH_frame1 ; FDE CIE offset
.g_long Lstartcode-. ; FDE initial location .g_long Lstartcode-. ; FDE initial location
.set L$set$3,LFE1-Lstartcode .set L$set$2,LFE1-Lstartcode
.g_long L$set$3 ; FDE address range .g_long L$set$2 ; FDE address range
.byte 0x0 ; uleb128 0x0; Augmentation size .byte 0x0 ; uleb128 0x0; Augmentation size
.byte 0x4 ; DW_CFA_advance_loc4 .byte 0x4 ; DW_CFA_advance_loc4
.set L$set$3,LCFI1-LCFI0 .set L$set$3,LCFI1-LCFI0

16
src/x86/win64.S
View File

@@ -41,10 +41,10 @@
deallocate some of the stack that has been alloca'd. */ deallocate some of the stack that has been alloca'd. */
.align 8 .align 8
.globl ffi_call_win64 .globl C(ffi_call_win64)
SEH(.seh_proc ffi_call_win64) SEH(.seh_proc ffi_call_win64)
ffi_call_win64: C(ffi_call_win64):
cfi_startproc cfi_startproc
/* Set up the local stack frame and install it in rbp/rsp. */ /* Set up the local stack frame and install it in rbp/rsp. */
movq (%rsp), %rax movq (%rsp), %rax
@@ -155,7 +155,7 @@ E(0b, FFI_TYPE_SMALL_STRUCT_4B)
.align 8 .align 8
99: call PLT(C(abort)) 99: call PLT(C(abort))
.purgem epilogue epilogue
cfi_endproc cfi_endproc
SEH(.seh_endproc) SEH(.seh_endproc)
@@ -168,10 +168,10 @@ E(0b, FFI_TYPE_SMALL_STRUCT_4B)
#define ffi_clo_OFF_X (32+8+16) #define ffi_clo_OFF_X (32+8+16)
.align 8 .align 8
.globl ffi_go_closure_win64 .globl C(ffi_go_closure_win64)
SEH(.seh_proc ffi_go_closure_win64) SEH(.seh_proc ffi_go_closure_win64)
ffi_go_closure_win64: C(ffi_go_closure_win64):
cfi_startproc cfi_startproc
/* Save all integer arguments into the incoming reg stack space. */ /* Save all integer arguments into the incoming reg stack space. */
movq %rcx, 8(%rsp) movq %rcx, 8(%rsp)
@@ -187,10 +187,10 @@ ffi_go_closure_win64:
SEH(.seh_endproc) SEH(.seh_endproc)
.align 8 .align 8
.globl ffi_closure_win64 .globl C(ffi_closure_win64)
SEH(.seh_proc ffi_closure_win64) SEH(.seh_proc ffi_closure_win64)
ffi_closure_win64: C(ffi_closure_win64):
cfi_startproc cfi_startproc
/* Save all integer arguments into the incoming reg stack space. */ /* Save all integer arguments into the incoming reg stack space. */
movq %rcx, 8(%rsp) movq %rcx, 8(%rsp)
@@ -214,7 +214,7 @@ ffi_closure_win64:
movsd %xmm3, ffi_clo_OFF_X+24(%rsp) movsd %xmm3, ffi_clo_OFF_X+24(%rsp)
leaq ffi_clo_OFF_R(%rsp), %r9 leaq ffi_clo_OFF_R(%rsp), %r9
call ffi_closure_win64_inner call C(ffi_closure_win64_inner)
/* Load the result into both possible result registers. */ /* Load the result into both possible result registers. */
movq ffi_clo_OFF_R(%rsp), %rax movq ffi_clo_OFF_R(%rsp), %rax