ChangeLog.libgcj: Move last two entries ...

	* ChangeLog.libgcj: Move last two entries ...
	* ChangeLog: ... here.

From-SVN: r189627

diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index 4f514f9f99903a8de379a0328254ea97a4b410ed..00b7a74219aedf808529441e2481b682237519f2 100644 (file)
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,14 @@
+2012-07-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR libffi/53982
+       PR libffi/53973
+       * src/x86/ffitarget.h: Check __ILP32__ instead of __LP64__ for x32.
+       (FFI_SIZEOF_JAVA_RAW): Defined to 4 for x32.
+
+2012-05-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * configure: Regenerated.
+
 2012-04-02  Peter Bergner  <bergner@vnet.ibm.com>
 
        * src/powerpc/ffi.c (ffi_prep_args_SYSV): Declare double_tmp.

diff --git a/libffi/ChangeLog.libgcj b/libffi/ChangeLog.libgcj
index e0aaa83c2ab9483c723422e184d5fd463cb2d948..ea5d02f19ba325cc87665cbe299d35d98d15d529 100644 (file)
--- a/libffi/ChangeLog.libgcj
+++ b/libffi/ChangeLog.libgcj
@@ -1,15 +1,3 @@
-2012-07-18  H.J. Lu  <hongjiu.lu@intel.com>
-
-       PR libffi/53982
-       PR libffi/53973
-       * src/x86/ffitarget.h: Check __ILP32__ instead of __LP64__ for
-       x32.
-       (FFI_SIZEOF_JAVA_RAW): Defined to 4 for x32.
-
-2012-05-16  H.J. Lu  <hongjiu.lu@intel.com>
-
-       * configure: Regenerated.
-
 2004-01-14  Kelley Cook  <kcook@gcc.gnu.org>
 
        * configure.in: Add in AC_PREREQ(2.13)