Merge pull request #403 from frida/fix/x86-sysv-pic-closure-regression
Fix x86 SysV closure in PIC mode
diff --git a/src/x86/sysv.S b/src/x86/sysv.S
index 116e908..27379a4 100644
--- a/src/x86/sysv.S
+++ b/src/x86/sysv.S
@@ -274,7 +274,7 @@
# define FFI_CLOSURE_CALL_INNER(UWN) \
movl %ebx, 40(%esp); /* save ebx */ \
L(C1(UW,UWN)): \
- # cfi_rel_offset(%ebx, 40); \
+ /* cfi_rel_offset(%ebx, 40); */ \
call C(__x86.get_pc_thunk.bx); /* load got register */ \
addl $C(_GLOBAL_OFFSET_TABLE_), %ebx; \
call ffi_closure_inner@PLT
@@ -284,7 +284,7 @@
leal L(C1(load_table,N))@GOTOFF(%ebx, %eax, 8), %edx; \
movl 40(%esp), %ebx; /* restore ebx */ \
L(C1(UW,UWN)): \
- # cfi_restore(%ebx); \
+ /* cfi_restore(%ebx); */ \
movl closure_CF(%esp), %eax; /* optimiztic load */ \
jmp *%edx
# endif /* DARWIN || HIDDEN */
