Convert java/ to use opts.c
Neil Booth
neil@daikokuya.co.uk
Sun Jun 8 15:44:00 GMT 2003
This patch gets java/ to use opts.c, and also contains some simple
constification that entails.
It adds -Wno-all for consistency with C/ObjC/C++/f77 and also
adds -fno-inline-functions which wasn't provided before. If there's
a good reason for this I'll happily remove it.
This bootstraps on x86 NetBSD; I'm running the testsuite. OK if it
succeeds?
Neil.
java:
* Make-lang.in (JAVA_OBJS, java/lang.o): Update.
(java/j-options.c, java/j-options.h): New.
* java-tree.h (resource_name, compile_resource_file,
compile_resource_data): Constify.
* jcf-write.c (jcf_write_base_directory): Similarly.
* jcf.h (jcf_write_base_directory): Similarly.
* lang.c: Include j-options.h.
(cl_options_count, cl_options, string_option, java_decode_option,
lang_f_options, lang_W_options, LANG_HOOKS_DECODE_OPTION,
process_option_with_no): Remove.
(resource_name): Constify.
(LANG_HOOKS_HANDLE_OPTION): Override.
(java_handle_option): New.
(java_init): Don't call jcf_path_init.
(java_init_options): Call jcf_path_init.
* lang.opt: New.
* resource.c (compile_resource_data, compile_resource_file): Constify.
Index: Make-lang.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/Make-lang.in,v
retrieving revision 1.110
diff -u -p -b -r1.110 Make-lang.in
--- Make-lang.in 8 Jun 2003 11:27:44 -0000 1.110
+++ Make-lang.in 8 Jun 2003 15:17:35 -0000
@@ -108,7 +108,7 @@ gt-java-builtins.h gtype-java.h gt-java-
JAVA_OBJS = java/parse.o java/class.o java/decl.o java/expr.o \
java/constants.o java/lang.o java/typeck.o java/except.o java/verify.o \
java/zextract.o java/jcf-io.o java/jcf-parse.o java/mangle.o \
- java/mangle_name.o java/builtins.o java/resource.o \
+ java/mangle_name.o java/builtins.o java/resource.o java/j-options.o \
java/jcf-write.o java/buffer.o java/check-init.o java/jcf-depend.o \
java/jcf-path.o java/xref.o java/boehm.o java/java-tree-inline.o mkdeps.o
@@ -326,7 +326,7 @@ java/jvgenmain.o: java/jvgenmain.c $(CON
coretypes.h $(TM_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) $(RTL_H) $(EXPR_H) diagnostic.h \
- langhooks.h $(LANGHOOKS_DEF_H) gt-java-lang.h opts.h
+ langhooks.h $(LANGHOOKS_DEF_H) gt-java-lang.h opts.h java/j-options.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
java/mangle_name.o: java/mangle_name.c $(CONFIG_H) java/jcf.h $(JAVA_TREE_H) \
@@ -346,6 +346,12 @@ java/xref.o: java/xref.c java/xref.h $(C
$(SYSTEM_H) coretypes.h $(TM_H)
java/zextract.o: java/zextract.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
java/zipfile.h
+
+java/j-options.c: java/lang.opt opts.sh java/j-options.h
+
+java/j-options.h: java/lang.opt opts.sh
+ AWK=$(AWK) $(SHELL) $(srcdir)/opts.sh java/j-options.c \
+ java/j-options.h $(srcdir)/java/lang.opt
# jcf-io.o needs $(ZLIBINC) added to cflags.
java/jcf-io.o: java/jcf-io.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
Index: java-tree.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/java-tree.h,v
retrieving revision 1.174
diff -u -p -b -r1.174 java-tree.h
--- java-tree.h 13 May 2003 17:41:17 -0000 1.174
+++ java-tree.h 8 Jun 2003 15:17:35 -0000
@@ -192,7 +192,7 @@ extern int flag_emit_xref;
extern int do_not_fold;
/* Resource name. */
-extern char * resource_name;
+extern const char *resource_name;
/* Turned to 1 if -Wall was encountered. See lang.c for their meanings. */
extern int flag_wall;
@@ -1127,7 +1127,6 @@ extern tree build_dtable_decl (tree);
extern tree build_internal_class_name (tree);
extern tree build_constants_constructor (void);
extern tree build_ref_from_constant_pool (int);
-extern void compile_resource_file (char *, const char *);
extern tree build_utf8_ref (tree);
extern tree ident_subst (const char*, int, const char*, int, int, const char*);
extern tree identifier_subst (const tree, const char *, int, int, const char *);
@@ -1304,9 +1303,9 @@ struct rtx_def * java_expand_expr (tree,
extern void java_inlining_merge_static_initializers (tree, void *);
extern void java_inlining_map_static_initializers (tree, void *);
-extern void compile_resource_data (char *name, const char *buffer, int length);
+extern void compile_resource_data (const char *name, const char *buffer, int);
+extern void compile_resource_file (const char *, const char *);
extern void write_resource_constructor (void);
-extern void compile_resource_file (char *name, const char *filename);
extern void init_resource_processing (void);
Index: jcf-write.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/jcf-write.c,v
retrieving revision 1.126
diff -u -p -b -r1.126 jcf-write.c
--- jcf-write.c 13 May 2003 18:06:49 -0000 1.126
+++ jcf-write.c 8 Jun 2003 15:17:36 -0000
@@ -49,7 +49,7 @@ extern struct obstack temporary_obstack;
/* Base directory in which `.class' files should be written.
NULL means to put the file into the same directory as the
corresponding .java file. */
-char *jcf_write_base_directory = NULL;
+const char *jcf_write_base_directory = NULL;
/* Make sure bytecode.data is big enough for at least N more bytes. */
Index: jcf.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/jcf.h,v
retrieving revision 1.37
diff -u -p -b -r1.37 jcf.h
--- jcf.h 10 Apr 2003 18:24:42 -0000 1.37
+++ jcf.h 8 Jun 2003 15:17:36 -0000
@@ -277,7 +277,7 @@ extern int jcf_unexpected_eof (JCF*, int
? (((PTR)[-3]&0x0F) << 12) + (((PTR)[-2]&0x3F) << 6) + ((PTR)[-1]&0x3F) \
: ((PTR)++, -1))
-extern char *jcf_write_base_directory;
+extern const char *jcf_write_base_directory;
/* Debug macros, for the front end */
Index: lang.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/lang.c,v
retrieving revision 1.126
diff -u -p -b -r1.126 lang.c
--- lang.c 8 Jun 2003 11:27:44 -0000 1.126
+++ lang.c 8 Jun 2003 15:17:36 -0000
@@ -46,27 +46,17 @@ The Free Software Foundation is independ
#include "splay-tree.h"
#include "tree-dump.h"
#include "opts.h"
-
-const unsigned int cl_options_count;
-const struct cl_option cl_options[1];
-
-struct string_option
-{
- const char *const string;
- int *const variable;
- const int on_value;
-};
+#include "j-options.h"
static bool java_init (void);
static void java_finish (void);
static int java_init_options (void);
static bool java_post_options (const char **);
-static int java_decode_option (int, char **);
+static int java_handle_option (size_t scode, const char *arg, int value);
static void put_decl_string (const char *, int);
static void put_decl_node (tree);
static void java_print_error_function (diagnostic_context *, const char *);
-static int process_option_with_no (const char *, const struct string_option *, int);
static tree java_tree_inlining_walk_subtrees (tree *, int *, walk_tree_fn,
void *, void *);
static int java_unsafe_for_reeval (tree);
@@ -123,7 +113,7 @@ static bool inhibit_error_function_print
int compiling_from_source;
-char * resource_name;
+const char *resource_name;
int flag_emit_class_files = 0;
@@ -196,39 +186,6 @@ static int version_flag = 0;
line. */
int flag_really_inline = 0;
-/* Table of language-dependent -f options.
- STRING is the option name. VARIABLE is the address of the variable.
- ON_VALUE is the value to store in VARIABLE
- if `-fSTRING' is seen as an option.
- (If `-fno-STRING' is seen as an option, the opposite value is stored.) */
-
-static const struct string_option
-lang_f_options[] =
-{
- {"emit-class-file", &flag_emit_class_files, 1},
- {"emit-class-files", &flag_emit_class_files, 1},
- {"filelist-file", &flag_filelist_file, 1},
- {"use-divide-subroutine", &flag_use_divide_subroutine, 1},
- {"use-boehm-gc", &flag_use_boehm_gc, 1},
- {"hash-synchronization", &flag_hash_synchronization, 1},
- {"jni", &flag_jni, 1},
- {"check-references", &flag_check_references, 1},
- {"force-classes-archive-check", &flag_force_classes_archive_check, 1},
- {"optimize-static-class-initialization", &flag_optimize_sci, 1 },
- {"indirect-dispatch", &flag_indirect_dispatch, 1},
- {"store-check", &flag_store_check, 1},
- {"assert", &flag_assert, 1}
-};
-
-static const struct string_option
-lang_W_options[] =
-{
- { "redundant-modifiers", &flag_redundant, 1 },
- { "extraneous-semicolon", &flag_extraneous_semicolon, 1 },
- { "out-of-date", &flag_newer, 1 },
- { "deprecated", &flag_deprecated, 1 }
-};
-
JCF *current_jcf;
/* Variable controlling how dependency tracking is enabled in
@@ -254,8 +211,8 @@ struct language_function GTY(())
#define LANG_HOOKS_FINISH java_finish
#undef LANG_HOOKS_INIT_OPTIONS
#define LANG_HOOKS_INIT_OPTIONS java_init_options
-#undef LANG_HOOKS_DECODE_OPTION
-#define LANG_HOOKS_DECODE_OPTION java_decode_option
+#undef LANG_HOOKS_HANDLE_OPTION
+#define LANG_HOOKS_HANDLE_OPTION java_handle_option
#undef LANG_HOOKS_POST_OPTIONS
#define LANG_HOOKS_POST_OPTIONS java_post_options
#undef LANG_HOOKS_PARSE_FILE
@@ -297,216 +254,197 @@ struct language_function GTY(())
/* Each front end provides its own. */
const struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER;
-/* Process an option that can accept a `no-' form.
- Return 1 if option found, 0 otherwise. */
-static int
-process_option_with_no (const char *p, const struct string_option *table,
- int table_size)
-{
- int j;
-
- for (j = 0; j < table_size; j++)
- {
- if (!strcmp (p, table[j].string))
- {
- *table[j].variable = table[j].on_value;
- return 1;
- }
- if (p[0] == 'n' && p[1] == 'o' && p[2] == '-'
- && ! strcmp (p+3, table[j].string))
- {
- *table[j].variable = ! table[j].on_value;
- return 1;
- }
- }
-
- return 0;
-}
-
/*
* process java-specific compiler command-line options
* return 0, but do not complain if the option is not recognized.
*/
static int
-java_decode_option (int argc __attribute__ ((__unused__)), char **argv)
+java_handle_option (size_t scode, const char *arg, int value)
{
- char *p = argv[0];
-
- jcf_path_init ();
+ const struct cl_option *option = &cl_options[scode];
+ enum opt_code code = (enum opt_code) scode;
- if (strcmp (p, "-version") == 0)
- {
- version_flag = 1;
- /* We return 0 so that the caller can process this. */
- return 0;
- }
-
-#define CLARG "-fcompile-resource="
- if (strncmp (p, CLARG, sizeof (CLARG) - 1) == 0)
- {
- resource_name = p + sizeof (CLARG) - 1;
- return 1;
- }
-#undef CLARG
-#define CLARG "-fassume-compiled="
- if (strncmp (p, CLARG, sizeof (CLARG) - 1) == 0)
- {
- add_assume_compiled (p + sizeof (CLARG) - 1, 0);
- return 1;
- }
-#undef CLARG
-#define CLARG "-fno-assume-compiled="
- if (strncmp (p, CLARG, sizeof (CLARG) - 1) == 0)
- {
- add_assume_compiled (p + sizeof (CLARG) - 1, 1);
- return 1;
- }
-#undef CLARG
-#define CLARG "-fassume-compiled"
- if (strncmp (p, CLARG, sizeof (CLARG) - 1) == 0)
- {
- add_assume_compiled ("", 0);
- return 1;
- }
-#undef CLARG
-#define CLARG "-fno-assume-compiled"
- if (strncmp (p, CLARG, sizeof (CLARG) - 1) == 0)
- {
- add_assume_compiled ("", 1);
- return 1;
- }
-#undef CLARG
-#define CLARG "-fCLASSPATH="
- if (strncmp (p, CLARG, sizeof (CLARG) - 1) == 0)
- {
- jcf_path_classpath_arg (p + sizeof (CLARG) - 1);
- return 1;
- }
-#undef CLARG
-#define CLARG "-fclasspath="
- if (strncmp (p, CLARG, sizeof (CLARG) - 1) == 0)
- {
- jcf_path_classpath_arg (p + sizeof (CLARG) - 1);
- return 1;
- }
-#undef CLARG
-#define CLARG "-fbootclasspath="
- if (strncmp (p, CLARG, sizeof (CLARG) - 1) == 0)
- {
- jcf_path_bootclasspath_arg (p + sizeof (CLARG) - 1);
- return 1;
- }
-#undef CLARG
-#define CLARG "-fextdirs="
- if (strncmp (p, CLARG, sizeof (CLARG) - 1) == 0)
- {
- jcf_path_extdirs_arg (p + sizeof (CLARG) - 1);
- return 1;
- }
-#undef CLARG
- else if (strncmp (p, "-I", 2) == 0)
- {
- jcf_path_include_arg (p + 2);
+ /* Ignore file names. */
+ if (code == N_OPTS)
return 1;
- }
-#define ARG "-foutput-class-dir="
- if (strncmp (p, ARG, sizeof (ARG) - 1) == 0)
+ if (arg == NULL && (option->flags & (CL_JOINED | CL_SEPARATE)))
{
- jcf_write_base_directory = p + sizeof (ARG) - 1;
- return 1;
- }
-#undef ARG
-#define ARG "-fencoding="
- if (strncmp (p, ARG, sizeof (ARG) - 1) == 0)
+ /* -fassume-compiled= can take an emtpy argument. */
+ if (code == OPT_fassume_compiled_)
+ arg = "";
+ else
{
- current_encoding = p + sizeof (ARG) - 1;
+ error ("missing argument to \"-%s\"", option->opt_text);
return 1;
}
-#undef ARG
-#define ARG "-finline-functions"
- if (strncmp (p, ARG, sizeof (ARG) - 1) == 0)
- {
- flag_inline_functions = 1;
- flag_really_inline = 1;
- return 1;
}
-#undef ARG
- if (p[0] == '-' && p[1] == 'f')
+ switch (code)
{
- /* Some kind of -f option.
- P's value is the option sans `-f'.
- Search for it in the table of options. */
- p += 2;
- if (process_option_with_no (p, lang_f_options,
- ARRAY_SIZE (lang_f_options)))
- return 1;
- return dump_switch_p (p);
- }
+ default:
+ return 0;
- if (strcmp (p, "-Wall") == 0)
- {
- flag_wall = 1;
- flag_redundant = 1;
- flag_extraneous_semicolon = 1;
- /* When -Wall given, enable -Wunused. We do this because the C
- compiler does it, and people expect it. */
- set_Wunused (1);
- return 1;
- }
+ case OPT_I:
+ jcf_path_include_arg (arg);
+ break;
- if (p[0] == '-' && p[1] == 'W')
- {
- /* Skip `-W' and see if we accept the option or its `no-' form. */
- p += 2;
- return process_option_with_no (p, lang_W_options,
- ARRAY_SIZE (lang_W_options));
- }
+ case OPT_M:
+ jcf_dependency_init (1);
+ dependency_tracking |= DEPEND_ENABLE;
+ break;
- if (strcmp (p, "-MD") == 0)
- {
+ case OPT_MD:
jcf_dependency_init (1);
dependency_tracking |= DEPEND_SET_FILE | DEPEND_ENABLE;
- return 1;
- }
- else if (strcmp (p, "-MMD") == 0)
- {
+ break;
+
+ case OPT_MF:
+ jcf_dependency_set_dep_file (arg);
+ break;
+
+ case OPT_MM:
jcf_dependency_init (0);
- dependency_tracking |= DEPEND_SET_FILE | DEPEND_ENABLE;
- return 1;
- }
- else if (strcmp (p, "-M") == 0)
- {
- jcf_dependency_init (1);
dependency_tracking |= DEPEND_ENABLE;
- return 1;
- }
- else if (strcmp (p, "-MM") == 0)
- {
+ break;
+
+ case OPT_MMD:
jcf_dependency_init (0);
- dependency_tracking |= DEPEND_ENABLE;
- return 1;
- }
- else if (strcmp (p, "-MP") == 0)
- {
+ dependency_tracking |= DEPEND_SET_FILE | DEPEND_ENABLE;
+ break;
+
+ case OPT_MP:
jcf_dependency_print_dummies ();
- return 1;
- }
- else if (strcmp (p, "-MT") == 0)
- {
- jcf_dependency_set_target (argv[1]);
+ break;
+
+ case OPT_MT:
+ jcf_dependency_set_target (arg);
dependency_tracking |= DEPEND_TARGET_SET;
- return 2;
- }
- else if (strcmp (p, "-MF") == 0)
- {
- jcf_dependency_set_dep_file (argv[1]);
- dependency_tracking |= DEPEND_FILE_ALREADY_SET;
- return 2;
- }
+ break;
+
+ case OPT_Wall:
+ flag_wall = value;
+ flag_redundant = value;
+ flag_extraneous_semicolon = value;
+ /* When -Wall given, enable -Wunused. We do this because the C
+ compiler does it, and people expect it. */
+ set_Wunused (value);
+ break;
+ case OPT_Wdeprecated:
+ flag_deprecated = value;
+ break;
+
+ case OPT_Wextraneous_semicolon:
+ flag_extraneous_semicolon = value;
+ break;
+
+ case OPT_Wout_of_date:
+ flag_newer = value;
+ break;
+
+ case OPT_Wredundant_modifiers:
+ flag_redundant = value;
+ break;
+
+ case OPT_fassert:
+ flag_assert = value;
+ break;
+
+ case OPT_fassume_compiled_:
+ add_assume_compiled (arg, !value);
+ break;
+
+ case OPT_fassume_compiled:
+ add_assume_compiled ("", !value);
+ break;
+
+ case OPT_fbootclasspath_:
+ jcf_path_bootclasspath_arg (arg);
+ break;
+
+ case OPT_fcheck_references:
+ flag_check_references = value;
+ break;
+
+ case OPT_fclasspath_:
+ case OPT_fCLASSPATH_:
+ jcf_path_classpath_arg (arg);
+ break;
+
+ case OPT_fcompile_resource_:
+ resource_name = arg;
+ break;
+
+ case OPT_fdump_:
+ if (!dump_switch_p (option->opt_text + strlen ("f")))
return 0;
+ break;
+
+ case OPT_femit_class_file:
+ case OPT_femit_class_files:
+ flag_emit_class_files = value;
+ break;
+
+ case OPT_fencoding_:
+ current_encoding = arg;
+ break;
+
+ case OPT_fextdirs_:
+ jcf_path_extdirs_arg (arg);
+ break;
+
+ case OPT_ffilelist_file:
+ flag_filelist_file = value;
+ break;
+
+ case OPT_fforce_classes_archive_check:
+ flag_force_classes_archive_check = value;
+ break;
+
+ case OPT_fhash_synchronization:
+ flag_hash_synchronization = value;
+ break;
+
+ case OPT_findirect_dispatch:
+ flag_indirect_dispatch = value;
+ break;
+
+ case OPT_finline_functions:
+ flag_inline_functions = value;
+ flag_really_inline = value;
+ break;
+
+ case OPT_fjni:
+ flag_jni = value;
+ break;
+
+ case OPT_foptimize_static_class_initialization:
+ flag_optimize_sci = value;
+ break;
+
+ case OPT_foutput_class_dir_:
+ jcf_write_base_directory = arg;
+ break;
+
+ case OPT_fstore_check:
+ flag_store_check = value;
+ break;
+
+ case OPT_fuse_boehm_gc:
+ flag_use_boehm_gc = value;
+ break;
+
+ case OPT_fuse_divide_subroutine:
+ flag_use_divide_subroutine = value;
+ break;
+
+ case OPT_version:
+ version_flag = 1;
+ break;
+ }
+
+ return 1;
}
/* Global open file. */
@@ -530,7 +468,6 @@ java_init (void)
&& force_align_functions_log < 1)
force_align_functions_log = 1;
- jcf_path_init ();
jcf_path_seal (version_flag);
java_init_decl_processing ();
@@ -747,6 +684,8 @@ java_init_options (void)
/* In Java arithmetic overflow always wraps around. */
flag_wrapv = 1;
+
+ jcf_path_init ();
return 0;
}
Index: lang.opt
===================================================================
RCS file: lang.opt
diff -N lang.opt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang.opt 8 Jun 2003 15:17:36 -0000
@@ -0,0 +1,158 @@
+; Options for the Java front end.
+; Copyright (C) 2003 Free Software Foundation, Inc.
+;
+; This file is part of GCC.
+;
+; GCC is free software; you can redistribute it and/or modify it under
+; the terms of the GNU General Public License as published by the Free
+; Software Foundation; either version 2, or (at your option) any later
+; version.
+;
+; GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+; WARRANTY; without even the implied warranty of MERCHANTABILITY or
+; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+; for more details.
+;
+; You should have received a copy of the GNU General Public License
+; along with GCC; see the file COPYING. If not, write to the Free
+; Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+; 02111-1307, USA.
+
+
+; This file is processed by the script opts.sh. It is a database of
+; command line options, with each record separated by a blank line,
+; and each field appearing on its own line. The first field is the
+; command-line switch with the leading "-" removed. All options
+; beginning with "f" or "W" are implicitly assumed to take a "no-"
+; form; this form should not be listed. If you do not want this
+; negative form and you want it to be automatically rejected, add
+; RejectNegative to the second field.
+
+; The second field should contain "Java". If the switch takes an
+; argument, then you should also specify "Joined" and/or "Separate" to
+; indicate where the argument can appear.
+
+; Comments can appear on their own line anwhere in the file, preceded
+; by a semicolon. Whitespace is permitted before the semicolon.
+
+; For each switch XXX below, an enumeration constant is created by the
+; script opts.sh spelt OPT_XXX, but with all non-alphanumeric
+; characters replaced with an underscore.
+
+; Please try to keep this file in ASCII collating order.
+
+I
+Java Joined
+
+M
+Java
+
+MD
+Java
+
+MF
+Java Separate
+
+MM
+Java
+
+MMD
+Java
+
+MP
+Java
+
+MT
+Java Separate
+
+Wall
+Java
+
+Wdeprecated
+Java
+
+Wextraneous-semicolon
+Java
+
+Wout-of-date
+Java
+
+Wredundant-modifiers
+Java
+
+fCLASSPATH=
+Java Joined RejectNegative
+
+fassert
+Java
+
+fassume-compiled
+Java
+
+fassume-compiled=
+Java Joined
+
+fbootclasspath=
+Java RejectNegative
+
+fcheck-references
+Java
+
+fclasspath=
+Java Joined RejectNegative
+
+fcompile-resource=
+Java Joined RejectNegative
+
+fdump-
+Java Joined RejectNegative
+
+femit-class-file
+Java
+
+femit-class-files
+Java
+
+fencoding=
+Java Joined RejectNegative
+
+fextdirs=
+Java Joined RejectNegative
+
+ffilelist-file
+Java
+
+fforce-classes-archive-check
+Java
+
+fhash-synchronization
+Java
+
+findirect-dispatch
+Java
+
+finline-functions
+Java
+
+fjni
+Java
+
+foptimize-static-class-initialization
+Java
+
+foutput-class-dir=
+Java Joined RejectNegative
+
+fstore-check
+Java
+
+fuse-boehm-gc
+Java
+
+fuse-divide-subroutine
+Java
+
+version
+Java
+
+; This comment is to ensure we retain the blank line above.
Index: resource.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/resource.c,v
retrieving revision 1.2
diff -u -p -b -r1.2 resource.c
--- resource.c 23 Jan 2003 02:38:57 -0000 1.2
+++ resource.c 8 Jun 2003 15:17:37 -0000
@@ -56,7 +56,7 @@ static GTY(()) rtx registerResource_libf
static int Jr_count = 0;
void
-compile_resource_data (char *name, const char *buffer, int length)
+compile_resource_data (const char *name, const char *buffer, int length)
{
tree rtype, field = NULL_TREE, data_type, rinit, data, decl;
char buf[60];
@@ -157,7 +157,7 @@ write_resource_constructor (void)
compiled Java resource, which is accessed by the runtime using
NAME. */
void
-compile_resource_file (char *name, const char *filename)
+compile_resource_file (const char *name, const char *filename)
{
struct stat stat_buf;
int fd;
More information about the Gcc-patches
mailing list