2016-01-03 Matthias Klose <doko@ubuntu.com>

        * libtool-version: Bump soversion.
        * include/jvm.h (GCJ_CXX_ABI_VERSION): Don't encode __GNUC_MINOR__.

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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 0d75195..670b19c 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-03  Matthias Klose  <doko@ubuntu.com>
+
+       * libtool-version: Bump soversion.
+       * include/jvm.h (GCJ_CXX_ABI_VERSION): Don't encode __GNUC_MINOR__.
+
 2015-07-24  Michael Darling  <darlingm@gmail.com>
 
        PR other/66259

diff --git a/libjava/include/jvm.h b/libjava/include/jvm.h
index ec74f29..5015d4e 100644 (file)
--- a/libjava/include/jvm.h
+++ b/libjava/include/jvm.h
@@ -686,7 +686,7 @@ extern void _Jv_RegisterBootstrapPackages ();
                                          loader.  */
 
 // These are used to find ABI versions we recognize.
-#define GCJ_CXX_ABI_VERSION (__GNUC__ * 100000 + __GNUC_MINOR__ * 1000)
+#define GCJ_CXX_ABI_VERSION (__GNUC__ * 100000)
 
 // This is the old-style BC version ID used by GCJ 4.0.0.
 #define OLD_GCJ_40_BC_ABI_VERSION (4 * 10000 + 0 * 10 + 5)

diff --git a/libjava/libtool-version b/libjava/libtool-version
index 52fc31c..d2648c4 100644 (file)
--- a/libjava/libtool-version
+++ b/libjava/libtool-version
@@ -5,4 +5,4 @@
 # 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
+17:0:0