diff options
| author | Neil Booth <neil@daikokuya.co.uk> | 2003-07-02 20:15:46 +0000 |
|---|---|---|
| committer | Neil Booth <neil@gcc.gnu.org> | 2003-07-02 20:15:46 +0000 |
| commit | b86f6cd9ab108f1fda89c4fb00b0b16931182041 (patch) | |
| tree | 9c89fbb7a4fe5df7e431edc8e3aadca6bfb3b1de /gcc/ada | |
| parent | 41ba4c4632751678d7c32b169da1ff40c39bfb9e (diff) | |
| download | gcc-b86f6cd9ab108f1fda89c4fb00b0b16931182041.tar.gz | |
c-common.h (c_common_init_options): New prototype.
* c-common.h (c_common_init_options): New prototype.
* c-opts.c (deferred_size): Remove.
(defer_opt): Array is now pre-allocated.
(c_common_init_options): Pre-allocate deferred_opts. Make
lang_flags unsigned.
(push_command_line_options): Free deferred_opts.
* hooks.c (hook_uint_uint_constcharptrptr_0): New.
* hooks.h (hook_uint_uint_constcharptrptr_0): New.
* langhooks-def.h (LANG_HOOKS_INIT_OPTIONS): Update.
* langhooks.h (struct lang_hooks): New prototype for init_options.
* main.c (main): Cast argv.
* opts.c (handle_option, handle_options): Update prototypes.
(decode_options): save_argc, save_argv are not global. Constify.
* opts.h (decode_options): New prototype.
* toplev.c (general_init): New protoype.
(save_argv): Make static.
(save_argc): Remove.
(print_switch_values, general_init): Constify.
(toplev_main): Save argv.
* toplev.h (toplev_main): Update prototype.
(save_argc, save_argv): Remove.
ada:
* misc.c (save_argc, save_argv): Make static.
(gnat_init_options): New prototype.
(gnat_init_options): Update.
f:
* top.c (ffe_init_options): Update prototype.
* top.h (ffe_init_options): Update prototype.
java:
* lang.c (java_init_options): Update prototype.
treelang:
* tree1.c (treelang_init_options): Update prototype.
* treelang.h (treelang_init_options): Update prototype.
From-SVN: r68850
Diffstat (limited to 'gcc/ada')
| -rw-r--r-- | gcc/ada/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ada/misc.c | 23 |
2 files changed, 20 insertions, 9 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index c534ae61083..67417f0bcd4 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2003-07-02 Neil Booth <neil@daikokuya.co.uk> + + * misc.c (save_argc, save_argv): Make static. + (gnat_init_options): New prototype. + (gnat_init_options): Update. + 2003-07-01 Matt Kraai <kraai@alumni.cmu.edu> * gnat_ug.texi: Remove unlikely characters from @vars. diff --git a/gcc/ada/misc.c b/gcc/ada/misc.c index e0ee975215d..ab618e5399b 100644 --- a/gcc/ada/misc.c +++ b/gcc/ada/misc.c @@ -78,12 +78,10 @@ #include "options.h" extern FILE *asm_out_file; -extern int save_argc; -extern char **save_argv; static size_t gnat_tree_size PARAMS ((enum tree_code)); static bool gnat_init PARAMS ((void)); -static int gnat_init_options PARAMS ((void)); +static unsigned int gnat_init_options (unsigned int, const char **); static int gnat_handle_option (size_t scode, const char *arg, int value); static HOST_WIDE_INT gnat_get_alias_set PARAMS ((tree)); static void gnat_print_decl PARAMS ((FILE *, tree, int)); @@ -181,6 +179,10 @@ const char *const tree_code_name[] = { }; #undef DEFTREECODE +/* Command-line argc and argv. */ +static unsigned int save_argc; +static const char **save_argv; + /* gnat standard argc argv */ extern int gnat_argc; @@ -222,7 +224,7 @@ gnat_handle_option (size_t scode, const char *arg, int value ATTRIBUTE_UNUSED) { enum opt_code code = (enum opt_code) scode; char *q; - int i; + unsigned int i; /* Ignore file names. */ if (code == N_OPTS) @@ -279,14 +281,17 @@ gnat_handle_option (size_t scode, const char *arg, int value ATTRIBUTE_UNUSED) /* Initialize for option processing. */ -static int -gnat_init_options () +static unsigned int +gnat_init_options (unsigned int argc, const char **argv) { - /* Initialize gnat_argv with save_argv size */ - gnat_argv = (char **) xmalloc ((save_argc + 1) * sizeof (gnat_argv[0])); - gnat_argv[0] = save_argv[0]; /* name of the command */ + /* Initialize gnat_argv with save_argv size. */ + gnat_argv = (char **) xmalloc ((argc + 1) * sizeof (argv[0])); + gnat_argv[0] = argv[0]; /* name of the command */ gnat_argc = 1; + save_argc = argc; + save_argv = argv; + return CL_Ada; } |