From 28d3b61bdd8b9fe786cb431165f2fb95f4e275d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Andr=C3=A9=20Vadla=20Ravn=C3=A5s?= Date: Sat, 20 Jan 2018 23:56:17 +0100 Subject: [PATCH] Fix x86 SysV closure in PIC mode 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. --- src/x86/sysv.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/x86/sysv.S b/src/x86/sysv.S index 116e9087..27379a48 100644 --- a/src/x86/sysv.S +++ b/src/x86/sysv.S @@ -274,7 +274,7 @@ L(C1(pc,N)): \ # 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 @@ L(C1(UW,UWN)): \ 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 */