Skip to content
This repository has been archived by the owner on Jan 31, 2024. It is now read-only.

Commit

Permalink
libtool-version: Bump soversion.
Browse files Browse the repository at this point in the history
2016-01-03  Matthias Klose  <doko@ubuntu.com>

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

From-SVN: r232040
  • Loading branch information
doko42 authored and Matthias Klose committed Jan 3, 2016
1 parent 783bfcc commit 0e8d41a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
5 changes: 5 additions & 0 deletions libjava/ChangeLog
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion libjava/include/jvm.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion libjava/libtool-version
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 0e8d41a

Please sign in to comment.