From 72df0c122aa6317b913c46c26e695659c8a99e3c Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sun, 3 Jan 2016 17:34:00 +0000 Subject: [PATCH] jvm.h (GCJ_CXX_ABI_VERSION): Freeze the ABI for releases made from the gcc-5-branch. 2016-01-03 Matthias Klose * include/jvm.h (GCJ_CXX_ABI_VERSION): Freeze the ABI for releases made from the gcc-5-branch. From-SVN: r232041 --- libjava/ChangeLog | 5 +++++ libjava/include/jvm.h | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d413bfb14cc6..31041864eddc 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2016-01-03 Matthias Klose + + * include/jvm.h (GCJ_CXX_ABI_VERSION): Freeze the ABI for releases + made from the gcc-5-branch. + 2015-12-04 Release Manager * GCC 5.3.0 released. diff --git a/libjava/include/jvm.h b/libjava/include/jvm.h index ec74f295a5fd..bd39a944c5d0 100644 --- a/libjava/include/jvm.h +++ b/libjava/include/jvm.h @@ -686,7 +686,10 @@ extern void _Jv_RegisterBootstrapPackages (); loader. */ // 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. #define OLD_GCJ_40_BC_ABI_VERSION (4 * 10000 + 0 * 10 + 5)