Daily bump.

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

diff --git a/gcc/opth-gen.awk b/gcc/opth-gen.awk
index 7c1d92a..cf2ef96 100644 (file)
--- a/gcc/opth-gen.awk
+++ b/gcc/opth-gen.awk
@@ -1,4 +1,5 @@
-#  Copyright (C) 2003,2004,2005,2006,2007 Free Software Foundation, Inc.
+#  Copyright (C) 2003,2004,2005,2006,2007,2008, 2010
+#  Free Software Foundation, Inc.
 #  Contributed by Kelley Cook, June 2004.
 #  Original code from Neil Booth, May 2003.
 #
@@ -95,10 +96,10 @@ print ""
 # Also, order the structure so that pointer fields occur first, then int
 # fields, and then char fields to provide the best packing.
 
-print "#if !defined(GCC_DRIVER) && !defined(IN_LIBGCC2)"
+print "#if !defined(GCC_DRIVER) && !defined(IN_LIBGCC2) && !defined(IN_TARGET_LIBS)"
 print ""
 print "/* Structure to save/restore optimization and target specific options.  */";
-print "struct cl_optimization GTY(())";
+print "struct GTY(()) cl_optimization";
 print "{";
 
 n_opt_char = 2;
@@ -154,7 +155,7 @@ print "";
 
 # Target and optimization save/restore/print functions.
 print "/* Structure to save/restore selected target specific options.  */";
-print "struct cl_target_option GTY(())";
+print "struct GTY(()) cl_target_option";
 print "{";
 
 n_target_char = 0;
@@ -330,10 +331,7 @@ for (i = 0; i < n_opts; i++) {
        }
 
        len = length (opts[i]);
-       enum = "OPT_" opts[i]
-       if (opts[i] == "finline-limit=" || opts[i] == "Wlarger-than=")
-               enum = enum "eq"
-       gsub ("[^A-Za-z0-9]", "_", enum)
+       enum = opt_enum(opts[i])
 
        # If this switch takes joined arguments, back-chain all
        # subsequent switches to it for which it is a prefix.  If
@@ -348,7 +346,7 @@ for (i = 0; i < n_opts; i++) {
                }
        }
 
-       s = substr("                                     ", length (opts[i]))
+       s = substr("                                         ", length (enum))
        if (i + 1 == n_opts)
                comma = ""