[gcc] GCC 4.5.0=>4.5.1

gcc/gcc/opth-gen.awk

Index: gcc/gcc/opth-gen.awk
diff --git a/gcc/gcc/opth-gen.awk b/gcc/gcc/opth-gen.awk
index b84d1f2c52012665ae09fa8d6778b533f44b9f5e..93a9008bdcfecd34a6f0bb51e334ec77fb0dc3e6 100644
--- a/gcc/gcc/opth-gen.awk
+++ b/gcc/gcc/opth-gen.awk
@@ -1,4 +1,5 @@
-#  Copyright (C) 2003,2004,2005,2006,2007,2008 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.
 #
@@ -98,7 +99,7 @@ print ""
 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;
@@ -331,8 +332,11 @@ for (i = 0; i < n_opts; i++) {
 
 	len = length (opts[i]);
 	enum = "OPT_" opts[i]
-	if (opts[i] == "finline-limit=" || opts[i] == "Wlarger-than=")
+	if (opts[i] == "finline-limit=" || opts[i] == "Wlarger-than=" \
+	    || opts[i] == "ftemplate-depth=")
 		enum = enum "eq"
+	if (opts[i] == "gdwarf+")
+		enum = "OPT_gdwarfplus"
 	gsub ("[^A-Za-z0-9]", "_", enum)
 
 	# If this switch takes joined arguments, back-chain all
@@ -348,7 +352,7 @@ for (i = 0; i < n_opts; i++) {
 		}
 	}
 
-	s = substr("                                     ", length (opts[i]))
+	s = substr("                                         ", length (enum))
 	if (i + 1 == n_opts)
 		comma = ""