From 5fa25adb316f0a54a2e92ec7a085b3a24b2db359 Mon Sep 17 00:00:00 2001
From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Thu, 29 Jan 2015 00:34:03 +0000
Subject: [PATCH] cygwin.h (LIBGCJ_SONAME): Set libgcj version to -16.
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.
From-SVN: r220228
---
gcc/ChangeLog | 5 +++++
gcc/config/i386/cygwin.h | 2 +-
gcc/config/i386/mingw32.h | 2 +-
libjava/ChangeLog | 4 ++++
libjava/libtool-version | 2 ++
5 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e0fef992067c..3f99bb3c3220 100644
--- 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 37f27a786e5e..a90f51331050 100644
--- 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 d7b92e88714e..ab46ff26d2da 100644
--- 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 f28f97f3c61c..e87dc2f76c1d 100644
--- 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 5f88e38d639f..52fc31c8e0a2 100644
--- 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
--
GitLab