+2003-06-15 Neil Booth <neil@daikokuya.co.uk>
+
+ * c-pch.c (asm_file_name): Remove.
+ * common.opt: Add more switches.
+ * flags.h (g_switch_set): Boolify.
+ * opts.c (g_switch_value, g_switch_set, exit_after_options,
+ version_flag): Move from toplev.c.
+ (common_handle_option): Handle more switches from toplev.c.
+ * toplev.c (display_help, display_target_options, decode_d_option,
+ print_version): Make non-static, remove prototypes.
+ (aux_base_name, asm_file_name, aux_info_file_name): Constify.
+ (version_flag, g_switch_value, g_switch_set, exit_after_options):
+ Remove.
+ (independent_decode_option): Move some handlers to opts.c.
+ * toplev.h (aux_info_file_name, aux_base_name, asm_file_name,
+ exit_after_options, version_flag, display_help, display_target_options,
+ print_version, decode_d_option): New.
+
2003-06-15 Kazu Hirata <kazu@cs.umass.edu>
* config/alpha/alpha.md: Follow spelling conventions.
#include "flags.h"
#include "toplev.h"
+/* Value of the -G xx switch, and whether it was passed or not. */
+unsigned HOST_WIDE_INT g_switch_value;
+bool g_switch_set;
+
+/* True if we should exit after parsing options. */
+bool exit_after_options;
+
+/* If -version. */
+bool version_flag;
+
static size_t find_opt (const char *, int);
static int common_handle_option (size_t scode, const char *arg, int value);
default:
abort ();
+ case OPT__help:
+ display_help ();
+ exit_after_options = true;
+ break;
+
+ case OPT__target_help:
+ display_target_options ();
+ exit_after_options = true;
+ break;
+
+ case OPT__version:
+ print_version (stderr, "");
+ exit_after_options = true;
+ break;
+
+ case OPT_G:
+ g_switch_value = read_integral_parameter (arg, 0, -1);
+ if (g_switch_value == (unsigned HOST_WIDE_INT) -1)
+ return 0;
+ g_switch_set = true;
+ break;
+
+ case OPT_aux_info:
+ case OPT_aux_info_:
+ aux_info_file_name = arg;
+ flag_gen_aux_info = 1;
+ break;
+
+ case OPT_auxbase:
+ aux_base_name = arg;
+ break;
+
+ case OPT_auxbase_strip:
+ {
+ char *tmp = xstrdup (arg);
+ strip_off_ending (tmp, strlen (tmp));
+ if (tmp[0])
+ aux_base_name = tmp;
+ }
+ break;
+
+ case OPT_d:
+ decode_d_option (arg);
+ break;
+
+ case OPT_dumpbase:
+ dump_base_name = arg;
+ break;
+
+ case OPT_o:
+ asm_file_name = arg;
+ break;
+
+ case OPT_p:
+ profile_flag = 1;
+ break;
+
+ case OPT_pedantic:
+ pedantic = 1;
+ break;
+
+ case OPT_pedantic_errors:
+ flag_pedantic_errors = pedantic = 1;
+ break;
+
case OPT_quiet:
quiet_flag = 1;
break;
+
+ case OPT_version:
+ version_flag = 1;
+ break;
+
+ case OPT_w:
+ inhibit_warnings = 1;
+ break;
}
return 1;
static void crash_signal (int) ATTRIBUTE_NORETURN;
static void setup_core_dumping (void);
static void compile_file (void);
-static void display_help (void);
-static void display_target_options (void);
-static void decode_d_option (const char *);
+void decode_d_option (const char *);
static int decode_f_option (const char *);
static int decode_W_option (const char *);
static int decode_g_option (const char *);
static unsigned int independent_decode_option (int, char **);
static void set_Wextra (int);
-static void print_version (FILE *, const char *);
static int print_single_switch (FILE *, int, int, const char *,
const char *, const char *,
const char *, const char *);
/* Name to use as a base for auxiliary output files. */
-static const char *aux_base_name;
+const char *aux_base_name;
/* Format to use to print dumpfile index value */
#ifndef DUMPFILE_FORMAT
int rtl_dump_and_exit;
int flag_print_asm_name;
-static int version_flag;
enum graph_dump_types graph_dump_format;
/* Name for output file of assembly code, specified with -o. */
-char *asm_file_name;
-
-/* Value of the -G xx switch, and whether it was passed or not. */
-unsigned HOST_WIDE_INT g_switch_value;
-int g_switch_set;
+const char *asm_file_name;
/* Type(s) of debugging information we are producing (if any).
See flags.h for the definitions of the different possible
int optimize_size = 0;
-/* Nonzero if we should exit after parsing options. */
-static int exit_after_options = 0;
-
/* The FUNCTION_DECL for the function currently being compiled,
or 0 if between functions. */
tree current_function_decl;
/* Specified name of aux-info file. */
-static char *aux_info_file_name;
+const char *aux_info_file_name;
/* Nonzero means make the text shared if supported. */
}
/* Display help for generic options. */
-static void
+void
display_help (void)
{
int undoc;
}
/* Display help for target options. */
-static void
+void
display_target_options (void)
{
int undoc, i;
/* Avoid double printing for --help --target-help. */
if (displayed)
return;
+
displayed = true;
if (ARRAY_SIZE (target_switches) > 1
/* Parse a -d... command line switch. */
-static void
+void
decode_d_option (const char *arg)
{
int i, c, matched;
arg++;
- if (!strcmp (arg, "-help"))
- {
- display_help ();
- exit_after_options = 1;
- return 1;
- }
-
- if (!strcmp (arg, "-target-help"))
- {
- display_target_options ();
- exit_after_options = 1;
- return 1;
- }
-
- if (!strcmp (arg, "-version"))
- {
- print_version (stderr, "");
- exit_after_options = 1;
- return 1;
- }
-
/* Handle '--param <name>=<value>'. */
if (strcmp (arg, "-param") == 0)
{
case 'g':
return decode_g_option (arg + 1);
- case 'd':
- if (!strcmp (arg, "dumpbase"))
- {
- if (argc == 1)
- return 0;
-
- if (argv[1][0])
- dump_base_name = argv[1];
-
- return 2;
- }
- else
- decode_d_option (arg + 1);
- break;
-
- case 'p':
- if (!strcmp (arg, "pedantic"))
- pedantic = 1;
- else if (!strcmp (arg, "pedantic-errors"))
- flag_pedantic_errors = pedantic = 1;
- else if (arg[1] == 0)
- profile_flag = 1;
- else
- return 0;
- break;
-
- case 'v':
- if (!strcmp (arg, "version"))
- version_flag = 1;
- else
- return 0;
- break;
-
- case 'w':
- if (arg[1] == 0)
- inhibit_warnings = 1;
- else
- return 0;
- break;
-
case 'W':
/* For backward compatibility, -W is the same as -Wextra. */
if (arg[1] == 0)
else
return decode_W_option (arg + 1);
break;
-
- case 'a':
- if (!strncmp (arg, "aux-info", 8))
- {
- if (arg[8] == '\0')
- {
- if (argc == 1)
- return 0;
-
- aux_info_file_name = argv[1];
- flag_gen_aux_info = 1;
- return 2;
- }
- else if (arg[8] == '=')
- {
- aux_info_file_name = arg + 9;
- flag_gen_aux_info = 1;
- }
- else
- return 0;
- }
- else if (!strcmp (arg, "auxbase"))
- {
- if (argc == 1)
- return 0;
-
- if (argv[1][0])
- aux_base_name = argv[1];
-
- return 2;
- }
- else if (!strcmp (arg, "auxbase-strip"))
- {
- if (argc == 1)
- return 0;
-
- if (argv[1][0])
- {
- strip_off_ending (argv[1], strlen (argv[1]));
- if (argv[1][0])
- aux_base_name = argv[1];
- }
-
- return 2;
- }
- else
- return 0;
- break;
-
- case 'o':
- if (arg[1] == 0)
- {
- if (argc == 1)
- return 0;
-
- asm_file_name = argv[1];
- return 2;
- }
- return 0;
-
- case 'G':
- {
- int g_switch_val;
- int return_val;
-
- if (arg[1] == 0)
- {
- if (argc == 1)
- return 0;
-
- g_switch_val = read_integral_parameter (argv[1], 0, -1);
- return_val = 2;
- }
- else
- {
- g_switch_val = read_integral_parameter (arg + 1, 0, -1);
- return_val = 1;
- }
-
- if (g_switch_val == -1)
- return_val = 0;
- else
- {
- g_switch_set = TRUE;
- g_switch_value = g_switch_val;
- }
-
- return return_val;
- }
}
return 1;
Each line begins with INDENT (for the case where FILE is the
assembler output file). */
-static void
+void
print_version (FILE *file, const char *indent)
{
#ifndef __VERSION__
extern const char *progname;
extern const char *dump_base_name;
+extern const char *aux_base_name;
+extern const char *aux_info_file_name;
+extern const char *asm_file_name;
+extern bool exit_after_options;
+extern bool version_flag;
extern int target_flags_explicit;
+extern void display_help (void);
+extern void display_target_options (void);
+extern void print_version (FILE *, const char *);
+
/* The hashtable, so that the C front ends can pass it to cpplib. */
extern struct ht *ident_hash;
extern void set_fast_math_flags (int);
+/* Handle -d switch. */
+extern void decode_d_option (const char *);
+
/* Return true iff flags are set as if -ffast-math. */
extern bool fast_math_flags_set_p (void);
projects / gcc.git / commitdiff