This is the mail archive of the
libffi-discuss@sourceware.org
mailing list for the libffi project.
[PATCH 11/13] x86: Use win32 name mangling for fastcall functions
- From: Richard Henderson <rth at twiddle dot net>
- To: libffi-discuss at sourceware dot org
- Date: Fri, 7 Nov 2014 16:30:38 +0100
- Subject: [PATCH 11/13] x86: Use win32 name mangling for fastcall functions
- Authentication-results: sourceware.org; auth=none
- References: <1415374240-1792-1-git-send-email-rth at twiddle dot net>
---
src/x86/sysv.S | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/x86/sysv.S b/src/x86/sysv.S
index f412b7a..e6a8c1e 100644
--- a/src/x86/sysv.S
+++ b/src/x86/sysv.S
@@ -47,6 +47,15 @@
# define ENDF(X)
#endif
+/* Handle win32 fastcall name mangling. */
+#ifdef X86_WIN32
+# define ffi_call_i386 @ffi_call_i386@8
+# define ffi_closure_inner @ffi_closure_inner@8
+#else
+# define ffi_call_i386 C(ffi_call_i386)
+# define ffi_closure_inner C(ffi_closure_inner)
+#endif
+
/* This macro allows the safe creation of jump tables without an
actual table. The entry points into the table are all 8 bytes.
The use of ORG asserts that we're at the correct location. */
@@ -54,8 +63,8 @@
.text
.align 16
- .globl C(ffi_call_i386)
- FFI_HIDDEN(C(ffi_call_i386))
+ .globl ffi_call_i386
+ FFI_HIDDEN(ffi_call_i386)
/* This is declared as
@@ -68,7 +77,7 @@
edx: argp
*/
-C(ffi_call_i386):
+ffi_call_i386:
cfi_startproc
movl (%esp), %eax /* move the return address */
movl %ebp, (%ecx) /* store %ebp into local frame */
@@ -168,7 +177,7 @@ E(X86_RET_UNUSED15)
ud2
cfi_endproc
-ENDF(C(ffi_call_i386))
+ENDF(ffi_call_i386)
/* The inner helper is declared as
@@ -210,9 +219,9 @@ ENDF(C(ffi_call_i386))
addl $C(_GLOBAL_OFFSET_TABLE_), %ebx
#endif
#if defined HAVE_HIDDEN_VISIBILITY_ATTRIBUTE || !defined __PIC__
- call C(ffi_closure_inner)
+ call ffi_closure_inner
#else
- call C(ffi_closure_inner)@PLT
+ call ffi_closure_inner@PLT
#endif
.endm
--
1.9.3