diff options
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/Make-lang.in | 4 | ||||
| -rw-r--r-- | gcc/java/lang.c | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index a635c1e..8932913 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2010-11-12 Joseph Myers <joseph@codesourcery.com> + + * Make-lang.in (jvspec.o, java/lang.o): Use $(OPTS_H). + * lang.c (java_handle_option): Take location_t parameter. + 2010-11-10 Joseph Myers <joseph@codesourcery.com> * expr.c (expand_java_field_op): Use %' in diagnostic. diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index 7b7ed93..beff30c 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -57,7 +57,7 @@ JAVA_TARGET_INDEPENDENT_BIN_TOOLS = jcf-dump .PHONY: java jvspec.o: $(srcdir)/java/jvspec.c $(SYSTEM_H) coretypes.h $(TM_H) \ - $(GCC_H) $(CONFIG_H) java/jcf.h java/javaop.h opts.h + $(GCC_H) $(CONFIG_H) java/jcf.h java/javaop.h $(OPTS_H) (SHLIB_LINK='$(SHLIB_LINK)'; \ $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(DRIVER_DEFINES) \ $(INCLUDES) $(srcdir)/java/jvspec.c $(OUTPUT_OPTION)) @@ -302,7 +302,7 @@ java/jvgenmain.o: java/jvgenmain.c $(CONFIG_H) $(JAVA_TREE_H) $(SYSTEM_H) \ coretypes.h $(TM_H) intl.h java/lang.o: java/lang.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h input.h \ toplev.h $(SYSTEM_H) coretypes.h $(TM_H) $(DIAGNOSTIC_H) \ - langhooks.h $(LANGHOOKS_DEF_H) gt-java-lang.h opts.h $(OPTIONS_H) \ + langhooks.h $(LANGHOOKS_DEF_H) gt-java-lang.h $(OPTS_H) $(OPTIONS_H) \ $(TARGET_H) java/mangle.o: java/mangle.c $(CONFIG_H) java/jcf.h $(JAVA_TREE_H) $(SYSTEM_H) \ coretypes.h $(TM_H) toplev.h $(GGC_H) gt-java-mangle.h $(LANGHOOKS_DEF_H) diff --git a/gcc/java/lang.c b/gcc/java/lang.c index 8065efa..7a17978 100644 --- a/gcc/java/lang.c +++ b/gcc/java/lang.c @@ -52,7 +52,7 @@ static void java_init_options_struct (struct gcc_options *); static void java_init_options (unsigned int, struct cl_decoded_option *); static bool java_post_options (const char **); -static bool java_handle_option (size_t, const char *, int, int, +static bool java_handle_option (size_t, const char *, int, int, location_t, const struct cl_option_handlers *); static void put_decl_string (const char *, int); static void put_decl_node (tree, int); @@ -183,7 +183,7 @@ struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER; */ static bool java_handle_option (size_t scode, const char *arg, int value, - int kind ATTRIBUTE_UNUSED, + int kind ATTRIBUTE_UNUSED, location_t loc ATTRIBUTE_UNUSED, const struct cl_option_handlers *handlers ATTRIBUTE_UNUSED) { enum opt_code code = (enum opt_code) scode; |