* common.opt (debug_struct_ordinary, debug_struct_generic): New

	Variable entries.
	* dwarf2out.c (matches_main_base, dump_struct_debug, DUMP_GSTRUCT,
	should_emit_struct_debug): Move from opts.c.
	* flag-types.h (enum debug_struct_file): Move from opts.c.
	* flags.h (should_emit_struct_debug): Remove.
	(base_of_path): Declare.
	(set_struct_debug_option): Add gcc_options parameter.
	* optc-gen.awk, opth-gen.awk: Handle array variables.
	* opts.c (enum debug_struct_file, debug_struct_ordinary,
	debug_struct_generic): Remove.
	(set_struct_debug_option): Add gcc_options parameter.
	(base_of_path): Remove static.
	(main_input_basename, main_input_baselength, matches_main_base,
	dump_struct_debug, DUMP_GSTRUCT, should_emit_struct_debug):
	Remove.
	* toplev.c (main_input_basename, main_input_baselength): Define
	here.
	* toplev.h (main_input_basename, main_input_baselength): Declare
	here.

c-family:
	* c-opts.c (c_common_handle_option): Update calls to
	set_struct_debug_option.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@166944 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 1 insertions, 0 deletions

diff --git a/gcc/optc-gen.awk b/gcc/optc-gen.awk
index fbe8007c8a2..97bbd4312e0 100644
--- a/gcc/optc-gen.awk
+++ b/gcc/optc-gen.awk
@@ -91,6 +91,7 @@ for (i = 0; i < n_extra_vars; i++) {
 		sub(".*= *", "", init)
 		sub(" *=.*", "", var)
 		sub("^.*[ *]", "", var)
+		sub("\\[.*\\]$", "", var)
 	} else {
 		init = "0"
 	}