diff options
Diffstat (limited to 'gcc/java/lang.c')
| -rw-r--r-- | gcc/java/lang.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/gcc/java/lang.c b/gcc/java/lang.c index 6344c3c8707..51a59d218a8 100644 --- a/gcc/java/lang.c +++ b/gcc/java/lang.c @@ -1,6 +1,6 @@ /* Java(TM) language-specific utility routines. - 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. @@ -120,16 +120,11 @@ const struct attribute_spec java_attribute_table[] = prototypes. Starts out false. */ static bool inhibit_error_function_printing; -int compiling_from_source; - const char *resource_name; /* When nonzero, -Wall was turned on. */ int flag_wall = 0; -/* The encoding of the source file. */ -const char *current_encoding = NULL; - /* When nonzero, report use of deprecated classes, methods, or fields. */ int flag_deprecated = 1; @@ -313,6 +308,7 @@ java_handle_option (size_t scode, const char *arg, int value) jcf_path_bootclasspath_arg (arg); break; + case OPT_faux_classpath: case OPT_fclasspath_: case OPT_fCLASSPATH_: jcf_path_classpath_arg (arg); @@ -328,7 +324,7 @@ java_handle_option (size_t scode, const char *arg, int value) break; case OPT_fencoding_: - current_encoding = arg; + /* Nothing. */ break; case OPT_fextdirs_: @@ -336,13 +332,17 @@ java_handle_option (size_t scode, const char *arg, int value) break; case OPT_foutput_class_dir_: - jcf_write_base_directory = arg; + /* FIXME: remove; this is handled by ecj1 now. */ break; case OPT_version: v_flag = 1; break; + case OPT_fsource_filename_: + java_read_sourcefilenames (arg); + break; + default: if (cl_options[code].flags & CL_Java) break; @@ -994,7 +994,8 @@ java_dump_tree (void *dump_info, tree t) static bool java_decl_ok_for_sibcall (tree decl) { - return decl != NULL && DECL_CONTEXT (decl) == output_class; + return (decl != NULL && DECL_CONTEXT (decl) == output_class + && DECL_INLINE (decl)); } /* Given a call_expr, try to figure out what its target might be. In |