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

Fix x86 SysV closure in PIC mode

Browse Source 
The assembly single-line comments swallowed up the remaining assembly
code of the macros due to lack of line-endings.

This is a regression introduced in b7f6d7a.
This commit is contained in:
Ole André Vadla Ravnås
2018-01-20 23:56:17 +01:00
parent c194448ef0
commit 28d3b61bdd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/x86/sysv.S
View File

@@ -274,7 +274,7 @@ L(C1(pc,N)): \
# define FFI_CLOSURE_CALL_INNER(UWN) \ # define FFI_CLOSURE_CALL_INNER(UWN) \
movl %ebx, 40(%esp); /* save ebx */ \ movl %ebx, 40(%esp); /* save ebx */ \
L(C1(UW,UWN)): \ L(C1(UW,UWN)): \
# cfi_rel_offset(%ebx, 40); \ /* cfi_rel_offset(%ebx, 40); */ \
call C(__x86.get_pc_thunk.bx); /* load got register */ \ call C(__x86.get_pc_thunk.bx); /* load got register */ \
addl $C(_GLOBAL_OFFSET_TABLE_), %ebx; \ addl $C(_GLOBAL_OFFSET_TABLE_), %ebx; \
call ffi_closure_inner@PLT call ffi_closure_inner@PLT
@@ -284,7 +284,7 @@ L(C1(UW,UWN)): \
leal L(C1(load_table,N))@GOTOFF(%ebx, %eax, 8), %edx; \ leal L(C1(load_table,N))@GOTOFF(%ebx, %eax, 8), %edx; \
movl 40(%esp), %ebx; /* restore ebx */ \ movl 40(%esp), %ebx; /* restore ebx */ \
L(C1(UW,UWN)): \ L(C1(UW,UWN)): \
# cfi_restore(%ebx); \ /* cfi_restore(%ebx); */ \
movl closure_CF(%esp), %eax; /* optimiztic load */ \ movl closure_CF(%esp), %eax; /* optimiztic load */ \
jmp *%edx jmp *%edx
# endif /* DARWIN || HIDDEN */ # endif /* DARWIN || HIDDEN */