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

2 files changed, 13 insertions, 1 deletions

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 70ad11c3647..16b956e0bb8 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-23  Tom Tromey  <tromey@redhat.com>
+
+	* decl.c (GCJ_CURRENT_BC_ABI_VERSION): New define.
+	(parse_version): Use it.
+
 2005-03-23  Joseph S. Myers  <joseph@codesourcery.com>
 
 	* lang.c (LANG_HOOKS_TRUTHVALUE_CONVERSION): Remove.
diff --git a/gcc/java/decl.c b/gcc/java/decl.c
index 2f9da979733..d462f269640 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);
 }