Patchwork Fix remainder of PR bootstrap/56258 on gcc-4_6-branch

login
register
mail settings
Submitter Jack Howarth
Date Feb. 27, 2013, 6:49 p.m.
Message ID <20130227184904.GA26146@bromo.med.uc.edu>
Download mbox | patch
Permalink /patch/223676/
State New
Headers show

Comments

Jack Howarth - Feb. 27, 2013, 6:49 p.m.
On Wed, Feb 27, 2013 at 06:35:40PM +0100, Gerald Pfeifer wrote:
> On Fri, 22 Feb 2013, Jack Howarth wrote:
> >    Current gcc-4_6-branch still fails to bootstrap when texinfo 5.0 is 
> > installed. The attached patch fixes the remaining instances where @itemx 
> > need to be replaced with @item. An additional instance of misplaced 
> > brackets was fixed to match current gcc-4_7-branch. Bootstrap tested on 
> > x86_64-apple-darwin11. Okay for gcc-4_6-branch?
> 
> Yes, I think so.  Perhaps first go for 4.7 and then do 4.6 after a
> day or two.  (Aren't these partially backports from mainline and
> should be labeled as such in the ChangeLog entries?)
> 
> Gerald

Gerald,
   No, these are additional instances of the @item instead of @itemx change
which exist in gcc-4_6-branch and gcc-4_7-branch but not gcc trunk. There
is one extra instance in gcc-4_7-branch compared to gcc-4_6-branch...

@@ -5179,7 +5179,7 @@ thus dbg_cnt() returns true always unles
 e.g. With -fdbg-cnt=dce:10,tail_call:0
 dbg_cnt(dce) will return true only for first 10 invocations

-@itemx -fenable-@var{kind}-@var{pass}
+@item -fenable-@var{kind}-@var{pass}
 @itemx -fdisable-@var{kind}-@var{pass}=@var{range-list}
 @opindex fdisable-
 @opindex fenable-

and one additional fix for gcc-4_6-branch...


that is already fixed in gcc-4_7-branch and trunk.
          Jack
Gerald Pfeifer - March 2, 2013, 12:29 a.m.
On Wed, 27 Feb 2013, Jack Howarth wrote:
>    No, these are additional instances of the @item instead of @itemx change
> which exist in gcc-4_6-branch and gcc-4_7-branch but not gcc trunk. There
> is one extra instance in gcc-4_7-branch compared to gcc-4_6-branch...

Ahh, sorry for missing that.  And thanks for fixing those!

Gerald

Patch

Index: gcc/doc/invoke.texi
===================================================================
--- gcc/doc/invoke.texi	(revision 196218)
+++ gcc/doc/invoke.texi	(working copy)
@@ -165,7 +165,7 @@  in the following sections.
 -pipe  -pass-exit-codes  @gol
 -x @var{language}  -v  -###  --help@r{[}=@var{class}@r{[},@dots{}@r{]]}  --target-help  @gol
 --version -wrapper @@@var{file} -fplugin=@var{file} -fplugin-arg-@var{name}=@var{arg}  @gol
--fdump-ada-spec@r{[}-slim@r{]}} -fdump-go-spec=@var{file}
+-fdump-ada-spec@r{[}-slim@r{]} -fdump-go-spec=@var{file}}
 
 @item C Language Options
 @xref{C Dialect Options,,Options Controlling C Dialect}.