diff gcc/optc-gen.awk @ 63:b7f97abdc517 gcc-4.6-20100522

update gcc from gcc-4.5.0 to gcc-4.6
author ryoma <e075725@ie.u-ryukyu.ac.jp>
date Mon, 24 May 2010 12:47:05 +0900
parents 77e2b8dfacca
children f6334be47118
line wrap: on
line diff
--- a/gcc/optc-gen.awk	Fri Feb 12 23:41:23 2010 +0900
+++ b/gcc/optc-gen.awk	Mon May 24 12:47:05 2010 +0900
@@ -1,4 +1,5 @@
-#  Copyright (C) 2003, 2004, 2007, 2008, 2009 Free Software Foundation, Inc.
+#  Copyright (C) 2003, 2004, 2007, 2008, 2009, 2010
+#  Free Software Foundation, Inc.
 #  Contributed by Kelley Cook, June 2004.
 #  Original code from Neil Booth, May 2003.
 #
@@ -169,10 +170,7 @@
 	}
 
 	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
@@ -341,7 +339,7 @@
 print "  fputs (\"\\n\", file);";
 for (i = 0; i < n_opt_other; i++) {
 	print "  if (ptr->" var_opt_other[i] ")";
-	print "    fprintf (file, \"%*s%s (0x%lx)\\n\",";
+	print "    fprintf (file, \"%*s%s (%#lx)\\n\",";
 	print "             indent_to, \"\",";
 	print "             \"" var_opt_other[i] "\",";
 	print "             (unsigned long)ptr->" var_opt_other[i] ");";
@@ -350,7 +348,7 @@
 
 for (i = 0; i < n_opt_int; i++) {
 	print "  if (ptr->" var_opt_int[i] ")";
-	print "    fprintf (file, \"%*s%s (0x%x)\\n\",";
+	print "    fprintf (file, \"%*s%s (%#x)\\n\",";
 	print "             indent_to, \"\",";
 	print "             \"" var_opt_int[i] "\",";
 	print "             ptr->" var_opt_int[i] ");";
@@ -359,7 +357,7 @@
 
 for (i = 0; i < n_opt_short; i++) {
 	print "  if (ptr->" var_opt_short[i] ")";
-	print "    fprintf (file, \"%*s%s (0x%x)\\n\",";
+	print "    fprintf (file, \"%*s%s (%#x)\\n\",";
 	print "             indent_to, \"\",";
 	print "             \"" var_opt_short[i] "\",";
 	print "             ptr->" var_opt_short[i] ");";
@@ -368,7 +366,7 @@
 
 for (i = 0; i < n_opt_char; i++) {
 	print "  if (ptr->" var_opt_char[i] ")";
-	print "    fprintf (file, \"%*s%s (0x%x)\\n\",";
+	print "    fprintf (file, \"%*s%s (%#x)\\n\",";
 	print "             indent_to, \"\",";
 	print "             \"" var_opt_char[i] "\",";
 	print "             ptr->" var_opt_char[i] ");";
@@ -496,7 +494,7 @@
 print "  fputs (\"\\n\", file);";
 for (i = 0; i < n_target_other; i++) {
 	print "  if (ptr->" var_target_other[i] ")";
-	print "    fprintf (file, \"%*s%s (0x%lx)\\n\",";
+	print "    fprintf (file, \"%*s%s (%#lx)\\n\",";
 	print "             indent, \"\",";
 	print "             \"" var_target_other[i] "\",";
 	print "             (unsigned long)ptr->" var_target_other[i] ");";
@@ -505,7 +503,7 @@
 
 for (i = 0; i < n_target_int; i++) {
 	print "  if (ptr->" var_target_int[i] ")";
-	print "    fprintf (file, \"%*s%s (0x%x)\\n\",";
+	print "    fprintf (file, \"%*s%s (%#x)\\n\",";
 	print "             indent, \"\",";
 	print "             \"" var_target_int[i] "\",";
 	print "             ptr->" var_target_int[i] ");";
@@ -514,7 +512,7 @@
 
 for (i = 0; i < n_target_short; i++) {
 	print "  if (ptr->" var_target_short[i] ")";
-	print "    fprintf (file, \"%*s%s (0x%x)\\n\",";
+	print "    fprintf (file, \"%*s%s (%#x)\\n\",";
 	print "             indent, \"\",";
 	print "             \"" var_target_short[i] "\",";
 	print "             ptr->" var_target_short[i] ");";
@@ -523,7 +521,7 @@
 
 for (i = 0; i < n_target_char; i++) {
 	print "  if (ptr->" var_target_char[i] ")";
-	print "    fprintf (file, \"%*s%s (0x%x)\\n\",";
+	print "    fprintf (file, \"%*s%s (%#x)\\n\",";
 	print "             indent, \"\",";
 	print "             \"" var_target_char[i] "\",";
 	print "             ptr->" var_target_char[i] ");";