From: hjl-tools <hjl.tools@gmail.com>
Date: Sat, 22 Feb 2020 14:32:22 +0000 (-0800)
Subject: x86: Fix ffi_prep_closure_loc (#542)
X-Git-Tag: upstream/3.4.2~90
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d9abffeabe4f38bac12b864146cf974ede814411;p=platform%2Fupstream%2Flibffi.git

x86: Fix ffi_prep_closure_loc (#542)

Since FFI_TRAMPOLINE_SIZE is increased by 4 bytes to add ENDBR32, adjust
jump displacement by 4 bytes.
---

diff --git a/src/x86/ffi.c b/src/x86/ffi.c
index e247322..346e784 100644
--- a/src/x86/ffi.c
+++ b/src/x86/ffi.c
@@ -566,7 +566,7 @@ ffi_prep_closure_loc (ffi_closure* closure,
 
   /* jmp dest */
   tramp[9] = 0xe9;
-  *(unsigned *)(tramp + 10) = (unsigned)dest - ((unsigned)codeloc + 10);
+  *(unsigned *)(tramp + 10) = (unsigned)dest - ((unsigned)codeloc + 14);
 
   closure->cif = cif;
   closure->fun = fun;