diff options
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 11 | ||||
| -rw-r--r-- | gcc/java/Make-lang.in | 2 | ||||
| -rw-r--r-- | gcc/java/boehm.c | 2 | ||||
| -rw-r--r-- | gcc/java/builtins.c | 2 | ||||
| -rw-r--r-- | gcc/java/decl.c | 2 | ||||
| -rw-r--r-- | gcc/java/java-tree.h | 2 | ||||
| -rw-r--r-- | gcc/java/lang.c | 4 | ||||
| -rw-r--r-- | gcc/java/typeck.c | 4 |
8 files changed, 23 insertions, 6 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 3006c85..b4ffd19 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,14 @@ +2002-03-29 Neil Booth <neil@daikokuya.demon.co.uk> + + * Make-lang.in (builtins.o): Update. + * boehm.c (get_boehm_type_descriptor): Update. + * builtins.c: Include langhooks.h. + * decl.c (java_init_decl_processing): Update. + * java-tree.h (java_type_for_mode, java_type_for_size): New. + * lang.c (LANG_HOOKS_TYPE_FOR_MODE, LANG_HOOKS_TYPE_FOR_SIaZE): + Redefine. + * typeck.c (type_for_mode, type_for_size): Update. + 2002-03-29 Martin Kahlert <martin.kahlert@infineon.com> * lex.c (java_new_lexer): Alias "646" to DEFAULT_ENCODING. diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index 9165a09..00185e5 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -261,7 +261,7 @@ java/boehm.o: java/boehm.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(JAVA_TREE_H) \ java/parse.h toplev.h java/buffer.o: java/buffer.c $(CONFIG_H) java/buffer.h $(SYSTEM_H) toplev.h java/builtins.o: java/builtins.c $(CONFIG_H) $(SYSTEM_H) $(JAVA_TREE_H) \ - $(GGC_H) flags.h + $(GGC_H) flags.h builtin-types.def langhooks.h java/check-init.o: java/check-init.c $(CONFIG_H) \ $(JAVA_TREE_H) $(SYSTEM_H) toplev.h java/class.o: java/class.c $(CONFIG_H) $(JAVA_TREE_H) $(RTL_H) java/jcf.h \ diff --git a/gcc/java/boehm.c b/gcc/java/boehm.c index 3eb2043..566655a 100644 --- a/gcc/java/boehm.c +++ b/gcc/java/boehm.c @@ -230,6 +230,6 @@ get_boehm_type_descriptor (tree type) value = build_int_2 (2, 0); } - TREE_TYPE (value) = type_for_mode (ptr_mode, 1); + TREE_TYPE (value) = java_type_for_mode (ptr_mode, 1); return value; } diff --git a/gcc/java/builtins.c b/gcc/java/builtins.c index 7af0435..81be7e3 100644 --- a/gcc/java/builtins.c +++ b/gcc/java/builtins.c @@ -30,7 +30,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "tree.h" #include "ggc.h" #include "flags.h" - +#include "langhooks.h" #include "java-tree.h" enum builtin_type diff --git a/gcc/java/decl.c b/gcc/java/decl.c index a0a77b2..c0560c6 100644 --- a/gcc/java/decl.c +++ b/gcc/java/decl.c @@ -441,7 +441,7 @@ java_init_decl_processing () set_sizetype (make_unsigned_type (POINTER_SIZE)); /* Define these next since types below may used them. */ - integer_type_node = type_for_size (INT_TYPE_SIZE, 0); + integer_type_node = java_type_for_size (INT_TYPE_SIZE, 0); integer_zero_node = build_int_2 (0, 0); integer_one_node = build_int_2 (1, 0); integer_two_node = build_int_2 (2, 0); diff --git a/gcc/java/java-tree.h b/gcc/java/java-tree.h index cf272fd..3f47430 100644 --- a/gcc/java/java-tree.h +++ b/gcc/java/java-tree.h @@ -1039,6 +1039,8 @@ struct lang_type extern void java_set_yydebug PARAMS ((int)); extern void java_parse_file PARAMS ((void)); extern void java_mark_tree PARAMS ((tree)); +extern tree java_type_for_mode PARAMS ((enum machine_mode, int)); +extern tree java_type_for_size PARAMS ((unsigned int, int)); extern void add_assume_compiled PARAMS ((const char *, int)); extern tree lookup_class PARAMS ((tree)); extern tree lookup_java_constructor PARAMS ((tree, tree)); diff --git a/gcc/java/lang.c b/gcc/java/lang.c index fd19723..583af75 100644 --- a/gcc/java/lang.c +++ b/gcc/java/lang.c @@ -231,6 +231,10 @@ static int dependency_tracking = 0; #define LANG_HOOKS_DUP_LANG_SPECIFIC_DECL java_dup_lang_specific_decl #undef LANG_HOOKS_DECL_PRINTABLE_NAME #define LANG_HOOKS_DECL_PRINTABLE_NAME lang_printable_name +#undef LANG_HOOKS_TYPE_FOR_MODE +#define LANG_HOOKS_TYPE_FOR_MODE java_type_for_mode +#undef LANG_HOOKS_TYPE_FOR_SIZE +#define LANG_HOOKS_TYPE_FOR_SIZE java_type_for_size /* Each front end provides its own. */ const struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER; diff --git a/gcc/java/typeck.c b/gcc/java/typeck.c index 34dbc2e..88f3fb9 100644 --- a/gcc/java/typeck.c +++ b/gcc/java/typeck.c @@ -183,7 +183,7 @@ incomplete_type_error (value, type) then UNSIGNEDP selects between signed and unsigned types. */ tree -type_for_mode (mode, unsignedp) +java_type_for_mode (mode, unsignedp) enum machine_mode mode; int unsignedp; { @@ -207,7 +207,7 @@ type_for_mode (mode, unsignedp) that is unsigned if UNSIGNEDP is nonzero, otherwise signed. */ tree -type_for_size (bits, unsignedp) +java_type_for_size (bits, unsignedp) unsigned bits; int unsignedp; { |