diff options
Diffstat (limited to 'libjava/include/jvm.h')
| -rw-r--r-- | libjava/include/jvm.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libjava/include/jvm.h b/libjava/include/jvm.h index ec74f295a5f..bd39a944c5d 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) |