diff options
| author | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-01-03 11:38:51 +0000 |
|---|---|---|
| committer | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-01-03 11:38:51 +0000 |
| commit | 33e0bf2ff98524201155748afb656dd66ec187c6 (patch) | |
| tree | 5ae22d692b7175f36cbeec801eead9a5914cda58 /libjava | |
| parent | 6e5b1127848cba2a98193c3cf2da9c6ff819e6b3 (diff) | |
| download | gcc-33e0bf2ff98524201155748afb656dd66ec187c6.tar.gz | |
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
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/include/jvm.h | 2 | ||||
| -rw-r--r-- | libjava/libtool-version | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 0d7519559e3..670b19c4550 100644 --- 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 ec74f295a5f..5015d4ee0e2 100644 --- 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 52fc31c8e0a..d2648c413a7 100644 --- 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 |