X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fopts.c;h=78e746e0b7a234c2906ea817b0d0207a23cbb772;hb=07c46636ce59515e30fddc0217bcb7dfe31173ba;hp=bd971c8e3f9cf42b6985e2d6b4c491e754bc71a3;hpb=1897b88152df894079137aba336a65361e09a9c8;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/opts.c b/gcc/opts.c index bd971c8e3f9..78e746e0b7a 100644 --- a/gcc/opts.c +++ b/gcc/opts.c @@ -1,5 +1,6 @@ /* Command line option handling. - Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 + Free Software Foundation, Inc. Contributed by Neil Booth. This file is part of GCC. @@ -16,8 +17,8 @@ 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. */ +Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301, USA. */ #include "config.h" #include "system.h" @@ -38,6 +39,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "tm_p.h" /* For OPTIMIZATION_OPTIONS. */ #include "insn-attr.h" /* For INSN_SCHEDULING. */ #include "target.h" +#include "tree-pass.h" /* Value of the -G xx switch, and whether it was passed or not. */ unsigned HOST_WIDE_INT g_switch_value; @@ -59,6 +61,10 @@ HOST_WIDE_INT larger_than_size; strict-aliasing safe. */ int warn_strict_aliasing; +/* Nonzero means warn about optimizations which rely on undefined + signed overflow. */ +int warn_strict_overflow; + /* Hack for cooperation between set_Wunused and set_Wextra. */ static bool maybe_warn_unused_parameter; @@ -71,6 +77,256 @@ enum debug_info_type write_symbols = NO_DEBUG; the definitions of the different possible levels. */ enum debug_info_level debug_info_level = DINFO_LEVEL_NONE; +/* A major contribution to object and executable size is debug + information size. A major contribution to debug information size + is struct descriptions replicated in several object files. The + following flags attempt to reduce this information. The basic + idea is to not emit struct debugging information in the current + compilation unit when that information will be generated by + another compilation unit. + + Debug information for a struct defined in the current source + file should be generated in the object file. Likewise the + debug information for a struct defined in a header should be + generated in the object file of the corresponding source file. + Both of these case are handled when the base name of the file of + the struct definition matches the base name of the source file + of thet current compilation unit. This matching emits minimal + struct debugging information. + + The base file name matching rule above will fail to emit debug + information for structs defined in system headers. So a second + category of files includes system headers in addition to files + with matching bases. + + The remaining types of files are library headers and application + headers. We cannot currently distinguish these two types. */ + +enum debug_struct_file +{ + DINFO_STRUCT_FILE_NONE, /* Debug no structs. */ + DINFO_STRUCT_FILE_BASE, /* Debug structs defined in files with the + same base name as the compilation unit. */ + DINFO_STRUCT_FILE_SYS, /* Also debug structs defined in system + header files. */ + DINFO_STRUCT_FILE_ANY /* Debug structs defined in all files. */ +}; + +/* Generic structs (e.g. templates not explicitly specialized) + may not have a compilation unit associated with them, and so + may need to be treated differently from ordinary structs. + + Structs only handled by reference (indirectly), will also usually + not need as much debugging information. */ + +static enum debug_struct_file debug_struct_ordinary[DINFO_USAGE_NUM_ENUMS] + = { DINFO_STRUCT_FILE_ANY, DINFO_STRUCT_FILE_ANY, DINFO_STRUCT_FILE_ANY }; +static enum debug_struct_file debug_struct_generic[DINFO_USAGE_NUM_ENUMS] + = { DINFO_STRUCT_FILE_ANY, DINFO_STRUCT_FILE_ANY, DINFO_STRUCT_FILE_ANY }; + +/* Parse the -femit-struct-debug-detailed option value + and set the flag variables. */ + +#define MATCH( prefix, string ) \ + ((strncmp (prefix, string, sizeof prefix - 1) == 0) \ + ? ((string += sizeof prefix - 1), 1) : 0) + +void +set_struct_debug_option (const char *spec) +{ + /* various labels for comparison */ + static char dfn_lbl[] = "dfn:", dir_lbl[] = "dir:", ind_lbl[] = "ind:"; + static char ord_lbl[] = "ord:", gen_lbl[] = "gen:"; + static char none_lbl[] = "none", any_lbl[] = "any"; + static char base_lbl[] = "base", sys_lbl[] = "sys"; + + enum debug_struct_file files = DINFO_STRUCT_FILE_ANY; + /* Default is to apply to as much as possible. */ + enum debug_info_usage usage = DINFO_USAGE_NUM_ENUMS; + int ord = 1, gen = 1; + + /* What usage? */ + if (MATCH (dfn_lbl, spec)) + usage = DINFO_USAGE_DFN; + else if (MATCH (dir_lbl, spec)) + usage = DINFO_USAGE_DIR_USE; + else if (MATCH (ind_lbl, spec)) + usage = DINFO_USAGE_IND_USE; + + /* Generics or not? */ + if (MATCH (ord_lbl, spec)) + gen = 0; + else if (MATCH (gen_lbl, spec)) + ord = 0; + + /* What allowable environment? */ + if (MATCH (none_lbl, spec)) + files = DINFO_STRUCT_FILE_NONE; + else if (MATCH (any_lbl, spec)) + files = DINFO_STRUCT_FILE_ANY; + else if (MATCH (sys_lbl, spec)) + files = DINFO_STRUCT_FILE_SYS; + else if (MATCH (base_lbl, spec)) + files = DINFO_STRUCT_FILE_BASE; + else + error ("argument %qs to %<-femit-struct-debug-detailed%> not recognized", + spec); + + /* Effect the specification. */ + if (usage == DINFO_USAGE_NUM_ENUMS) + { + if (ord) + { + debug_struct_ordinary[DINFO_USAGE_DFN] = files; + debug_struct_ordinary[DINFO_USAGE_DIR_USE] = files; + debug_struct_ordinary[DINFO_USAGE_IND_USE] = files; + } + if (gen) + { + debug_struct_generic[DINFO_USAGE_DFN] = files; + debug_struct_generic[DINFO_USAGE_DIR_USE] = files; + debug_struct_generic[DINFO_USAGE_IND_USE] = files; + } + } + else + { + if (ord) + debug_struct_ordinary[usage] = files; + if (gen) + debug_struct_generic[usage] = files; + } + + if (*spec == ',') + set_struct_debug_option (spec+1); + else + { + /* No more -femit-struct-debug-detailed specifications. + Do final checks. */ + if (*spec != '\0') + error ("argument %qs to %<-femit-struct-debug-detailed%> unknown", + spec); + if (debug_struct_ordinary[DINFO_USAGE_DIR_USE] + < debug_struct_ordinary[DINFO_USAGE_IND_USE] + || debug_struct_generic[DINFO_USAGE_DIR_USE] + < debug_struct_generic[DINFO_USAGE_IND_USE]) + error ("%<-femit-struct-debug-detailed=dir:...%> must allow at least" + " as much as %<-femit-struct-debug-detailed=ind:...%>"); + } +} + +/* Find the base name of a path, stripping off both directories and + a single final extension. */ +static int +base_of_path (const char *path, const char **base_out) +{ + const char *base = path; + const char *dot = 0; + const char *p = path; + char c = *p; + while (c) + { + if (IS_DIR_SEPARATOR(c)) + { + base = p + 1; + dot = 0; + } + else if (c == '.') + dot = p; + c = *++p; + } + if (!dot) + dot = p; + *base_out = base; + return dot - base; +} + +/* Match the base name of a file to the base name of a compilation unit. */ + +static const char *main_input_basename; +static int main_input_baselength; + +static int +matches_main_base (const char *path) +{ + /* Cache the last query. */ + static const char *last_path = NULL; + static int last_match = 0; + if (path != last_path) + { + const char *base; + int length = base_of_path (path, &base); + last_path = path; + last_match = (length == main_input_baselength + && memcmp (base, main_input_basename, length) == 0); + } + return last_match; +} + +#ifdef DEBUG_DEBUG_STRUCT + +static int +dump_struct_debug (tree type, enum debug_info_usage usage, + enum debug_struct_file criterion, int generic, + int matches, int result) +{ + /* Find the type name. */ + tree type_decl = TYPE_STUB_DECL (type); + tree t = type_decl; + const char *name = 0; + if (TREE_CODE (t) == TYPE_DECL) + t = DECL_NAME (t); + if (t) + name = IDENTIFIER_POINTER (t); + + fprintf (stderr, " struct %d %s %s %s %s %d %p %s\n", + criterion, + DECL_IN_SYSTEM_HEADER (type_decl) ? "sys" : "usr", + matches ? "bas" : "hdr", + generic ? "gen" : "ord", + usage == DINFO_USAGE_DFN ? ";" : + usage == DINFO_USAGE_DIR_USE ? "." : "*", + result, + (void*) type_decl, name); + return result; +} +#define DUMP_GSTRUCT(type, usage, criterion, generic, matches, result) \ + dump_struct_debug (type, usage, criterion, generic, matches, result) + +#else + +#define DUMP_GSTRUCT(type, usage, criterion, generic, matches, result) \ + (result) + +#endif + + +bool +should_emit_struct_debug (tree type, enum debug_info_usage usage) +{ + enum debug_struct_file criterion; + tree type_decl; + bool generic = lang_hooks.types.generic_p (type); + + if (generic) + criterion = debug_struct_generic[usage]; + else + criterion = debug_struct_ordinary[usage]; + + if (criterion == DINFO_STRUCT_FILE_NONE) + return DUMP_GSTRUCT (type, usage, criterion, generic, false, false); + if (criterion == DINFO_STRUCT_FILE_ANY) + return DUMP_GSTRUCT (type, usage, criterion, generic, false, true); + + type_decl = TYPE_STUB_DECL (type); + + if (criterion == DINFO_STRUCT_FILE_SYS && DECL_IN_SYSTEM_HEADER (type_decl)) + return DUMP_GSTRUCT (type, usage, criterion, generic, false, true); + + if (matches_main_base (DECL_SOURCE_FILE (type_decl))) + return DUMP_GSTRUCT (type, usage, criterion, generic, true, true); + return DUMP_GSTRUCT (type, usage, criterion, generic, false, false); +} + /* Nonzero means use GNU-only extensions in the generated symbolic debugging information. Currently, this only has an effect when write_symbols is set to DBX_DEBUG, XCOFF_DEBUG, or DWARF_DEBUG. */ @@ -79,12 +335,14 @@ bool use_gnu_debug_info_extensions; /* The default visibility for all symbols (unless overridden) */ enum symbol_visibility default_visibility = VISIBILITY_DEFAULT; +/* Disable unit-at-a-time for frontends that might be still broken in this + respect. */ + +bool no_unit_at_a_time_default; + /* Global visibility options. */ struct visibility_flags visibility_options; -/* Columns of --help display. */ -static unsigned int columns = 80; - /* What to print when a switch has no documentation. */ static const char undocumented_msg[] = N_("This switch lacks documentation"); @@ -93,15 +351,14 @@ static const char undocumented_msg[] = N_("This switch lacks documentation"); static bool profile_arc_flag_set, flag_profile_values_set; static bool flag_unroll_loops_set, flag_tracer_set; static bool flag_value_profile_transformations_set; -bool flag_speculative_prefetching_set; static bool flag_peel_loops_set, flag_branch_probabilities_set; /* Input file names. */ const char **in_fnames; unsigned num_in_fnames; -static size_t find_opt (const char *, int); -static int common_handle_option (size_t scode, const char *arg, int value); +static int common_handle_option (size_t scode, const char *arg, int value, + unsigned int lang_mask); static void handle_param (const char *); static void set_Wextra (int); static unsigned int handle_option (const char **argv, unsigned int lang_mask); @@ -109,97 +366,9 @@ static char *write_langs (unsigned int lang_mask); static void complain_wrong_lang (const char *, const struct cl_option *, unsigned int lang_mask); static void handle_options (unsigned int, const char **, unsigned int); -static void wrap_help (const char *help, const char *item, unsigned int); -static void print_help (void); -static void print_param_help (void); -static unsigned int print_switch (const char *text, unsigned int indent); static void set_debug_level (enum debug_info_type type, int extended, const char *arg); -/* Perform a binary search to find which option the command-line INPUT - matches. Returns its index in the option array, and N_OPTS - (cl_options_count) on failure. - - This routine is quite subtle. A normal binary search is not good - enough because some options can be suffixed with an argument, and - multiple sub-matches can occur, e.g. input of "-pedantic" matching - the initial substring of "-pedantic-errors". - - A more complicated example is -gstabs. It should match "-g" with - an argument of "stabs". Suppose, however, that the number and list - of switches are such that the binary search tests "-gen-decls" - before having tested "-g". This doesn't match, and as "-gen-decls" - is less than "-gstabs", it will become the lower bound of the - binary search range, and "-g" will never be seen. To resolve this - issue, opts.sh makes "-gen-decls" point, via the back_chain member, - to "-g" so that failed searches that end between "-gen-decls" and - the lexicographically subsequent switch know to go back and see if - "-g" causes a match (which it does in this example). - - This search is done in such a way that the longest match for the - front end in question wins. If there is no match for the current - front end, the longest match for a different front end is returned - (or N_OPTS if none) and the caller emits an error message. */ -static size_t -find_opt (const char *input, int lang_mask) -{ - size_t mn, mx, md, opt_len; - size_t match_wrong_lang; - int comp; - - mn = 0; - mx = cl_options_count; - - /* Find mn such this lexicographical inequality holds: - cl_options[mn] <= input < cl_options[mn + 1]. */ - while (mx - mn > 1) - { - md = (mn + mx) / 2; - opt_len = cl_options[md].opt_len; - comp = strncmp (input, cl_options[md].opt_text + 1, opt_len); - - if (comp < 0) - mx = md; - else - mn = md; - } - - /* This is the switch that is the best match but for a different - front end, or cl_options_count if there is no match at all. */ - match_wrong_lang = cl_options_count; - - /* Backtrace the chain of possible matches, returning the longest - one, if any, that fits best. With current GCC switches, this - loop executes at most twice. */ - do - { - const struct cl_option *opt = &cl_options[mn]; - - /* Is the input either an exact match or a prefix that takes a - joined argument? */ - if (!strncmp (input, opt->opt_text + 1, opt->opt_len) - && (input[opt->opt_len] == '\0' || (opt->flags & CL_JOINED))) - { - /* If language is OK, return it. */ - if (opt->flags & lang_mask) - return mn; - - /* If we haven't remembered a prior match, remember this - one. Any prior match is necessarily better. */ - if (match_wrong_lang == cl_options_count) - match_wrong_lang = mn; - } - - /* Try the next possibility. This is cl_options_count if there - are no more. */ - mn = opt->back_chain; - } - while (mn != cl_options_count); - - /* Return the best wrong match, or cl_options_count if none. */ - return match_wrong_lang; -} - /* If ARG is a non-negative integer made up solely of digits, return its value, otherwise return -1. */ static int @@ -228,7 +397,7 @@ write_langs (unsigned int mask) if (mask & (1U << n)) len += strlen (lang_name) + 1; - result = xmalloc (len); + result = XNEWVEC (char, len); len = 0; for (n = 0; (lang_name = lang_names[n]) != 0; n++) if (mask & (1U << n)) @@ -255,7 +424,7 @@ complain_wrong_lang (const char *text, const struct cl_option *option, bad_lang = write_langs (lang_mask); /* Eventually this should become a hard error IMO. */ - warning ("command line option \"%s\" is valid for %s but not for %s", + warning (0, "command line option \"%s\" is valid for %s but not for %s", text, ok_langs, bad_lang); free (ok_langs); @@ -284,7 +453,7 @@ handle_option (const char **argv, unsigned int lang_mask) /* Drop the "no-" from negative switches. */ size_t len = strlen (opt) - 3; - dup = xmalloc (len + 1); + dup = XNEWVEC (char, len + 1); dup[0] = '-'; dup[1] = opt[1]; memcpy (dup + 2, opt + 5, len - 2 + 1); @@ -294,16 +463,7 @@ handle_option (const char **argv, unsigned int lang_mask) } if (opt_index == cl_options_count) - { -#if defined (TARGET_OPTIONS) || defined (TARGET_SWITCHES) - if (opt[1] == 'm') - { - set_target_switch (argv[0] + 2); - result = 1; - } -#endif - goto done; - } + goto done; option = &cl_options[opt_index]; @@ -315,6 +475,14 @@ handle_option (const char **argv, unsigned int lang_mask) /* We've recognized this switch. */ result = 1; + /* Check to see if the option is disabled for this configuration. */ + if (option->flags & CL_DISABLED) + { + error ("command line option %qs" + " is not supported by this configuration", opt); + goto done; + } + /* Sort out any argument the switch takes. */ if (option->flags & CL_JOINED) { @@ -350,6 +518,15 @@ handle_option (const char **argv, unsigned int lang_mask) complain_wrong_lang (argv[0], option, lang_mask); goto done; } + else if ((option->flags & CL_TARGET) + && (option->flags & CL_LANG_ALL) + && !(option->flags & lang_mask)) + { + /* Complain for target flag language mismatches if any languages + are specified. */ + complain_wrong_lang (argv[0], option, lang_mask); + goto done; + } if (arg == NULL && (option->flags & (CL_JOINED | CL_SEPARATE))) { @@ -371,33 +548,39 @@ handle_option (const char **argv, unsigned int lang_mask) } if (option->flag_var) - switch (option->var_cond) + switch (option->var_type) { case CLVC_BOOLEAN: - *option->flag_var = value; + *(int *) option->flag_var = value; break; case CLVC_EQUAL: - *option->flag_var = value ? option->var_value : !option->var_value; + *(int *) option->flag_var = (value + ? option->var_value + : !option->var_value); break; case CLVC_BIT_CLEAR: case CLVC_BIT_SET: - if ((value != 0) == (option->var_cond == CLVC_BIT_SET)) - *option->flag_var |= option->var_value; + if ((value != 0) == (option->var_type == CLVC_BIT_SET)) + *(int *) option->flag_var |= option->var_value; else - *option->flag_var &= ~option->var_value; + *(int *) option->flag_var &= ~option->var_value; if (option->flag_var == &target_flags) target_flags_explicit |= option->var_value; break; + + case CLVC_STRING: + *(const char **) option->flag_var = arg; + break; } - + if (option->flags & lang_mask) if (lang_hooks.handle_option (opt_index, arg, value) == 0) result = 0; if (result && (option->flags & CL_COMMON)) - if (common_handle_option (opt_index, arg, value) == 0) + if (common_handle_option (opt_index, arg, value, lang_mask) == 0) result = 0; if (result && (option->flags & CL_TARGET)) @@ -435,7 +618,11 @@ handle_options (unsigned int argc, const char **argv, unsigned int lang_mask) if (opt[0] != '-' || opt[1] == '\0') { if (main_input_filename == NULL) + { main_input_filename = opt; + main_input_baselength + = base_of_path (main_input_filename, &main_input_basename); + } add_input_filename (opt); n = 1; continue; @@ -512,20 +699,24 @@ decode_options (unsigned int argc, const char **argv) #endif flag_guess_branch_prob = 1; flag_cprop_registers = 1; - flag_loop_optimize = 1; flag_if_conversion = 1; flag_if_conversion2 = 1; + flag_ipa_pure_const = 1; + flag_ipa_reference = 1; + flag_split_wide_types = 1; flag_tree_ccp = 1; flag_tree_dce = 1; flag_tree_dom = 1; flag_tree_dse = 1; flag_tree_ter = 1; - flag_tree_live_range_split = 1; flag_tree_sra = 1; flag_tree_copyrename = 1; flag_tree_fre = 1; + flag_tree_copy_prop = 1; flag_tree_sink = 1; flag_tree_salias = 1; + if (!no_unit_at_a_time_default) + flag_unit_at_a_time = 1; if (!optimize_size) { @@ -542,15 +733,13 @@ decode_options (unsigned int argc, const char **argv) flag_thread_jumps = 1; flag_crossjumping = 1; flag_optimize_sibling_calls = 1; + flag_forward_propagate = 1; flag_cse_follow_jumps = 1; - flag_cse_skip_blocks = 1; flag_gcse = 1; flag_expensive_optimizations = 1; - flag_strength_reduce = 1; + flag_ipa_type_escape = 1; flag_rerun_cse_after_loop = 1; - flag_rerun_loop_opt = 1; flag_caller_saves = 1; - flag_force_mem = 1; flag_peephole2 = 1; #ifdef INSN_SCHEDULING flag_schedule_insns = 1; @@ -558,23 +747,34 @@ decode_options (unsigned int argc, const char **argv) #endif flag_regmove = 1; flag_strict_aliasing = 1; + flag_strict_overflow = 1; flag_delete_null_pointer_checks = 1; flag_reorder_blocks = 1; flag_reorder_functions = 1; - flag_unit_at_a_time = 1; + flag_tree_store_ccp = 1; + flag_tree_store_copy_prop = 1; + flag_tree_vrp = 1; if (!optimize_size) { /* PRE tends to generate bigger code. */ flag_tree_pre = 1; } + + /* Allow more virtual operators to increase alias precision. */ + set_param_value ("max-aliased-vops", 500); } if (optimize >= 3) { + flag_predictive_commoning = 1; flag_inline_functions = 1; flag_unswitch_loops = 1; flag_gcse_after_reload = 1; + + /* Allow even more virtual operators. */ + set_param_value ("max-aliased-vops", 1000); + set_param_value ("avg-aliased-vops", 3); } if (optimize < 2 || optimize_size) @@ -597,9 +797,8 @@ decode_options (unsigned int argc, const char **argv) if (optimize_size) { - /* Inlining of very small functions usually reduces total size. */ - set_param_value ("max-inline-insns-single", 5); - set_param_value ("max-inline-insns-auto", 5); + /* Inlining of functions reducing size is a good idea regardless + of them being declared inline. */ flag_inline_functions = 1; /* We want to crossjump as much as possible. */ @@ -615,13 +814,9 @@ decode_options (unsigned int argc, const char **argv) /* Initialize target_flags before OPTIMIZATION_OPTIONS so the latter can modify it. */ target_flags = targetm.default_target_flags; - set_target_switch (""); - /* Unwind tables are always present when a target has ABI-specified unwind - tables, so the default should be ON. */ -#ifdef TARGET_UNWIND_INFO - flag_unwind_tables = TARGET_UNWIND_INFO; -#endif + /* Some tagets have ABI-specified unwind tables. */ + flag_unwind_tables = targetm.unwind_tables_default; #ifdef OPTIMIZATION_OPTIONS /* Allow default optimizations to be specified on a per-machine basis. */ @@ -656,7 +851,8 @@ decode_options (unsigned int argc, const char **argv) this to `2' if -Wall is used, so we can avoid giving out lots of errors for people who don't realize what -Wall does. */ if (warn_uninitialized == 1) - warning ("-Wuninitialized is not supported without -O"); + warning (OPT_Wuninitialized, + "-Wuninitialized is not supported without -O"); } if (flag_really_no_inline == 2) @@ -664,16 +860,330 @@ decode_options (unsigned int argc, const char **argv) /* The optimization to partition hot and cold basic blocks into separate sections of the .o and executable files does not work (currently) - with exception handling. If flag_exceptions is turned on we need to + with exception handling. This is because there is no support for + generating unwind info. If flag_exceptions is turned on we need to turn off the partitioning optimization. */ if (flag_exceptions && flag_reorder_blocks_and_partition) { - inform + inform ("-freorder-blocks-and-partition does not work with exceptions"); flag_reorder_blocks_and_partition = 0; flag_reorder_blocks = 1; } + + /* If user requested unwind info, then turn off the partitioning + optimization. */ + + if (flag_unwind_tables && ! targetm.unwind_tables_default + && flag_reorder_blocks_and_partition) + { + inform ("-freorder-blocks-and-partition does not support unwind info"); + flag_reorder_blocks_and_partition = 0; + flag_reorder_blocks = 1; + } + + /* If the target requested unwind info, then turn off the partitioning + optimization with a different message. Likewise, if the target does not + support named sections. */ + + if (flag_reorder_blocks_and_partition + && (!targetm.have_named_sections + || (flag_unwind_tables && targetm.unwind_tables_default))) + { + inform + ("-freorder-blocks-and-partition does not work on this architecture"); + flag_reorder_blocks_and_partition = 0; + flag_reorder_blocks = 1; + } +} + +#define LEFT_COLUMN 27 + +/* Output ITEM, of length ITEM_WIDTH, in the left column, + followed by word-wrapped HELP in a second column. */ +static void +wrap_help (const char *help, + const char *item, + unsigned int item_width, + unsigned int columns) +{ + unsigned int col_width = LEFT_COLUMN; + unsigned int remaining, room, len; + + remaining = strlen (help); + + do + { + room = columns - 3 - MAX (col_width, item_width); + if (room > columns) + room = 0; + len = remaining; + + if (room < len) + { + unsigned int i; + + for (i = 0; help[i]; i++) + { + if (i >= room && len != remaining) + break; + if (help[i] == ' ') + len = i; + else if ((help[i] == '-' || help[i] == '/') + && help[i + 1] != ' ' + && i > 0 && ISALPHA (help[i - 1])) + len = i + 1; + } + } + + printf( " %-*.*s %.*s\n", col_width, item_width, item, len, help); + item_width = 0; + while (help[len] == ' ') + len++; + help += len; + remaining -= len; + } + while (remaining); +} + +/* Print help for a specific front-end, etc. */ +static void +print_filtered_help (unsigned int include_flags, + unsigned int exclude_flags, + unsigned int any_flags, + unsigned int columns) +{ + unsigned int i; + const char *help; + static char *printed = NULL; + bool found = false; + bool displayed = false; + + if (include_flags == CL_PARAMS) + { + for (i = 0; i < LAST_PARAM; i++) + { + const char *param = compiler_params[i].option; + + help = compiler_params[i].help; + if (help == NULL || *help == '\0') + { + if (exclude_flags & CL_UNDOCUMENTED) + continue; + help = undocumented_msg; + } + + /* Get the translation. */ + help = _(help); + + wrap_help (help, param, strlen (param), columns); + } + putchar ('\n'); + return; + } + + if (!printed) + printed = xcalloc (1, cl_options_count); + + for (i = 0; i < cl_options_count; i++) + { + static char new_help[128]; + const struct cl_option *option = cl_options + i; + unsigned int len; + const char *opt; + const char *tab; + + if (include_flags == 0 + || ((option->flags & include_flags) != include_flags)) + { + if ((option->flags & any_flags) == 0) + continue; + } + + /* Skip unwanted switches. */ + if ((option->flags & exclude_flags) != 0) + continue; + + found = true; + /* Skip switches that have already been printed. */ + if (printed[i]) + continue; + + printed[i] = true; + + help = option->help; + if (help == NULL) + { + if (exclude_flags & CL_UNDOCUMENTED) + continue; + help = undocumented_msg; + } + + /* Get the translation. */ + help = _(help); + + /* Find the gap between the name of the + option and its descriptive text. */ + tab = strchr (help, '\t'); + if (tab) + { + len = tab - help; + opt = help; + help = tab + 1; + } + else + { + opt = option->opt_text; + len = strlen (opt); + } + + /* With the -Q option enabled we change the descriptive text associated + with an option to be an indication of its current setting. */ + if (!quiet_flag) + { + if (len < (LEFT_COLUMN + 2)) + strcpy (new_help, "\t\t"); + else + strcpy (new_help, "\t"); + + if (option->flag_var != NULL) + { + if (option->flags & CL_JOINED) + { + if (option->var_type == CLVC_STRING) + { + if (* (const char **) option->flag_var != NULL) + snprintf (new_help + strlen (new_help), + sizeof (new_help) - strlen (new_help), + * (const char **) option->flag_var); + } + else + sprintf (new_help + strlen (new_help), + "%#x", * (int *) option->flag_var); + } + else + strcat (new_help, option_enabled (i) + ? _("[enabled]") : _("[disabled]")); + } + + help = new_help; + } + + wrap_help (help, opt, len, columns); + displayed = true; + } + + if (! found) + printf (_(" No options with the desired characteristics were found\n")); + else if (! displayed) + printf (_(" All options with the desired characteristics have already been displayed\n")); + + putchar ('\n'); +} + +/* Display help for a specified type of option. + The options must have ALL of the INCLUDE_FLAGS set + ANY of the flags in the ANY_FLAGS set + and NONE of the EXCLUDE_FLAGS set. */ +static void +print_specific_help (unsigned int include_flags, + unsigned int exclude_flags, + unsigned int any_flags) +{ + unsigned int all_langs_mask = (1U << cl_lang_count) - 1; + const char * description = NULL; + const char * descrip_extra = ""; + size_t i; + unsigned int flag; + static unsigned int columns = 0; + + /* Sanity check: Make sure that we do not have more + languages than we have bits available to enumerate them. */ + gcc_assert ((1U << cl_lang_count) < CL_MIN_OPTION_CLASS); + + /* If we have not done so already, obtain + the desired maximum width of the output. */ + if (columns == 0) + { + const char *p; + + GET_ENVIRONMENT (p, "COLUMNS"); + if (p != NULL) + { + int value = atoi (p); + + if (value > 0) + columns = value; + } + + if (columns == 0) + /* Use a reasonable default. */ + columns = 80; + } + + /* Decide upon the title for the options that we are going to display. */ + for (i = 0, flag = 1; flag <= CL_MAX_OPTION_CLASS; flag <<= 1, i ++) + { + switch (flag & include_flags) + { + case 0: + break; + + case CL_TARGET: + description = _("The following options are target specific"); + break; + case CL_WARNING: + description = _("The following options control compiler warning messages"); + break; + case CL_OPTIMIZATION: + description = _("The following options control optimizations"); + break; + case CL_COMMON: + description = _("The following options are language-independent"); + break; + case CL_PARAMS: + description = _("The --param option recognizes the following as parameters"); + break; + default: + if (i >= cl_lang_count) + break; + if ((exclude_flags & ((1U << cl_lang_count) - 1)) != 0) + { + description = _("The following options are specific to the language "); + descrip_extra = lang_names [i]; + } + else + description = _("The following options are supported by the language "); + descrip_extra = lang_names [i]; + break; + } + } + + if (description == NULL) + { + if (any_flags == 0) + { + if (include_flags == CL_UNDOCUMENTED) + description = _("The following options are not documented"); + else + { + internal_error ("unrecognized include_flags 0x%x passed to print_specific_help", + include_flags); + return; + } + } + else + { + if (any_flags & all_langs_mask) + description = _("The following options are language-related"); + else + description = _("The following options are language-independent"); + } + } + + printf ("%s%s:\n", description, descrip_extra); + print_filtered_help (include_flags, exclude_flags, any_flags, columns); } /* Handle target- and language-independent options. Return zero to @@ -682,26 +1192,133 @@ decode_options (unsigned int argc, const char **argv) VALUE assigned to a variable, it happens automatically. */ static int -common_handle_option (size_t scode, const char *arg, int value) +common_handle_option (size_t scode, const char *arg, int value, + unsigned int lang_mask) { enum opt_code code = (enum opt_code) scode; switch (code) { - case OPT__help: - print_help (); - exit_after_options = true; - break; - case OPT__param: handle_param (arg); break; + case OPT_fhelp: + case OPT__help: + { + unsigned int all_langs_mask = (1U << cl_lang_count) - 1; + unsigned int undoc_mask; + unsigned int i; + + undoc_mask = extra_warnings ? 0 : CL_UNDOCUMENTED; + /* First display any single language specific options. */ + for (i = 0; i < cl_lang_count; i++) + print_specific_help + (1U << i, (all_langs_mask & (~ (1U << i))) | undoc_mask, 0); + /* Next display any multi language specific options. */ + print_specific_help (0, undoc_mask, all_langs_mask); + /* Then display any remaining, non-language options. */ + for (i = CL_MIN_OPTION_CLASS; i <= CL_MAX_OPTION_CLASS; i <<= 1) + print_specific_help (i, undoc_mask, 0); + exit_after_options = true; + break; + } + + case OPT_ftarget_help: case OPT__target_help: - display_target_options (); + print_specific_help (CL_TARGET, CL_UNDOCUMENTED, 0); exit_after_options = true; break; + case OPT_fhelp_: + case OPT__help_: + { + const char * a = arg; + unsigned int include_flags = 0; + /* Note - by default we include undocumented options when listing + specific classes. If you only want to see documented options + then add ",^undocumented" to the --help= option. e.g.: + + --help=target,^undocumented */ + unsigned int exclude_flags = 0; + + /* Walk along the argument string, parsing each word in turn. + The format is: + arg = [^]{word}[,{arg}] + word = {optimizers|target|warnings|undocumented| + params|common|} */ + while (* a != 0) + { + static struct + { + const char * string; + unsigned int flag; + } + specifics[] = + { + { "optimizers", CL_OPTIMIZATION }, + { "target", CL_TARGET }, + { "warnings", CL_WARNING }, + { "undocumented", CL_UNDOCUMENTED }, + { "params", CL_PARAMS }, + { "joined", CL_JOINED }, + { "separate", CL_SEPARATE }, + { "common", CL_COMMON }, + { NULL, 0 } + }; + unsigned int * pflags; + char * comma; + unsigned int len; + unsigned int i; + + if (* a == '^') + { + ++ a; + pflags = & exclude_flags; + } + else + pflags = & include_flags; + + comma = strchr (a, ','); + if (comma == NULL) + len = strlen (a); + else + len = comma - a; + + for (i = 0; specifics[i].string != NULL; i++) + if (strncasecmp (a, specifics[i].string, len) == 0) + { + * pflags |= specifics[i].flag; + break; + } + + if (specifics[i].string == NULL) + { + /* Check to see if the string matches a language name. */ + for (i = 0; i < cl_lang_count; i++) + if (strncasecmp (a, lang_names[i], len) == 0) + { + * pflags |= 1U << i; + break; + } + + if (i == cl_lang_count) + fnotice (stderr, + "warning: unrecognized argument to --help= switch: %.*s\n", + len, a); + } + + if (comma == NULL) + break; + a = comma + 1; + } + + if (include_flags) + print_specific_help (include_flags, exclude_flags, 0); + exit_after_options = true; + break; + } + case OPT__version: print_version (stderr, ""); exit_after_options = true; @@ -722,6 +1339,10 @@ common_handle_option (size_t scode, const char *arg, int value) set_Wextra (value); break; + case OPT_Werror_: + enable_warning_as_error (arg, value, lang_mask); + break; + case OPT_Wextra: set_Wextra (value); break; @@ -732,10 +1353,23 @@ common_handle_option (size_t scode, const char *arg, int value) break; case OPT_Wstrict_aliasing: + set_Wstrict_aliasing (value); + break; + case OPT_Wstrict_aliasing_: warn_strict_aliasing = value; break; + case OPT_Wstrict_overflow: + warn_strict_overflow = (value + ? (int) WARN_STRICT_OVERFLOW_CONDITIONAL + : 0); + break; + + case OPT_Wstrict_overflow_: + warn_strict_overflow = value; + break; + case OPT_Wunused: set_Wunused (value); break; @@ -805,6 +1439,10 @@ common_handle_option (size_t scode, const char *arg, int value) return 0; break; + case OPT_fdiagnostics_show_option: + global_dc->show_option_requested = true; + break; + case OPT_fdump_: if (!dump_switch_p (arg)) return 0; @@ -830,7 +1468,7 @@ common_handle_option (size_t scode, const char *arg, int value) case OPT_fpack_struct_: if (value <= 0 || (value & (value - 1)) || value > 16) - error("structure alignment must be a small power of two, not %d", value); + error ("structure alignment must be a small power of two, not %d", value); else { initial_max_fld_align = value; @@ -859,10 +1497,6 @@ common_handle_option (size_t scode, const char *arg, int value) flag_tracer = value; if (!flag_value_profile_transformations_set) flag_value_profile_transformations = value; -#ifdef HAVE_prefetch - if (0 && !flag_speculative_prefetching_set) - flag_speculative_prefetching = value; -#endif break; case OPT_fprofile_generate: @@ -872,12 +1506,6 @@ common_handle_option (size_t scode, const char *arg, int value) flag_profile_values = value; if (!flag_value_profile_transformations_set) flag_value_profile_transformations = value; - if (!flag_unroll_loops_set) - flag_unroll_loops = value; -#ifdef HAVE_prefetch - if (0 && !flag_speculative_prefetching_set) - flag_speculative_prefetching = value; -#endif break; case OPT_fprofile_values: @@ -895,7 +1523,7 @@ common_handle_option (size_t scode, const char *arg, int value) else if (!strcmp(arg, "protected")) default_visibility = VISIBILITY_PROTECTED; else - error ("unrecognised visibility value \"%s\"", arg); + error ("unrecognized visibility value \"%s\"", arg); } break; @@ -903,19 +1531,15 @@ common_handle_option (size_t scode, const char *arg, int value) flag_value_profile_transformations_set = true; break; - case OPT_fspeculative_prefetching: - flag_speculative_prefetching_set = true; - break; - case OPT_frandom_seed: /* The real switch is -fno-random-seed. */ if (value) return 0; - flag_random_seed = NULL; + set_random_seed (NULL); break; case OPT_frandom_seed_: - flag_random_seed = arg; + set_random_seed (arg); break; case OPT_fsched_verbose_: @@ -971,7 +1595,7 @@ common_handle_option (size_t scode, const char *arg, int value) else if (!strcmp (arg, "local-exec")) flag_tls_default = TLS_MODEL_LOCAL_EXEC; else - warning ("unknown tls-model \"%s\"", arg); + warning (0, "unknown tls-model \"%s\"", arg); break; case OPT_ftracer: @@ -1020,13 +1644,17 @@ common_handle_option (size_t scode, const char *arg, int value) flag_pedantic_errors = pedantic = 1; break; + case OPT_floop_optimize: + case OPT_frerun_loop_opt: + case OPT_fstrength_reduce: + /* These are no-ops, preserved for backward compatibility. */ + break; + default: /* If the flag was handled in a standard way, assume the lack of processing here is intentional. */ - if (cl_options[scode].flag_var) - break; - - abort (); + gcc_assert (cl_options[scode].flag_var); + break; } return 1; @@ -1063,7 +1691,6 @@ static void set_Wextra (int setting) { extra_warnings = setting; - warn_unused_value = setting; warn_unused_parameter = (setting && maybe_warn_unused_parameter); /* We save the value of warn_uninitialized, since if they put @@ -1092,6 +1719,20 @@ set_Wunused (int setting) warn_unused_value = setting; } +/* Used to set the level of strict aliasing warnings, + when no level is specified (i.e., when -Wstrict-aliasing, and not + -Wstrict-aliasing=level was given). + ONOFF is assumed to take value 1 when -Wstrict-aliasing is specified, + and 0 otherwise. After calling this function, wstrict_aliasing will be + set to the default value of -Wstrict_aliasing=level, currently 3. */ +void +set_Wstrict_aliasing (int onoff) +{ + gcc_assert (onoff == 0 || onoff == 1); + if (onoff != 0) + warn_strict_aliasing = 3; +} + /* The following routines are useful in setting all the flags that -ffast-math and -fno-fast-math imply. */ void @@ -1100,6 +1741,7 @@ set_fast_math_flags (int set) flag_trapping_math = !set; flag_unsafe_math_optimizations = set; flag_finite_math_only = set; + flag_signed_zeros = !set; flag_errno_math = !set; if (set) { @@ -1116,6 +1758,7 @@ fast_math_flags_set_p (void) return (!flag_trapping_math && flag_unsafe_math_optimizations && flag_finite_math_only + && !flag_signed_zeros && !flag_errno_math); } @@ -1144,7 +1787,7 @@ set_debug_level (enum debug_info_type type, int extended, const char *arg) } if (write_symbols == NO_DEBUG) - warning ("target system does not support debug output"); + warning (0, "target system does not support debug output"); } } else @@ -1173,238 +1816,96 @@ set_debug_level (enum debug_info_type type, int extended, const char *arg) } } -/* Output --help text. */ -static void -print_help (void) -{ - size_t i; - const char *p; - - GET_ENVIRONMENT (p, "COLUMNS"); - if (p) - { - int value = atoi (p); - if (value > 0) - columns = value; - } - - puts (_("The following options are language-independent:\n")); - - print_filtered_help (CL_COMMON); - print_param_help (); - - for (i = 0; lang_names[i]; i++) - { - printf (_("The %s front end recognizes the following options:\n\n"), - lang_names[i]); - print_filtered_help (1U << i); - } - - display_target_options (); -} +/* Return 1 if OPTION is enabled, 0 if it is disabled, or -1 if it isn't + a simple on-off switch. */ -/* Print the help for --param. */ -static void -print_param_help (void) +int +option_enabled (int opt_idx) { - size_t i; + const struct cl_option *option = &(cl_options[opt_idx]); - puts (_("The --param option recognizes the following as parameters:\n")); - - for (i = 0; i < LAST_PARAM; i++) - { - const char *help = compiler_params[i].help; - const char *param = compiler_params[i].option; + if (option->flag_var) + switch (option->var_type) + { + case CLVC_BOOLEAN: + return *(int *) option->flag_var != 0; - if (help == NULL || *help == '\0') - help = undocumented_msg; + case CLVC_EQUAL: + return *(int *) option->flag_var == option->var_value; - /* Get the translation. */ - help = _(help); + case CLVC_BIT_CLEAR: + return (*(int *) option->flag_var & option->var_value) == 0; - wrap_help (help, param, strlen (param)); - } + case CLVC_BIT_SET: + return (*(int *) option->flag_var & option->var_value) != 0; - putchar ('\n'); + case CLVC_STRING: + break; + } + return -1; } -/* Print help for a specific front-end, etc. */ -void -print_filtered_help (unsigned int flag) -{ - unsigned int i, len, filter, indent = 0; - bool duplicates = false; - const char *help, *opt, *tab; - static char *printed; +/* Fill STATE with the current state of option OPTION. Return true if + there is some state to store. */ - if (flag == CL_COMMON || flag == CL_TARGET) - { - filter = flag; - if (!printed) - printed = xmalloc (cl_options_count); - memset (printed, 0, cl_options_count); - } - else - { - /* Don't print COMMON options twice. */ - filter = flag | CL_COMMON; - - for (i = 0; i < cl_options_count; i++) - { - if ((cl_options[i].flags & filter) != flag) - continue; - - /* Skip help for internal switches. */ - if (cl_options[i].flags & CL_UNDOCUMENTED) - continue; - - /* Skip switches that have already been printed, mark them to be - listed later. */ - if (printed[i]) - { - duplicates = true; - indent = print_switch (cl_options[i].opt_text, indent); - } - } - - if (duplicates) - { - putchar ('\n'); - putchar ('\n'); - } - } +bool +get_option_state (int option, struct cl_option_state *state) +{ + if (cl_options[option].flag_var == 0) + return false; - for (i = 0; i < cl_options_count; i++) + switch (cl_options[option].var_type) { - if ((cl_options[i].flags & filter) != flag) - continue; - - /* Skip help for internal switches. */ - if (cl_options[i].flags & CL_UNDOCUMENTED) - continue; - - /* Skip switches that have already been printed. */ - if (printed[i]) - continue; - - printed[i] = true; - - help = cl_options[i].help; - if (!help) - help = undocumented_msg; - - /* Get the translation. */ - help = _(help); + case CLVC_BOOLEAN: + case CLVC_EQUAL: + state->data = cl_options[option].flag_var; + state->size = sizeof (int); + break; - tab = strchr (help, '\t'); - if (tab) - { - len = tab - help; - opt = help; - help = tab + 1; - } - else - { - opt = cl_options[i].opt_text; - len = strlen (opt); - } + case CLVC_BIT_CLEAR: + case CLVC_BIT_SET: + state->ch = option_enabled (option); + state->data = &state->ch; + state->size = 1; + break; - wrap_help (help, opt, len); + case CLVC_STRING: + state->data = *(const char **) cl_options[option].flag_var; + if (state->data == 0) + state->data = ""; + state->size = strlen (state->data) + 1; + break; } - - putchar ('\n'); + return true; } -/* Output ITEM, of length ITEM_WIDTH, in the left column, followed by - word-wrapped HELP in a second column. */ -static unsigned int -print_switch (const char *text, unsigned int indent) -{ - unsigned int len = strlen (text) + 1; /* trailing comma */ +/* Enable a warning option as an error. This is used by -Werror= and + also by legacy Werror-implicit-function-declaration. */ - if (indent) +void +enable_warning_as_error (const char *arg, int value, unsigned int lang_mask) +{ + char *new_option; + int option_index; + + new_option = XNEWVEC (char, strlen (arg) + 2); + new_option[0] = 'W'; + strcpy (new_option + 1, arg); + option_index = find_opt (new_option, lang_mask); + if (option_index == N_OPTS) { - putchar (','); - if (indent + len > columns) - { - putchar ('\n'); - putchar (' '); - indent = 1; - } + error ("-Werror=%s: No option -%s", arg, new_option); } else - putchar (' '); - - putchar (' '); - fputs (text, stdout); - - return indent + len + 1; -} - -/* Output ITEM, of length ITEM_WIDTH, in the left column, followed by - word-wrapped HELP in a second column. */ -static void -wrap_help (const char *help, const char *item, unsigned int item_width) -{ - unsigned int col_width = 27; - unsigned int remaining, room, len; - - remaining = strlen (help); - - do { - room = columns - 3 - MAX (col_width, item_width); - if (room > columns) - room = 0; - len = remaining; - - if (room < len) - { - unsigned int i; - - for (i = 0; help[i]; i++) - { - if (i >= room && len != remaining) - break; - if (help[i] == ' ') - len = i; - else if ((help[i] == '-' || help[i] == '/') - && help[i + 1] != ' ' - && i > 0 && ISALPHA (help[i - 1])) - len = i + 1; - } - } - - printf( " %-*.*s %.*s\n", col_width, item_width, item, len, help); - item_width = 0; - while (help[len] == ' ') - len++; - help += len; - remaining -= len; + int kind = value ? DK_ERROR : DK_WARNING; + diagnostic_classify_diagnostic (global_dc, option_index, kind); + + /* -Werror=foo implies -Wfoo. */ + if (cl_options[option_index].var_type == CLVC_BOOLEAN + && cl_options[option_index].flag_var + && kind == DK_ERROR) + *(int *) cl_options[option_index].flag_var = 1; } - while (remaining); -} - -/* Return 1 if OPTION is enabled, 0 if it is disabled, or -1 if it isn't - a simple on-off switch. */ - -int -option_enabled (const struct cl_option *option) -{ - if (option->flag_var) - switch (option->var_cond) - { - case CLVC_BOOLEAN: - return *option->flag_var != 0; - - case CLVC_EQUAL: - return *option->flag_var == option->var_value; - - case CLVC_BIT_CLEAR: - return (*option->flag_var & option->var_value) == 0; - - case CLVC_BIT_SET: - return (*option->flag_var & option->var_value) != 0; - } - return -1; + free (new_option); }