summaryrefslogtreecommitdiff
path: root/libffi/src/x86/ffitarget.h
diff options
context:
space:
mode:
authorAnthony Green <green@gcc.gnu.org>2012-12-26 16:28:02 +0000
committerAnthony Green <green@gcc.gnu.org>2012-12-26 16:28:02 +0000
commitb4b575ce7854f4a49de8de93f38b7639e01b040b (patch)
treeef354e445015ccf6c34c675cf123ef8ca5128a8c /libffi/src/x86/ffitarget.h
parentdc3a31d4767c19ab47211e29fbc3c8866df8d8a1 (diff)
downloadgcc-b4b575ce7854f4a49de8de93f38b7639e01b040b.tar.gz
libffi merge
From-SVN: r194722
Diffstat (limited to 'libffi/src/x86/ffitarget.h')
-rw-r--r--libffi/src/x86/ffitarget.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/libffi/src/x86/ffitarget.h b/libffi/src/x86/ffitarget.h
index fc015410970..46f294cea72 100644
--- a/libffi/src/x86/ffitarget.h
+++ b/libffi/src/x86/ffitarget.h
@@ -81,9 +81,13 @@ typedef enum ffi_abi {
FFI_STDCALL,
FFI_THISCALL,
FFI_FASTCALL,
+ FFI_MS_CDECL,
FFI_LAST_ABI,
- /* TODO: Add fastcall support for the sake of completeness */
+#ifdef _MSC_VER
+ FFI_DEFAULT_ABI = FFI_MS_CDECL
+#else
FFI_DEFAULT_ABI = FFI_SYSV
+#endif
#elif defined(X86_WIN64)
FFI_WIN64,
@@ -110,6 +114,7 @@ typedef enum ffi_abi {
#define FFI_TYPE_SMALL_STRUCT_1B (FFI_TYPE_LAST + 1)
#define FFI_TYPE_SMALL_STRUCT_2B (FFI_TYPE_LAST + 2)
#define FFI_TYPE_SMALL_STRUCT_4B (FFI_TYPE_LAST + 3)
+#define FFI_TYPE_MS_STRUCT (FFI_TYPE_LAST + 4)
#if defined (X86_64) || (defined (__x86_64__) && defined (X86_DARWIN))
#define FFI_TRAMPOLINE_SIZE 24