From 22d320f5177efd0eb22fd0f21c8d4d63af54ac9e Mon Sep 17 00:00:00 2001 From: tromey Date: Wed, 23 Mar 2005 20:27:12 +0000 Subject: libjava: * include/jvm.h (GCJ_40_BC_ABI_VERSION): New define. (_Jv_CheckABIVersion): Use it. gcc/java: * decl.c (GCJ_CURRENT_BC_ABI_VERSION): New define. (parse_version): Use it. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96948 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 5 +++++ libjava/include/jvm.h | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'libjava') diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c3be587b67e..14c5079f3f9 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2005-03-23 Tom Tromey + + * include/jvm.h (GCJ_40_BC_ABI_VERSION): New define. + (_Jv_CheckABIVersion): Use it. + 2005-03-22 Mike Stump * stacktrace.cc: Delete unused _Jv_FindCallingClassState. diff --git a/libjava/include/jvm.h b/libjava/include/jvm.h index 62347880bb6..7a5a4eaa28e 100644 --- a/libjava/include/jvm.h +++ b/libjava/include/jvm.h @@ -562,14 +562,17 @@ extern void _Jv_RegisterBootstrapPackages (); #define GCJ_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 10) #define GCJ_BINARYCOMPAT_ADDITION 5 +// At present we know we are compatible with the BC ABI as used in GCC +// 4.0. +#define GCJ_40_BC_ABI_VERSION (4 * 10000 + 0 * 10 + GCJ_BINARYCOMPAT_ADDITION) + inline bool _Jv_CheckABIVersion (unsigned long value) { - // For this release, recognize just our defined C++ ABI and our - // defined BC ABI. (In the future we may recognize past BC ABIs as - // well.) + // Recognize our defined C++ ABI. return (value == GCJ_VERSION - || value == (GCJ_VERSION + GCJ_BINARYCOMPAT_ADDITION)); + // At the moment this is the only BC ABI we recognize. + || value == GCJ_40_BC_ABI_VERSION); } // It makes the source cleaner if we simply always define this -- cgit v1.2.3