* objc/execute/exceptions/exceptions.exp: New exp for the exceptions

[pf3gnuchains/gcc-fork.git] / gcc / optc-gen.awk

diff --git a/gcc/optc-gen.awk b/gcc/optc-gen.awk
index e647cd9..065972b 100644 (file)
--- 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
@@ -56,11 +56,11 @@ BEGIN {
 END {
 print "/* This file is auto-generated by opts.sh.  */"
 print ""
-print "#include <intl.h>"
 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++) {
@@ -77,12 +77,22 @@ for (i = 0; i < n_opts; i++) {
        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++) {
@@ -150,7 +160,8 @@ for (i = 0; i < n_opts; i++) {
                       condition, cl_flags, cl_flags)
        else
                printf("    %s,\n", cl_flags)
-       printf("    %s, %s }%s\n", var_ref(flags[i]), var_set(flags[i]), comma)
+       printf("    %s, %s }%s\n", var_ref(opts[i], flags[i]),
+              var_set(flags[i]), comma)
 }
 
 print "};"