* config/h8300/h8300.md (pushqi1_h8300hs): Revert my patch

[pf3gnuchains/gcc-fork.git] / gcc / opts.sh

diff --git a/gcc/opts.sh b/gcc/opts.sh
index 84f2c62..2770f08 100644 (file)
--- a/gcc/opts.sh
+++ b/gcc/opts.sh
@@ -33,15 +33,11 @@ SORT=sort           # Could be /bin/sort or /usr/bin/sort
 C_FILE=$1; shift
 H_FILE=$1; shift
 
-# Must unset, so that RS="" works in gawk 3.0-3.1.1 (possibly earlier too)
-# Appears to be a gawk bug, RS="" is not an extension
-unset POSIXLY_CORRECT
-
 ${AWK} '
-       BEGIN{ RS=""; FS="\n" }
        # Ignore comments and blank lines
        /^[ \t]*(;|$)/  { next }
-       /^[^ \t]/       { gsub ("\n", "\034", $0); print }
+       # Note that RS="" falls foul of gawk 3.1.2 bugs
+       /^[^ \t]/       { getline tmp; print $0 "\034" tmp}
 ' "$@" | ${SORT} | ${AWK} '
     function switch_flags (flags,   result)
     {
@@ -49,14 +45,17 @@ ${AWK} '
        result = "0"
        for (j = 0; j < n_langs; j++) {
            regex = " " langs[j] " "
-           gsub ( "\+", "\\+", regex )
+           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"
        sub( "^0 \\| ", "", result )
        return result
     }
@@ -86,36 +85,65 @@ ${AWK} '
        h_file = "'${H_FILE}'"
        comma = ","
 
+       print "/* This file is auto-generated by opts.sh.  */\n" > c_file
+       print "#include \"" h_file "\""                 >> c_file
+       print "#include \"opts.h\"\n"                   >> c_file
+       print "const char * const lang_names[] =\n{"    >> c_file
+
        print "/* This file is auto-generated by opts.sh.  */\n" > h_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 "\nenum opt_code\n{"                      >> h_file
 
-       print "/* This file is auto-generated by opts.sh.  */\n" > c_file
-       print "#include \"" h_file "\""                 >> c_file
-       print "#include \"opts.h\"\n"                   >> 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]
-           gsub( "[^A-Za-z0-9]", "_", enum)
+           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 = ""
 
            printf("  %s,%s/* -%s */\n", enum, s, opts[i]) >> h_file
-           printf("  { \"%s\", %u, %s }%s\n", opts[i], \
-               length(opts[i]), switch_flags(flags[i]), comma) >> c_file
+           printf("  { \"%s\", (unsigned short) %s, %u,\n\t%s }%s\n",
+                  opts[i], back_chain[i], len, switch_flags(flags[i]),
+                  comma) >> c_file
        }
 
        print "  N_OPTS\n};"                            >> h_file