git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

jvm.h (GCJ_CXX_ABI_VERSION): Freeze the ABI for releases made from the gcc-5-branch. 

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

        * include/jvm.h (GCJ_CXX_ABI_VERSION): Freeze the ABI for releases
        made from the gcc-5-branch.

From-SVN: r232041
This commit is contained in:
Matthias Klose 2016-01-03 17:34:00 +00:00 committed by Matthias Klose
parent 38c411eb40
commit 72df0c122a
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -1,3 +1,8 @@
2016-01-03 Matthias Klose <doko@ubuntu.com>
* include/jvm.h (GCJ_CXX_ABI_VERSION): Freeze the ABI for releases
made from the gcc-5-branch.
2015-12-04 Release Manager 2015-12-04 Release Manager
* GCC 5.3.0 released. * GCC 5.3.0 released.

5
libjava/include/jvm.h
View File

@ -686,7 +686,10 @@ extern void _Jv_RegisterBootstrapPackages ();
loader. */ loader. */
// These are used to find ABI versions we recognize. // These are used to find ABI versions we recognize.
#define GCJ_CXX_ABI_VERSION (__GNUC__ * 100000 + __GNUC_MINOR__ * 1000) // GCC 5 changed the versioning schema; the __GNUC_MINOR__ is not anymore
// a part of a GCC release series. Freeze the ABI on the gcc-5-branch with
// the value of the GCC 5.3 release.
#define GCJ_CXX_ABI_VERSION (__GNUC__ * 100000 + 3 * 1000)
// This is the old-style BC version ID used by GCJ 4.0.0. // 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) #define OLD_GCJ_40_BC_ABI_VERSION (4 * 10000 + 0 * 10 + 5)