2015-01-29 Bernd Edlinger <bernd.edlinger@hotmail.de>

        * config/i386/cygwin.h (LIBGCJ_SONAME): Set libgcj version to -16.
        * config/i386/mingw32.h (LIBGCJ_SONAME): Set libgcj version to -16.

libjava/
2015-01-29  Bernd Edlinger  <bernd.edlinger@hotmail.de>

        * libtool-version: Add a comment about cygwin.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@220228 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e0fef99..3f99bb3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-29  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+       * config/i386/cygwin.h (LIBGCJ_SONAME): Set libgcj version to -16.
+       * config/i386/mingw32.h (LIBGCJ_SONAME): Set libgcj version to -16.
+
 2015-01-28  Oleg Endo  <olegendo@gcc.gnu.org>
 
        PR target/64659

diff --git a/gcc/config/i386/cygwin.h b/gcc/config/i386/cygwin.h
index 37f27a7..a90f513 100644 (file)
--- a/gcc/config/i386/cygwin.h
+++ b/gcc/config/i386/cygwin.h
@@ -146,5 +146,5 @@ along with GCC; see the file COPYING3.  If not see
 #define LIBGCC_SONAME "cyggcc_s" LIBGCC_EH_EXTN "-1.dll"
 
 /* We should find a way to not have to update this manually.  */
-#define LIBGCJ_SONAME "cyggcj" /*LIBGCC_EH_EXTN*/ "-15.dll"
+#define LIBGCJ_SONAME "cyggcj" /*LIBGCC_EH_EXTN*/ "-16.dll"
 

diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h
index d7b92e8..ab46ff2 100644 (file)
--- a/gcc/config/i386/mingw32.h
+++ b/gcc/config/i386/mingw32.h
@@ -246,4 +246,4 @@ do {                                                         \
 #define LIBGCC_SONAME "libgcc_s" LIBGCC_EH_EXTN "-1.dll"
 
 /* We should find a way to not have to update this manually.  */
-#define LIBGCJ_SONAME "libgcj" /*LIBGCC_EH_EXTN*/ "-13.dll"
+#define LIBGCJ_SONAME "libgcj" /*LIBGCC_EH_EXTN*/ "-16.dll"

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f28f97f..e87dc2f 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-29  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+       * libtool-version: Add a comment about cygwin.
+
 2015-01-21  Matthias Klose  <doko@ubuntu.com>
 
        * libtool-version: Bump soversion.

diff --git a/libjava/libtool-version b/libjava/libtool-version
index 5f88e38..52fc31c 100644 (file)
--- a/libjava/libtool-version
+++ b/libjava/libtool-version
@@ -2,5 +2,7 @@
 # the libtool manual to understand the meaning of the fields.  This is
 # a separate file so that version updates don't involve re-running
 # automake.
+# Note: When changing the version here, please do also update LIBGCJ_SONAME
+# in gcc/config/i386/cygwin.h and gcc/config/i386/mingw32.h.
 # CURRENT:REVISION:AGE
 16:0:0