PR other/32754 replace opts.sh with optc-gen.awk

PR other/32754 replace opts.sh with optc-gen.awk

[Manuel López-Ibáñez]

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

Committed as obvious in trunk and GCC 4.2 branch.

2008-02-07  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>

        PR other/32754
        * doc/options.texi (Options): Replace references to opts.sh with
        optc-gen.awk.
        * opts-common.c: Likewise.
        * optc-gen.awk: Likewise.

Cheers,

Manuel.

[-- Attachment #2: fix-pr32754-4_2.diff --]
[-- Type: text/plain, Size: 2649 bytes --]

Index: gcc/doc/options.texi
===================================================================
--- gcc/doc/options.texi	(revision 132173)
+++ gcc/doc/options.texi	(working copy)
@@ -3,11 +3,11 @@
 @c For copying conditions, see the file gcc.texi.
 
 @node Options
 @chapter Option specification files
 @cindex option specification files
-@cindex @samp{opts.sh}
+@cindex @samp{optc-gen.awk}
 
 Most GCC command-line options are described by special option
 definition files, the names of which conventionally end in
 @code{.opt}.  This chapter describes the format of these files.
 
Index: gcc/opts-common.c
===================================================================
--- gcc/opts-common.c	(revision 132173)
+++ gcc/opts-common.c	(working copy)
@@ -36,11 +36,11 @@ along with GCC; see the file COPYING3.  
    an argument of "stabs".  Suppose, however, that the number and list
    of switches are such that the binary search tests "-gen-decls"
    before having tested "-g".  This doesn't match, and as "-gen-decls"
    is less than "-gstabs", it will become the lower bound of the
    binary search range, and "-g" will never be seen.  To resolve this
-   issue, opts.sh makes "-gen-decls" point, via the back_chain member,
+   issue, 'optc-gen.awk' makes "-gen-decls" point, via the back_chain member,
    to "-g" so that failed searches that end between "-gen-decls" and
    the lexicographically subsequent switch know to go back and see if
    "-g" causes a match (which it does in this example).
 
    This search is done in such a way that the longest match for the
Index: gcc/optc-gen.awk
===================================================================
--- gcc/optc-gen.awk	(revision 132173)
+++ gcc/optc-gen.awk	(working copy)
@@ -52,11 +52,11 @@ BEGIN {
 		}
 	}
 
 # Dump that array of options into a C file.
 END {
-print "/* This file is auto-generated by opts.sh.  */"
+print "/* This file is auto-generated by optc-gen.awk.  */"
 print ""
 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
Index: gcc/opth-gen.awk
===================================================================
--- gcc/opth-gen.awk	(revision 132173)
+++ gcc/opth-gen.awk	(working copy)
@@ -53,11 +53,11 @@ BEGIN {
 	}
 
 # Dump out an enumeration into a .h file.
 # Combine the flags of duplicate options.
 END {
-print "/* This file is auto-generated by opts.sh.  */"
+print "/* This file is auto-generated by opth-gen.awk.  */"
 print ""
 print "#ifndef OPTIONS_H"
 print "#define OPTIONS_H"
 print ""
 print "extern int target_flags;"

[-- Attachment #3: fix-pr32754.diff --]
[-- Type: text/plain, Size: 2130 bytes --]

Index: gcc/doc/options.texi
===================================================================
--- gcc/doc/options.texi	(revision 131974)
+++ gcc/doc/options.texi	(working copy)
@@ -3,11 +3,11 @@
 @c For copying conditions, see the file gcc.texi.
 
 @node Options
 @chapter Option specification files
 @cindex option specification files
-@cindex @samp{opts.sh}
+@cindex @samp{optc-gen.awk}
 
 Most GCC command-line options are described by special option
 definition files, the names of which conventionally end in
 @code{.opt}.  This chapter describes the format of these files.
 
Index: gcc/opts-common.c
===================================================================
--- gcc/opts-common.c	(revision 131974)
+++ gcc/opts-common.c	(working copy)
@@ -36,11 +36,11 @@ along with GCC; see the file COPYING3.  
    an argument of "stabs".  Suppose, however, that the number and list
    of switches are such that the binary search tests "-gen-decls"
    before having tested "-g".  This doesn't match, and as "-gen-decls"
    is less than "-gstabs", it will become the lower bound of the
    binary search range, and "-g" will never be seen.  To resolve this
-   issue, opts.sh makes "-gen-decls" point, via the back_chain member,
+   issue, 'optc-gen.awk' makes "-gen-decls" point, via the back_chain member,
    to "-g" so that failed searches that end between "-gen-decls" and
    the lexicographically subsequent switch know to go back and see if
    "-g" causes a match (which it does in this example).
 
    This search is done in such a way that the longest match for the
Index: gcc/optc-gen.awk
===================================================================
--- gcc/optc-gen.awk	(revision 131974)
+++ gcc/optc-gen.awk	(working copy)
@@ -52,11 +52,11 @@ BEGIN {
 		}
 	}
 
 # Dump that array of options into a C file.
 END {
-print "/* This file is auto-generated by opts.sh.  */"
+print "/* This file is auto-generated by optc-gen.awk.  */"
 print ""
 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