X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Foptc-gen.awk;h=065972b031ab5ef16a0c5f81365a53ca6db2cb07;hb=13774f7b28a842c75a76bb2f08c448fca3bb9ca5;hp=94e2ddb65daf8b5943b830542e360e1659940aab;hpb=a150399de633299feeb20899e9b178895dae0c1c;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/gcc/optc-gen.awk b/gcc/optc-gen.awk
index 94e2ddb65da..065972b031a 100644
--- a/gcc/optc-gen.awk
+++ b/gcc/optc-gen.awk
@@ -14,7 +14,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 # This Awk script reads in the option records generated from 
 # opt-gather.awk, combines the flags of duplicat options and generates a
@@ -42,10 +42,13 @@ BEGIN {
 			n_langs++;
 		}
 		else {
-			opts[n_opts]  = $1
-			flags[n_opts] = $2
-			help[n_opts]  = $3
-			n_opts++;
+			name = opt_args("Mask", $1)
+			if (name == "") {
+				opts[n_opts]  = $1
+				flags[n_opts] = $2
+				help[n_opts]  = $3
+				n_opts++;
+			}
 		}
 	}
 
@@ -53,9 +56,11 @@ BEGIN {
 END {
 print "/* This file is auto-generated by opts.sh.  */"
 print ""
-print "#include <intl.h>"
-print "#include " quote header_name quote
+n_headers = split(header_name, headers, " ")
+for (i = 1; i <= n_headers; i++)
+	print "#include " quote headers[i] quote
 print "#include " quote "opts.h" quote
+print "#include " quote "intl.h" quote
 print ""
 
 for (i = 0; i < n_opts; i++) {
@@ -69,11 +74,25 @@ for (i = 0; i < n_opts; i++) {
 	init = opt_args("Init", flags[i])
 	if (init != "")
 		init = " = " init;
+	else if (name in var_seen)
+		continue;
 
-	printf ("/* Set by -%s.\n   %s  */\nint %s%s;\n\n",
-	    opts[i], help[i], name,init)
+	print "/* Set by -" opts[i] "."
+	print "   " help[i] "  */"
+	print var_type(flags[i]) name init ";"
+	print ""
+
+	var_seen[name] = 1;
 }
 
+print ""
+print "/* Local state variables.  */"
+for (i = 0; i < n_opts; i++) {
+	name = static_var(opts[i], flags[i]);
+	if (name != "")
+		print "static " var_type(flags[i]) name ";"
+}
+print ""
 
 print "const char * const lang_names[] =\n{"
 for (i = 0; i < n_langs; i++) {
@@ -91,47 +110,58 @@ print "const struct cl_option cl_options[] =\n{"
 for (i = 0; i < n_opts; i++)
 	back_chain[i] = "N_OPTS";
 
-	for (i = 0; i < n_opts; i++) {
-		# Combine the flags of identical switches.  Switches
-		# appear many times if they are handled by many front
-		# ends, for example.
-		while( i + 1 != n_opts && opts[i] == opts[i + 1] ) {
-			flags[i + 1] = flags[i] " " flags[i + 1];
-			i++;
-		}
+for (i = 0; i < n_opts; i++) {
+	# Combine the flags of identical switches.  Switches
+	# appear many times if they are handled by many front
+	# ends, for example.
+	while( i + 1 != n_opts && opts[i] == opts[i + 1] ) {
+		flags[i + 1] = flags[i] " " flags[i + 1];
+		i++;
+	}
 
-		len = length (opts[i]);
-		enum = "OPT_" opts[i]
-		if (opts[i] == "finline-limit=")
-			enum = enum "eq"
-		gsub ("[^A-Za-z0-9]", "_", enum)
-
-		# If this switch takes joined arguments, back-chain all
-		# subsequent switches to it for which it is a prefix.  If
-		# a later switch S is a longer prefix of a switch T, T
-		# will be back-chained to S in a later iteration of this
-		# for() loop, which is what we want.
-		if (flag_set_p("Joined.*", flags[i])) {
-			for (j = i + 1; j < n_opts; j++) {
-				if (substr (opts[j], 1, len) != opts[i])
-					break;
-				back_chain[j] = enum;
-			}
+	len = length (opts[i]);
+	enum = "OPT_" opts[i]
+	if (opts[i] == "finline-limit=")
+		enum = enum "eq"
+	gsub ("[^A-Za-z0-9]", "_", enum)
+
+	# If this switch takes joined arguments, back-chain all
+	# subsequent switches to it for which it is a prefix.  If
+	# a later switch S is a longer prefix of a switch T, T
+	# will be back-chained to S in a later iteration of this
+	# for() loop, which is what we want.
+	if (flag_set_p("Joined.*", flags[i])) {
+		for (j = i + 1; j < n_opts; j++) {
+			if (substr (opts[j], 1, len) != opts[i])
+				break;
+			back_chain[j] = enum;
 		}
+	}
 
-		s = substr("                                  ", length (opts[i]))
-		if (i + 1 == n_opts)
-			comma = ""
-
-		if (help[i] == "")
-			hlp = "0"
-		else
-			hlp = "N_(" quote help[i] quote ")";
-
-		printf("  { %c-%s%c,\n    %s,\n    %s, %u, %s, %s, %s }%s\n",
-			quote, opts[i], quote, hlp, back_chain[i], len,
-			switch_flags(flags[i]),
-			var_ref(flags[i]), var_set(flags[i]), comma)
+	s = substr("                                  ", length (opts[i]))
+	if (i + 1 == n_opts)
+		comma = ""
+
+	if (help[i] == "")
+		hlp = "0"
+	else
+		hlp = quote help[i] quote;
+
+	printf("  { %c-%s%c,\n    %s,\n    %s, %u,\n",
+	       quote, opts[i], quote, hlp, back_chain[i], len)
+	condition = opt_args("Condition", flags[i])
+	cl_flags = switch_flags(flags[i])
+	if (condition != "")
+		printf("#if %s\n" \
+		       "    %s,\n" \
+		       "#else\n" \
+		       "    CL_DISABLED,\n" \
+		       "#endif\n",
+		       condition, cl_flags, cl_flags)
+	else
+		printf("    %s,\n", cl_flags)
+	printf("    %s, %s }%s\n", var_ref(opts[i], flags[i]),
+	       var_set(flags[i]), comma)
 }
 
 print "};"