Rebase
diff --git a/ChangeLog b/ChangeLog
index aa8ecc7..8a83fb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,14 @@
-2011-09-06 Anthony Green <green@moxielogic.com>
+2011-11-12 Anthony Green <green@moxielogic.com>
* Makefile.am (AM_CCASFLAGS): Add -g option to build assembly
files with debug info.
* Makefile.in: Rebuilt.
-2011-08-24 Jasper Lievisse Adriaanse <jasper@openbsd.org>
+2011-11-12 Jasper Lievisse Adriaanse <jasper@openbsd.org>
* README: Update list of supported OpenBSD systems.
-2011-08-32 Anthony Green <green@moxielogic.com>
+2011-11-12 Anthony Green <green@moxielogic.com>
* libtool-version: Update.
* Makefile.am (nodist_libffi_la_SOURCES): Add src/debug.c if
@@ -18,10 +18,22 @@
* Makefile.in: Rebuilt.
* README: Update for 3.0.11.
-2011-08-22 Jasper Lievisse Adriaanse <jasper@openbsd.org>
+2011-11-10 Richard Henderson <rth@redhat.com>
- * configure.ac: Add OpenBSD/hppa and OpenBSD/powerpc support.
- * configure: Rebuilt.
+ * configure.ac (GCC_AS_CFI_PSEUDO_OP): Use it instead of inline check.
+ * configure, aclocal.m4: Rebuild.
+
+2011-09-04 Iain Sandoe <iains@gcc.gnu.org>
+
+ PR libffi/49594
+ * src/powerpc/darwin_closure.S (stubs): Make the stub binding
+ helper reference track the architecture pointer size.
+
+2011-08-25 Andrew Haley <aph@redhat.com>
+
+ * src/arm/ffi.c (FFI_INIT_TRAMPOLINE): Remove hard-coded assembly
+ instructions.
+ * src/arm/sysv.S (ffi_arm_trampoline): Put them here instead.
2011-07-11 Andrew Haley <aph@redhat.com>
@@ -797,6 +809,11 @@
* man/Makefile.in: Regenerate.
* testsuite/Makefile.in: Regenerate.
+2011-08-22 Jasper Lievisse Adriaanse <jasper@openbsd.org>
+
+ * configure.ac: Add OpenBSD/hppa and OpenBSD/powerpc support.
+ * configure: Rebuilt.
+
2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force.