X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fopts.sh;h=10abcebce5fa8ff265d83764fd9076db1d404d14;hb=2e9da478edf45047e522074479ad7646cb4c4e68;hp=bc90150fcb580f2a3402bd6f1af021e367fd16ce;hpb=5457b64599c4fd4a544ec3fd5d552e5e6feeb0cf;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/gcc/opts.sh b/gcc/opts.sh
index bc90150fcb5..10abcebce5f 100644
--- a/gcc/opts.sh
+++ b/gcc/opts.sh
@@ -17,7 +17,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
-# Usage: opts.sh outfile.c outfile.h file1.opt [file2.opt, ...]
+# Usage: opts.sh moveifchange srcdir outfile.c outfile.h file1.opt [ ...]
 
 # Always operate in the C locale.
 LANG=C
@@ -30,61 +30,212 @@ AWK=${AWK-awk}
 
 SORT=sort		# Could be /bin/sort or /usr/bin/sort
 
+MOVEIFCHANGE=$1; shift
 C_FILE=$1; shift
 H_FILE=$1; shift
+TMP_C_FILE=tmp-${C_FILE}
+TMP_H_FILE=tmp-${H_FILE}
 
-cat "$@" | ${AWK} '
-	BEGIN{ RS=""; FS="\n" }
+${AWK} '
 	# Ignore comments and blank lines
 	/^[ \t]*(;|$)/	{ next }
-	/^[^ \t]/ 	{ gsub ("\n", "\034", $0); print }
-' | ${SORT} | ${AWK} '
-    function switch_flags (langs,   flags)
+	# Note that RS="" falls foul of gawk 3.1.2 bugs
+	/^[^ \t]/       { record = $0
+			  do { getline tmp;
+			       if (!(tmp ~ "^[ \t]*(;|$)"))
+			          record = record "\034" tmp
+			  } while (tmp != "")
+			  print record
+			}
+' "$@" | ${SORT} | ${AWK} '
+    function switch_flags (flags,   result)
     {
-	langs = ":" langs ":"
-	gsub( " ", ":", langs)
-	flags = "0"
-        if (langs ~ ":C:") flags = flags " | CL_C"
-        if (langs ~ ":ObjC:") flags = flags " | CL_OBJC"
-        if (langs ~ ":C\\+\\+:") flags = flags " | CL_CXX"
-        if (langs ~ ":ObjC\\+\\+:") flags = flags " | CL_OBJCXX"
-        if (langs ~ ":Joined:") flags = flags " | CL_JOINED"
-        if (langs ~ ":Separate:") flags = flags " | CL_SEPARATE"
-        if (langs ~ ":RejectNegative:") flags = flags " | CL_REJECT_NEGATIVE"
-	sub( "^0 \\| ", "", flags )
-	return flags
+	flags = " " flags " "
+	result = "0"
+	for (j = 0; j < n_langs; j++) {
+	    regex = " " langs[j] " "
+	    gsub ( "\\+", "\\+", regex )
+	    if (flags ~ regex)
+		result = result " | " macros[j]
+	}
+        if (flags ~ " Common ") result = result " | CL_COMMON"
+        if (flags ~ " Joined ") result = result " | CL_JOINED"
+        if (flags ~ " JoinedOrMissing ") \
+		result = result " | CL_JOINED | CL_MISSING_OK"
+        if (flags ~ " Separate ") result = result " | CL_SEPARATE"
+        if (flags ~ " RejectNegative ") result = result " | CL_REJECT_NEGATIVE"
+        if (flags ~ " UInteger ") result = result " | CL_UINTEGER"
+        if (flags ~ " Undocumented ") result = result " | CL_UNDOCUMENTED"
+        if (flags ~ " Report ") result = result " | CL_REPORT"
+	sub( "^0 \\| ", "", result )
+	return result
+    }
+    function var_args(flags)
+    {
+	if (flags !~ "Var\\(")
+	  return "";
+	sub(".*Var\\(", "", flags);
+	sub(").*", "", flags);
+
+	return flags;
+    }
+    function var_name(flags)
+    {
+	s = var_args(flags);
+	if (s == "")
+	  return "";
+	sub( ",.*", "", s);
+	return s;
+    }
+    function var_set(flags)
+    {
+	s = var_args(flags);
+	if (s !~ ",")
+	  return "0, 0";
+	sub( "[^,]*,", "", s);
+	return "1, " s;
+    }
+    function var_ref(flags)
+    {
+	name = var_name(flags);
+	if (name == "")
+	  return "0";
+	else
+	  return "&" name;
     }
 
     BEGIN {
-	c_file = "'${C_FILE}'"
-	h_file = "'${H_FILE}'"
 	FS = "\034"
-	print "/* This file is auto-generated by opts.sh.  */\n" > h_file
-	print "/* This file is auto-generated by opts.sh.  */\n" > c_file
-	print "struct cl_option\n{"			>> h_file
-	print "  const char *opt_text;"			>> h_file
-	print "  unsigned char opt_len;"		>> h_file
-	print "  unsigned char flags;"			>> h_file
-	print "};\n\n"					>> h_file
-	print "extern const struct cl_option cl_options[];\n" >> h_file
-	print "enum opt_code\n{"			>> h_file
-	print "#include \"options.h\""			>> c_file
-	print "#include \"opts.h\"\n"			>> c_file
-	print "const struct cl_option cl_options[] =\n{" >> c_file
+	n_opts = 0
+	n_langs = 0
     }
 
