Rebase from GCC
diff --git a/ChangeLog b/ChangeLog
index 0fdc482..0558cf0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,28 @@
+2012-01-28 Kai Tietz <ktietz@redhat.com>
+
+ * src/libffi/src/x86/ffi.c (ffi_call_win32): Add new
+ argument to prototype for specify calling-convention.
+ (ffi_call): Add support for stdcall/thiscall convention.
+ (ffi_prep_args): Likewise.
+ (ffi_raw_call): Likewise.
+ * src/x86/ffitarget.h (ffi_abi): Add FFI_THISCALL and
+ FFI_FASTCALL.
+ * src/x86/win32.S (_ffi_call_win32): Add support for
+ fastcall/thiscall calling-convention calls.
+ * testsuite/libffi.call/fastthis1_win32.c: New test.
+ * testsuite/libffi.call/fastthis2_win32.c: New test.
+ * testsuite/libffi.call/fastthis3_win32.c: New test.
+ * testsuite/libffi.call/strlen2_win32.c: New test.
+ * testsuite/libffi.call/many2_win32.c: New test.
+ * testsuite/libffi.call/struct1_win32.c: New test.
+ * testsuite/libffi.call/struct2_win32.c: New test.
+
2012-01-23 Uros Bizjak <ubizjak@gmail.com>
* src/alpha/ffi.c (ffi_prep_closure_loc): Check for bad ABI.
-2012-01-23 Chris Young <cdyoung@ntlworld.com>
+2012-01-23 Anthony Green <green@moxielogic.com>
+ Chris Young <cdyoung@ntlworld.com>
* configure.ac: Add Amiga support.
* configure: Rebuilt.
@@ -11,16 +31,11 @@
* include/ffi_common.h (LIKELY, UNLIKELY): Fix definitions.
-2012-01-23 Andreas Schwab <schwab@linux-m68k.org>
+2012-01-23 Andreas Schwab <schwab@linux-m68k.org>
* src/m68k/sysv.S (ffi_call_SYSV): Properly test for plain
mc68000. Test for __HAVE_68881__ in addition to __MC68881__.
-2012-01-23 Alan Hourihane <alanh@fairlite.co.uk>
-
- * src/m68k/ffi.c (ffi_prep_closure_loc): Fix ABI check.
- * testsuite/libffi.call/return_sc.c (main): Fix test check.
-
2012-01-19 Jakub Jelinek <jakub@redhat.com>
PR rtl-optimization/48496