2015-01-28  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-28  Bernd Edlinger  <bernd.edlinger@hotmail.de>

	* libtool-version: Add a comment about cygwin.


--- gcc/config/i386/cygwin.h.jj	2015-01-05 13:33:28.000000000 +0100
+++ gcc/config/i386/cygwin.h	2015-01-28 12:15:21.045711971 +0100
@@ -146,5 +146,5 @@
 #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"
 
--- gcc/config/i386/mingw32.h.jj	2015-01-15 21:11:12.000000000 +0100
+++ gcc/config/i386/mingw32.h	2015-01-28 12:14:11.697910803 +0100
@@ -246,4 +246,4 @@
 #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"
--- libjava/libtool-version.jj	2015-01-21 11:17:59.000000000 +0100
+++ libjava/libtool-version	2015-01-28 12:23:48.008243719 +0100
@@ -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