+# Collect the text and flags of each option into an array
     {
-	opt = $1
-	gsub ( "[^A-Za-z0-9]", "_", opt)
-	s = substr ("                                  ", length (opt))
-	enum = "OPT_" opt
-	printf ("  %s,%s/* -%s */\n", enum, s, $1 )	>> h_file
-	printf ("  { \"%s\", %u, %s },\n", $1, \
-	    length ($1), switch_flags($2))		>> c_file
+	if ($1 == "Language") {
+		langs[n_langs] = $2
+		n_langs++;
+	} else {
+		opts[n_opts] = $1
+		flags[n_opts] = $2
+		help[n_opts] = $3
+		n_opts++;
+	}
     }
 
+# Dump out an enumeration into a .h file, and an array of options into a
+# C file.  Combine the flags of duplicate options.
     END {
-	print "  N_OPTS\n};"				>> h_file
+ 	c_file = "'${TMP_C_FILE}'"
+ 	h_file = "'${TMP_H_FILE}'"
+ 	realh_file = "'${H_FILE}'"
+	comma = ","
+
+	print "/* This file is auto-generated by opts.sh.  */\n" > c_file
+	print "#include <intl.h>"			>> c_file
+	print "#include \"" realh_file "\""		>> c_file
+	print "#include \"opts.h\"\n"			>> c_file
+
+	print "/* This file is auto-generated by opts.sh.  */\n" > h_file
+	print "#ifndef OPTIONS_H"			>> h_file
+	print "#define OPTIONS_H\n"			>> h_file
+
+	for (i = 0; i < n_opts; i++) {
+	    name = var_name(flags[i]);
+	    if (name == "")
+	       continue;
+
+	    printf ("/* Set by -%s.\n   %s  */\nextern int %s;\n\n",
+	      opts[i], help[i], name)		>> h_file
+
+	    if (flags[i] ~ "VarExists")
+	      continue;
+
+	    if (flags[i] ~ "Init\\(")
+	      {
+		init = flags[i];
+		sub(".*Init\\(","",init);
+		sub("\\).*","",init);
+		init = " = " init;
+	      }
+	    else
+	      init = "";
+
+	    printf ("/* Set by -%s.\n   %s  */\nint %s%s;\n\n",
+		    opts[i], help[i], name,init)	>> c_file
+	    }
+
+
+	print "const char * const lang_names[] =\n{"	>> c_file
+	for (i = 0; i < n_langs; i++) {
+	    macros[i] = "CL_" langs[i]
+	    gsub( "[^A-Za-z0-9_]", "X", macros[i] )
+	    s = substr("         ", length (macros[i]))
+	    print "#define " macros[i] s " (1 << " i ")" >> h_file
+	    print "  \"" langs[i] "\","			>> c_file
+	}
+
+	print "  0\n};\n"				>> c_file
+	print "const unsigned int cl_options_count = N_OPTS;\n" >> c_file
+
+	print "const struct cl_option cl_options[] =\n{" >> c_file
+
+	print "\nenum opt_code\n{"			>> h_file
+
+	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++;
+	    }
+
+	    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 (flags[i] ~ "Joined") {
+		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_(\"" help[i] "\")";
+
+	    printf("  %s,%s/* -%s */\n", enum, s, opts[i]) >> h_file
+	    printf("  { \"-%s\",\n    %s,\n    %s, %u, %s, %s, %s }%s\n",
+		   opts[i], hlp, back_chain[i], len,
+		   switch_flags(flags[i]),
+		   var_ref(flags[i]), var_set(flags[i]), comma)	>> c_file
+	}
+
+	print "  N_OPTS\n};\n"				>> h_file
+	print "#endif /* OPTIONS_H */"			>> h_file
 	print "};"					>> c_file
     }
 '
+
+# Copy the newly generated files back to the correct names only if different.
+# This is to prevent a cascade of file rebuilds when not necessary.
+${MOVEIFCHANGE} ${TMP_H_FILE} ${H_FILE}
+${MOVEIFCHANGE} ${TMP_C_FILE} ${C_FILE}