From 85c4f26a8651192648d1d4ce37009d838abe4152 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 23 Mar 2005 20:27:12 +0000 Subject: jvm.h (GCJ_40_BC_ABI_VERSION): New define. 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. From-SVN: r96948 --- gcc/java/ChangeLog | 5 +++++ gcc/java/decl.c | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'gcc') diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 70ad11c..16b956e 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2005-03-23 Tom Tromey + + * decl.c (GCJ_CURRENT_BC_ABI_VERSION): New define. + (parse_version): Use it. + 2005-03-23 Joseph S. Myers * lang.c (LANG_HOOKS_TRUTHVALUE_CONVERSION): Remove. diff --git a/gcc/java/decl.c b/gcc/java/decl.c index 2f9da97..d462f26 100644 --- a/gcc/java/decl.c +++ b/gcc/java/decl.c @@ -64,6 +64,13 @@ static void parse_version (void); /* Used when computing the ABI version. */ #define GCJ_BINARYCOMPAT_ADDITION 5 +/* The version of the BC ABI that we generate. At the moment we are + compatible with what shipped in GCC 4.0. This must be kept in sync + with parse_version(), libgcj, and reality (if the BC format + changes, this must change. */ +#define GCJ_CURRENT_BC_ABI_VERSION \ + (4 * 10000 + 0 * 10 + GCJ_BINARYCOMPAT_ADDITION) + /* The ABI version number. */ tree gcj_abi_version; @@ -609,7 +616,7 @@ parse_version (void) (objects generated by different version of gcj), but will probably always require strict matching for ordinary ABI. */ if (flag_indirect_dispatch) - abi_version += GCJ_BINARYCOMPAT_ADDITION; + abi_version = GCJ_CURRENT_BC_ABI_VERSION; gcj_abi_version = build_int_cstu (ptr_type_node, abi_version); } -- cgit v1.1