* config.gcc (extra_options): New variable for listing option files.

	Add ${cpu_type}/${cpu_type}.opt to it if that file exists.
	* configure.ac (extra_opt_files): New AC_SUBST variable.
	(tm_file_list, tm_include_list): Include options.h first.
	* configure: Regenerate.
	* Makefile.in (extra_opt_files, ALL_OPT_FILES): New variables.
	(s-options): Use $(ALL_OPT_FILES) instead of $(lang_opt_files)
	(s-options-h): New rule.
	(options.h): Depend on it.
	(TEXI_GCCINT_FILES): Add options.texi.
	* hooks.h (hook_bool_size_t_constcharptr_int_true): Declare.
	* hooks.c (hook_bool_size_t_constcharptr_int_true): New function.
	* target.h (gcc_target): Add default_target_flags and handle_option.
	* target-def.h (TARGET_DEFAULT_TARGET_FLAGS)
	(TARGET_HANDLE_OPTION): New macros.
	(TARGET_INITIALIZER): Include them.
	* opt-functions.awk (opt_args, nth_arg): New functions.
	(switch_flags): Handle the "Target" flag.
	(var_args): Delete.
	(var_name): Use opt_args and nth_arg.
	(var_set, var_ref): Likewise.  Handle "Mask" and "InverseMask".
	* opth-gen.awk: Declare target_flags.  Declare MASK_* and TARGET_*
	macros for the "Mask" and "InverseMask" options.
	* opts.h (cl_var_cond): New enum.
	(cl_option): Replace the "has_set_value" and "set_value" fields with
	"var_cond" and "var_value".
	(CL_TARGET): New macro.
	(option_enabled, print_filtered_help): Declare.
	(decode_options): Move definition.
	* opts.c (handle_option): Search for the original option before
	removing any "no-" prefix.  Handle CL_TARGET.  Adjust for the new
	var_cond and var_value fields.  Use targetm.handle_option to handle
	target options.
	(decode_options): Set target_flags to targetm.default_target_flags.
	(print_filtered_help): Make global.  Handle CL_TARGET.
	(option_enabled): New function.
	* toplev.c (target_switches): Guard with #ifdef TARGET_SWITCHES.
	(display_target_options, set_target_switch, print_switch_values)
	(default_pch_valid_p): Guard uses of target_switches with
	#ifdef TARGET_SWITCHES.  Also...
	(display_target_options): Display the CL_TARGET entries in cl_options.
	(set_target_option): Don't complain about the "" option when
	TARGET_SWITCHES is undefined.
	(print_switch_values): Use option_enabled.
	(default_pch_valid_p): Check cl_options[] when looking for something
	that has changed the value of target_flags.
	* c.opt: Remove documentation from top of file.
	* doc/gccint.texi: Add an "Options" chapter.  Include options.texi.
	* doc/sourecebuild.texi: Refer to the new options documentation
	instead of c.opt.  Document machine-specific .opt files.
	* doc/tm.texi (target_flags): Say that this variable is declared
	by options.h.
	(TARGET_DEFAULT_TARGET_FLAGS, TARGET_HANDLE_OPTION): Document.
	(TARGET_SWITCHES, TARGET_OPTIONS): Refer to the option files as
	an alternative.
	* doc/options.texi: New file.


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

1 files changed, 53 insertions, 22 deletions

diff --git a/gcc/opt-functions.awk b/gcc/opt-functions.awk
index a21f29d4b12..35ab4453f31 100644
--- a/gcc/opt-functions.awk
+++ b/gcc/opt-functions.awk
@@ -18,6 +18,33 @@
 
 # Some common subroutines for use by opt[ch]-gen.awk.
 
+# If FLAGS contains a "NAME(...argument...)" flag, return the value
+# of the argument.  Return the empty string otherwise.
+function opt_args(name, flags)
+{
+	flags = " " flags
+	if (flags !~ " " name "\\(")
+		return ""
+	sub(".* " name "\\(", "", flags)
+	sub("\\).*", "", flags)
+
+	return flags
+}
+
+# Return the Nth comma-separated element of S.  Return the empty string
+# if S does not contain N elements.
+function nth_arg(n, s)
+{
+	while (n-- > 0) {
+		if (s !~ ",")
+			return ""
+		sub("[^,]*, *", "", s)
+	}
+	sub(",.*", "", s)
+	return s
+}
+
+# Return a bitmask of CL_* values for option flags FLAGS.
 function switch_flags (flags)
 {
 	flags = " " flags " "
@@ -29,6 +56,7 @@ function switch_flags (flags)
 			result = result " | " macros[j]
 	}
 	if (flags ~ " Common ") result = result " | CL_COMMON"
+	if (flags ~ " Target ") result = result " | CL_TARGET"
 	if (flags ~ " Joined ") result = result " | CL_JOINED"
 	if (flags ~ " JoinedOrMissing ") \
 	    result = result " | CL_JOINED | CL_MISSING_OK"
@@ -41,36 +69,39 @@ function switch_flags (flags)
 	return result
 }
 
-function var_args(flags)
-{
-	if (flags !~ "Var\\(")
-	    return ""
-	sub(".*Var\\(", "", flags)
-	sub("\\).*", "", flags)
-
-	return flags
-}
+# If FLAGS includes a Var flag, return the name of the variable it specifies.
+# Return the empty string otherwise.
 function var_name(flags)
 {
-	s = var_args(flags)
-	if (s == "")
-		return "";
-	sub( ",.*", "", s)
-	return s
+	return nth_arg(0, opt_args("Var", flags))
 }
+
+# Given that an option has flags FLAGS, return an initializer for the
+# "var_cond" and "var_value" fields of its cl_options[] entry.
 function var_set(flags)
 {
-	s = var_args(flags)
-	if (s !~ ",")
-		return "0, 0"
-	sub( "[^,]*,", "", s)
-	return "1, " s
+	s = nth_arg(1, opt_args("Var", flags))
+	if (s != "")
+		return "CLVC_EQUAL, " s
+	s = opt_args("Mask", flags);
+	if (s != "")
+		return "CLVC_BIT_SET, MASK_" s
+	s = nth_arg(0, opt_args("InverseMask", flags));
+	if (s != "")
+		return "CLVC_BIT_CLEAR, MASK_" s
+	return "CLVC_BOOLEAN, 0"
 }
+
+# Given that an option has flags FLAGS, return an initializer for the
+# "flag_var" field of its cl_options[] entry.
 function var_ref(flags)
 {
 	name = var_name(flags)
-	if (name == "")
-		return "0"
-	else
+	if (name != "")
 		return "&" name
+	if (opt_args("Mask", flags) != "")
+		return "&target_flags"
+	if (opt_args("InverseMask", flags) != "")
+		return "&target_flags"
+	return "0"
 }