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

win32.S: Make calls to ffi_closure_SYSV_inner position-independent

Browse Source 
Now that non-Windows platforms include win32.S, it needs to support
building as position-independent code.  This fixes one source of build
failures on target platforms that do not allow text relocations.
This commit is contained in:
Josh Triplett
2014-03-21 10:57:06 -07:00
parent 28fb197079
commit 2087dcf736
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/x86/win32.S
View File

@@ -688,7 +688,16 @@ USCORE_SYMBOL(ffi_closure_SYSV):
movl %edx, 4(%esp) /* args = __builtin_dwarf_cfa () */ movl %edx, 4(%esp) /* args = __builtin_dwarf_cfa () */
leal -12(%ebp), %edx leal -12(%ebp), %edx
movl %edx, (%esp) /* &resp */ movl %edx, (%esp) /* &resp */
#if defined(HAVE_HIDDEN_VISIBILITY_ATTRIBUTE) || !defined(__PIC__)
call USCORE_SYMBOL(ffi_closure_SYSV_inner) call USCORE_SYMBOL(ffi_closure_SYSV_inner)
#else
movl %ebx, 8(%esp)
call 1f
1: popl %ebx
addl $_GLOBAL_OFFSET_TABLE_+[.-1b], %ebx
call ffi_closure_SYSV_inner@PLT
movl 8(%esp), %ebx
#endif
movl -12(%ebp), %ecx movl -12(%ebp), %ecx
0: 0:
@@ -956,7 +965,16 @@ USCORE_SYMBOL(ffi_closure_STDCALL):
movl %edx, 4(%esp) /* args */ movl %edx, 4(%esp) /* args */
leal -12(%ebp), %edx leal -12(%ebp), %edx
movl %edx, (%esp) /* &resp */ movl %edx, (%esp) /* &resp */
#if defined(HAVE_HIDDEN_VISIBILITY_ATTRIBUTE) || !defined(__PIC__)
call USCORE_SYMBOL(ffi_closure_SYSV_inner) call USCORE_SYMBOL(ffi_closure_SYSV_inner)
#else
movl %ebx, 8(%esp)
call 1f
1: popl %ebx
addl $_GLOBAL_OFFSET_TABLE_+[.-1b], %ebx
call ffi_closure_SYSV_inner@PLT
movl 8(%esp), %ebx
#endif
movl -12(%ebp), %ecx movl -12(%ebp), %ecx
0: 0:
call 1f call 1f