diff options
| author | Tom Tromey <tromey@gcc.gnu.org> | 2007-01-09 19:58:05 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2007-01-09 19:58:05 +0000 |
| commit | 97b8365cafc3a344a22d3980b8ed885f5c6d8357 (patch) | |
| tree | 996a5f57d4a68c53473382e45cb22f574cb3e4db /gcc/java/decl.c | |
| parent | c648dedbde727ca3f883bb5fd773aa4af70d3369 (diff) | |
| download | gcc-97b8365cafc3a344a22d3980b8ed885f5c6d8357.zip gcc-97b8365cafc3a344a22d3980b8ed885f5c6d8357.tar.gz gcc-97b8365cafc3a344a22d3980b8ed885f5c6d8357.tar.bz2 | |
Merged gcj-eclipse branch to trunk.
From-SVN: r120621
Diffstat (limited to 'gcc/java/decl.c')
| -rw-r--r-- | gcc/java/decl.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/gcc/java/decl.c b/gcc/java/decl.c index 912f854..3460609 100644 --- a/gcc/java/decl.c +++ b/gcc/java/decl.c @@ -1,7 +1,7 @@ /* Process declarations and variables for the GNU compiler for the Java(TM) language. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 - Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006, 2007 Free Software Foundation, Inc. This file is part of GCC. @@ -75,9 +75,9 @@ static void parse_version (void); loader. */ /* If an ABI change is made within a GCC release series, rendering current - binaries incompatible with the old runtimes, this number can be set to + binaries incompatible with the old runtimes, this number must be set to enforce the compatibility rules. */ -#define MINOR_BINARYCOMPAT_ABI_VERSION 0 +#define MINOR_BINARYCOMPAT_ABI_VERSION 1 /* The runtime may recognize a variety of BC ABIs (objects generated by different version of gcj), but will probably always require strict @@ -755,15 +755,9 @@ java_init_decl_processing (void) TYPE_identifier_node = get_identifier ("TYPE"); init_identifier_node = get_identifier ("<init>"); clinit_identifier_node = get_identifier ("<clinit>"); - finit_identifier_node = get_identifier ("finit$"); - instinit_identifier_node = get_identifier ("instinit$"); void_signature_node = get_identifier ("()V"); - length_identifier_node = get_identifier ("length"); finalize_identifier_node = get_identifier ("finalize"); this_identifier_node = get_identifier ("this"); - super_identifier_node = get_identifier ("super"); - continue_identifier_node = get_identifier ("continue"); - access0_identifier_node = get_identifier ("access$0"); classdollar_identifier_node = get_identifier ("class$"); java_lang_cloneable_identifier_node = get_identifier ("java.lang.Cloneable"); @@ -854,6 +848,7 @@ java_init_decl_processing (void) PUSH_FIELD (class_type_node, field, "chain", ptr_type_node); PUSH_FIELD (class_type_node, field, "aux_info", ptr_type_node); PUSH_FIELD (class_type_node, field, "engine", ptr_type_node); + PUSH_FIELD (class_type_node, field, "reflection_data", ptr_type_node); for (t = TYPE_FIELDS (class_type_node); t != NULL_TREE; t = TREE_CHAIN (t)) FIELD_PRIVATE (t) = 1; push_super_field (class_type_node, object_type_node); @@ -1109,8 +1104,6 @@ java_init_decl_processing (void) lang_eh_runtime_type = do_nothing; - init_jcf_parse (); - initialize_builtins (); soft_fmod_node = built_in_decls[BUILT_IN_FMOD]; #if 0 |